X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fzoombar.h;h=7d717a99f59e083ac3dced4d675934ed91ba005c;hb=0190f5c29f6834ceea98b1f56ca9115145012758;hp=729a2266c848fb00f21b8d6f4d6e34eb002b0ace;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/zoombar.h b/cinelerra-5.1/cinelerra/zoombar.h
index 729a2266..7d717a99 100644
--- a/cinelerra-5.1/cinelerra/zoombar.h
+++ b/cinelerra-5.1/cinelerra/zoombar.h
@@ -22,23 +22,13 @@
 #ifndef ZOOMBAR_H
 #define ZOOMBAR_H
 
-class FromTextBox;
-class LengthTextBox;
-class ToTextBox;
-
-
-class SampleZoomPanel;
-class AmpZoomPanel;
-class TrackZoomPanel;
-class AutoZoom;
-class AutoTypeMenu;
-class ZoomTextBox;
-
 #include "guicast.h"
 #include "mwindow.inc"
 #include "mwindowgui.inc"
+#include "zoombar.inc"
 #include "zoompanel.h"
 
+
 class ZoomBar : public BC_SubWindow
 {
 public:
@@ -52,6 +42,8 @@ public:
 	void redraw_time_dependancies();
 	int update();          // redraw the current values
 	void update_autozoom();
+	void update_autozoom(int grouptype, int color);
+	void update_autozoom(int color);
 	int update_clocks();
 	int update_playback(int64_t new_position);       // update the playback position
 	int set_selection(int which_one);
@@ -61,17 +53,18 @@ public:
 	MWindowGUI *gui;
 	SampleZoomPanel *sample_zoom;
 	AmpZoomPanel *amp_zoom;
-	TrackZoomPanel *track_zoom;
+	ATrackZoomPanel *atrack_zoom;
+	VTrackZoomPanel *vtrack_zoom;
 	AutoZoom *auto_zoom;
 	AutoTypeMenu *auto_type;
 	ZoomTextBox *auto_zoom_text;
 
-	BC_Title *zoom_value, *playback_value;
 	LengthTextBox *length_value;
 	FromTextBox *from_value;
 	ToTextBox *to_value;
+	TitleAlphaBar *title_alpha_bar;
+	TitleAlphaText *title_alpha_text;
 	char string[256], string2[256];
-	int64_t old_position;
 };
 
 class SampleZoomPanel : public ZoomPanel
@@ -92,10 +85,19 @@ public:
 	ZoomBar *zoombar;
 };
 
-class TrackZoomPanel : public ZoomPanel
+class ATrackZoomPanel : public ZoomPanel
 {
 public:
-	TrackZoomPanel(MWindow *mwindow, ZoomBar *zoombar, int x, int y);
+	ATrackZoomPanel(MWindow *mwindow, ZoomBar *zoombar, int x, int y);
+	int handle_event();
+	MWindow *mwindow;
+	ZoomBar *zoombar;
+};
+
+class VTrackZoomPanel : public ZoomPanel
+{
+public:
+	VTrackZoomPanel(MWindow *mwindow, ZoomBar *zoombar, int x, int y);
 	int handle_event();
 	MWindow *mwindow;
 	ZoomBar *zoombar;
@@ -121,6 +123,7 @@ public:
 	void create_objects();
 	static const char* to_text(int shape);
 	static int from_text(char *text);
+	int draw_face(int dx, int color);
 	int handle_event();
 	MWindow *mwindow;
 	ZoomBar *zoombar;
@@ -138,12 +141,6 @@ public:
 };
 
 
-
-
-
-
-
-
 class FromTextBox : public BC_TextBox
 {
 public:
@@ -178,7 +175,22 @@ public:
 	ZoomBar *zoombar;
 };
 
+class TitleAlphaBar : public BC_FSlider
+{
+public:
+	TitleAlphaBar(MWindow *mwindow, ZoomBar *zoombar, int x, int y);
+	int handle_event();
+	MWindow *mwindow;
+	ZoomBar *zoombar;
+};
 
-
+class TitleAlphaText : public BC_TextBox
+{
+public:
+	TitleAlphaText(MWindow *mwindow, ZoomBar *zoombar, int x, int y);
+	int handle_event();
+	MWindow *mwindow;
+	ZoomBar *zoombar;
+};
 
 #endif