x265 upgrade to 2.5, cinfinity cc lic, keyframe reticle redraw, crikey/titler event...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / formattools.h

diff --git a/cinelerra-5.1/cinelerra/formattools.h b/cinelerra-5.1/cinelerra/formattools.h
index b5b567684eebf1125de1b781b61ca780dc917f44..d4c7761b0f7f635151a0759379e7a805a89e0203 100644 (file)
--- a/cinelerra-5.1/cinelerra/formattools.h
+++ b/cinelerra-5.1/cinelerra/formattools.h
@@ -70,7 +70,7 @@ public:
 // In recording preferences, aspects of the format are locked
 // depending on the driver used.
        void update_driver(int driver);
-       void update_format();
+       virtual void update_format();
 
 
        void reposition_window(int &init_x, int &init_y);
@@ -116,8 +116,6 @@ public:
 
        FormatMultiple *multiple_files;
 
-// Suggestions for the textbox
-       ArrayList<BC_ListBoxItem*> *file_entries;
        ArrayList<PluginServer*> *plugindb;
        MWindow *mwindow;
        const char *locked_compressor;
@@ -167,8 +165,6 @@ public:
 
        int handle_event();
        FormatTools *format;
-       static int load_defaults(const char *path, const char *type,
-               char *codec, char *codec_options, int len);
 
 // squash show/hide window
        int show_window(int flush=1) { return 0; }