X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftitler%2Ftitlerwindow.h;h=def051b8670215b54b0b5099db9ab914d3e43edf;hp=1f968301b82f73c8435f604651e8cc5a644c2951;hb=3ad39dda113124e7e1bb11a808541e6311417863;hpb=4c1a91d9f9373e564ecbeb8f568e4a3e7fe48e64

diff --git a/cinelerra-5.1/plugins/titler/titlerwindow.h b/cinelerra-5.1/plugins/titler/titlerwindow.h
index 1f968301..def051b8 100644
--- a/cinelerra-5.1/plugins/titler/titlerwindow.h
+++ b/cinelerra-5.1/plugins/titler/titlerwindow.h
@@ -38,6 +38,7 @@ class TitleInterlace;
 class TitleFontTumble;
 class TitleSizeTumble;
 class TitleItalic;
+class TitleAlias;
 class TitleBold;
 class TitleDrag;
 class TitleSize;
@@ -98,6 +99,8 @@ public:
 	void check_style(const char *font_name, int update);
 	int insert_ibeam(const char *txt, int ofs=0);
 	void done_event(int result);
+	void send_configure_change();
+	int check_configure_change(int ret);
 
 	TitleMain *client;
 
@@ -120,6 +123,7 @@ public:
 	TitleStroker *stroker;
 	BC_Title *style_title;
 	TitleItalic *italic;
+	TitleAlias *alias;
 	TitleBold *bold;
 	TitleDrag *drag;
 	TitleCurPopup *cur_popup;
@@ -130,7 +134,7 @@ public:
 	int color_x, color_y;
 	int outline_color_x, outline_color_y;
 	int drag_dx, drag_dy, dragging;
-	int cur_ibeam;
+	int cur_ibeam, pending_config;
 
 	BC_Title *size_title;
 	TitleSize *size;
@@ -205,7 +209,14 @@ public:
 };
 
 
-
+class TitleAlias : public BC_CheckBox
+{
+public:
+	TitleAlias(TitleMain *client, TitleWindow *window, int x, int y);
+	int handle_event();
+	TitleMain *client;
+	TitleWindow *window;
+};
 class TitleItalic : public BC_CheckBox
 {
 public:
@@ -293,7 +304,7 @@ public:
 class TitleLoop : public BC_CheckBox
 {
 public:
-	TitleLoop(TitleMain *client, int x, int y);
+	TitleLoop(TitleMain *client, TitleWindow *window, int x, int y);
 	int handle_event();
 	TitleMain *client;
 	TitleWindow *window;
@@ -301,7 +312,7 @@ public:
 class TitleLinePitch : public BC_CheckBox
 {
 public:
-	TitleLinePitch(TitleMain *client, int x, int y);
+	TitleLinePitch(TitleMain *client, TitleWindow *window, int x, int y);
 	int handle_event();
 	TitleMain *client;
 	TitleWindow *window;
@@ -310,19 +321,21 @@ public:
 class TitleTimecode : public BC_CheckBox
 {
 public:
-	TitleTimecode(TitleMain *client, int x, int y);
+	TitleTimecode(TitleMain *client, TitleWindow *window, int x, int y);
 	int handle_event();
 	TitleMain *client;
+	TitleWindow *window;
 };
 
 class TitleTimecodeFormat : public BC_PopupMenu
 {
 public:
-	TitleTimecodeFormat(TitleMain *client, int x, int y, const char *text);
+	TitleTimecodeFormat(TitleMain *client, TitleWindow *window, int x, int y, const char *text);
 	void create_objects();
 	int update(int timecode_format);
 	int handle_event();
 	TitleMain *client;
+	TitleWindow *window;
 };
 
 class TitleFade : public BC_TextBox
@@ -437,6 +450,7 @@ public:
 	TitleSpeed(TitleMain *client, TitleWindow *window, int x, int y);
 	int handle_event();
 	TitleMain *client;
+	TitleWindow *window;
 };
 
 class TitleLeft : public BC_Radial
@@ -516,7 +530,7 @@ public:
 class TitleLoopPlayback : public BC_CheckBox
 {
 public:
-	TitleLoopPlayback(TitleMain *client, int x, int y);
+	TitleLoopPlayback(TitleMain *client, TitleWindow *window, int x, int y);
 	int handle_event();
 	TitleMain *client;
 	TitleWindow *window;
@@ -551,12 +565,12 @@ class TitleCurSubMenu : public BC_SubMenu
 public:
         TitleCurSubMenu(TitleCurItem *cur_item);
         ~TitleCurSubMenu();
-	void add_subitem(int popup_type, va_list ap, const char *fmt);
+	void add_subitemx(int popup_type, va_list ap, const char *fmt);
 	void add_subitem(int popup_type, const char *fmt,...) { va_list ap;
-		va_start(ap, fmt); add_subitem(popup_type, ap, fmt); va_end(ap);
+		va_start(ap, fmt); add_subitemx(popup_type, ap, fmt); va_end(ap);
 	}
 	void add_subitem(const char *fmt,...) { va_list ap;
-		va_start(ap, fmt); add_subitem(POPUP_NONE, ap, fmt); va_end(ap);
+		va_start(ap, fmt); add_subitemx(POPUP_NONE, ap, fmt); va_end(ap);
 	}
         TitleCurItem *cur_item;
 };