colorpicker cleanup, make ffmpeg probes early default

[goodguy/history.git] / cinelerra-5.1 / plugins / titler / titlerwindow.h

diff --git a/cinelerra-5.1/plugins/titler/titlerwindow.h b/cinelerra-5.1/plugins/titler/titlerwindow.h
index 49c701bcda7a0351691d1c6f3a4a609d21b9b941..1088aa81c968ca57b4ccc8cad6e4052c671f91fd 100644 (file)
--- a/cinelerra-5.1/plugins/titler/titlerwindow.h
+++ b/cinelerra-5.1/plugins/titler/titlerwindow.h
@@ -468,7 +468,7 @@ public:
        TitleMain *client;
        TitleWindow *window;
 };
-class TitleColorThread : public ColorThread
+class TitleColorThread : public ColorPicker
 {
 public:
        TitleColorThread(TitleMain *client, TitleWindow *window, int is_outline);
@@ -531,12 +531,12 @@ class TitleCurSubMenu : public BC_SubMenu
 public:
         TitleCurSubMenu(TitleCurItem *cur_item);
         ~TitleCurSubMenu();
-       void add_subitem(int popup_type, const char *fmt, va_list ap);
+       void add_subitem(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, fmt, ap); va_end(ap);
+               va_start(ap, fmt); add_subitem(popup_type, ap, fmt); va_end(ap);
        }
        void add_subitem(const char *fmt,...) { va_list ap;
-               va_start(ap, fmt); add_subitem(POPUP_NONE, fmt, ap); va_end(ap);
+               va_start(ap, fmt); add_subitem(POPUP_NONE, ap, fmt); va_end(ap);
        }
         TitleCurItem *cur_item;
 };
@@ -567,7 +567,7 @@ public:
        TitleWindow *window;
 };
 
-class TitleColorPopup : public ColorThread
+class TitleColorPopup : public ColorPicker
 {
 public:
        TitleColorPopup(TitleMain *client, TitleWindow *window);