X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fkeyframepopup.h;h=22d014af6d538becd704dfcc0f70f4b37e19e657;hb=702161ddaf384a773831f1643fca0a54133625b2;hp=2b23f7756e5c382963ec7efaa838e2eb7f5a4e1d;hpb=2ba7e9962ea989863e152373e96a09b00a0b4eb8;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/keyframepopup.h b/cinelerra-5.1/cinelerra/keyframepopup.h
index 2b23f775..22d014af 100644
--- a/cinelerra-5.1/cinelerra/keyframepopup.h
+++ b/cinelerra-5.1/cinelerra/keyframepopup.h
@@ -2,21 +2,21 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #ifndef KEYFRAMEPOPUP_H
@@ -31,11 +31,11 @@
 #include "plugindialog.inc"
 #include "keyframe.inc"
 #include "keyframepopup.inc"
-#include "automation.h" 
+#include "automation.h"
 #include "floatauto.h"
 
 
- 
+
 class KeyframePopup : public BC_PopupMenu
 {
 public:
@@ -49,14 +49,14 @@ public:
 	MWindow *mwindow;
 	MWindowGUI *gui;
 // Acquired through the update command as the plugin currently being operated on
-	
+
 	Plugin *keyframe_plugin;
 	Autos *keyframe_autos;
 	Automation *keyframe_automation;
 	Auto *keyframe_auto;
 	BC_MenuItem *key_mbar;
 
-private:	
+private:
 	KeyframePopupDelete *key_delete;
 	KeyframePopupHide *key_hide;
 	KeyframePopupShow *key_show;
@@ -89,7 +89,7 @@ public:
 	KeyframePopupHide(MWindow *mwindow, KeyframePopup *popup);
 	~KeyframePopupHide();
 	int handle_event();
-	
+
 	MWindow *mwindow;
 	KeyframePopup *popup;
 };
@@ -99,9 +99,8 @@ class KeyframePopupShow : public BC_MenuItem
 public:
 	KeyframePopupShow(MWindow *mwindow, KeyframePopup *popup);
 	~KeyframePopupShow();
-	PatchGUI *get_patchgui(Track *track);
 	int handle_event();
-	
+
 	MWindow *mwindow;
 	KeyframePopup *popup;
 };
@@ -112,7 +111,7 @@ public:
 	KeyframePopupCopy(MWindow *mwindow, KeyframePopup *popup);
 	~KeyframePopupCopy();
 	int handle_event();
-	
+
 	MWindow *mwindow;
 	KeyframePopup *popup;
 };
@@ -130,11 +129,11 @@ private:
 	int curve_mode;
 	const char* get_labeltext(int);
 	void toggle_mode(FloatAuto*);
-    
+
 friend class KeyframePopup;
 };
 
- 
+
 class KeyframePopupEdit : public BC_MenuItem
 {
 public:
@@ -148,10 +147,10 @@ public:
 class KeyframeHidePopup : public BC_PopupMenu
 {
 public:
-        KeyframeHidePopup(MWindow *mwindow, MWindowGUI *gui);
-        ~KeyframeHidePopup();
+	KeyframeHidePopup(MWindow *mwindow, MWindowGUI *gui);
+	~KeyframeHidePopup();
 
-        void create_objects();
+	void create_objects();
 	int update(Autos *autos);
 
 	MWindow *mwindow;
@@ -184,7 +183,6 @@ class KeyMuteValue : public BC_CheckBox
 {
 public:
 	KeyMuteValue(KeyMutePatch *key_mute_patch);
-	void update_edl();
 	int button_release_event();
 	int handle_event();
 
@@ -196,21 +194,44 @@ class KeySpeedPatch : public BC_SubWindow
 public:
 	KeySpeedPatch(MWindow *mwindow, PatchGUI *patch, int x, int y);
 	void create_objects();
+	void update(float v);
+	void update_speed(float v);
+	int cursor_enter_event();
+	int cursor_leave_event();
 
 	MWindow *mwindow;
 	PatchGUI *patch;
-	KeySpeedValue *key_speed_slider;
+	KeySpeedSlider *key_speed_slider;
+	KeySpeedText *key_speed_text;
+	KeySpeedOK *key_speed_ok;
+};
+
+class KeySpeedOK : public BC_Button
+{
+public:
+	KeySpeedOK(KeySpeedPatch *key_speed_patch, int x, int y, VFrame **images);
+	int handle_event();
+
+	KeySpeedPatch *key_speed_patch;
+};
+
+class KeySpeedText : public BC_TextBox
+{
+public:
+	KeySpeedText(KeySpeedPatch *key_speed_patch, int x, int y, int w, float v);
+	int handle_event();
+
+	KeySpeedPatch *key_speed_patch;
 };
 
-class KeySpeedValue : public BC_FSlider
+class KeySpeedSlider : public BC_FSlider
 {
 public:
-	KeySpeedValue(KeySpeedPatch *key_speed_patch);
-	~KeySpeedValue();
+	KeySpeedSlider(KeySpeedPatch *key_speed_patch,
+		int x, int y, int w, float v);
+	~KeySpeedSlider();
 
-	void update_edl();
 	int handle_event();
-	int button_release_event();
 
 	KeySpeedPatch *key_speed_patch;
 };