X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Ffileffmpeg.h;h=aa68a77c3eb7a1df95939b903a4d2752372c7946;hb=361dbd9de4e6e4143ea0cac5daa89b30685a4c70;hp=a9ce7d9cf458bd3d90efeb85a4611aeafa9ea3b0;hpb=2f28632d8209ef735de1698a596bc94fa9613497;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.h b/cinelerra-5.1/cinelerra/fileffmpeg.h
index a9ce7d9c..aa68a77c 100644
--- a/cinelerra-5.1/cinelerra/fileffmpeg.h
+++ b/cinelerra-5.1/cinelerra/fileffmpeg.h
@@ -117,7 +117,6 @@ public:
 	~FFMPEGConfigAudio();
 
 	void create_objects();
-	void update_options();
 	int close_event();
 
 	ArrayList<BC_ListBoxItem*> presets;
@@ -166,7 +165,6 @@ public:
 	~FFMPEGConfigVideo();
 
 	void create_objects();
-	void update_options();
 	int close_event();
 
 	ArrayList<BC_ListBoxItem*> presets;
@@ -288,9 +286,11 @@ public:
 	ArrayList<BC_ListBoxItem*> items[2];
 	ArrayList<BC_ListBoxItem*> &opts;
 	ArrayList<BC_ListBoxItem*> &vals;
+	char tip_text[BCTEXTLEN];
 
 	int selection_changed();
 	int update();
+	void show_tip(const char *tip);
 };
 
 class FFOptionsKindItem : public BC_MenuItem
@@ -377,27 +377,27 @@ class FFOptionsDialog : public BC_DialogThread
 public:
 	FFOptionsDialog();
 	~FFOptionsDialog();
-	virtual void update_options() = 0;
+	virtual void update_options(const char *options) = 0;
 
-	void load_options();
-	void store_options();
-	void start(const char *codec_name, AVCodec *codec, char *ff_options, int ff_len);
+	void load_options(const char *bp, int len);
+	void store_options(char *cp, int len);
+	void start(const char *format_name, const char *codec_name,
+		AVCodec *codec, const char *options, int len);
 	BC_Window* new_gui();
 	void handle_done_event(int result);
 
 	FFOptionsWindow *options_window;
-	const char *codec_name;
+	const char *format_name, *codec_name;
 	AVCodec *codec;
-	char *ff_options;
-	int ff_len;
 	AVDictionary *ff_opts;
+	int ff_len;
 };
 
 class FFOptionsAudioDialog : public FFOptionsDialog
 {
 public:
 	FFMPEGConfigAudio *aud_config;
-	void update_options();
+	void update_options(const char *options);
 
 	FFOptionsAudioDialog(FFMPEGConfigAudio *aud_config);
 	~FFOptionsAudioDialog();
@@ -407,7 +407,7 @@ class FFOptionsVideoDialog : public FFOptionsDialog
 {
 public:
 	FFMPEGConfigVideo *vid_config;
-	void update_options();
+	void update_options(const char *options);
 
 	FFOptionsVideoDialog(FFMPEGConfigVideo *vid_config);
 	~FFOptionsVideoDialog();