improve ffmpeg format selection popup menu, more ffmpeg audio fixes

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

diff --git a/cinelerra-5.0/cinelerra/formattools.h b/cinelerra-5.0/cinelerra/formattools.h
index 3568e8c72a8ab96cf30dfe90b6bcbf7485401893..7c626bf13bfc0b2edf1b9abdc99478e4ec13e3d5 100644 (file)
--- a/cinelerra-5.0/cinelerra/formattools.h
+++ b/cinelerra-5.0/cinelerra/formattools.h
@@ -39,6 +39,8 @@ class FormatChannels;
 class FormatPathButton;
 class FormatPathText;
 class FormatFormat;
+class FormatFFMPEG;
+class FFMpegType;
 class FormatAudio;
 class FormatVideo;
 class FormatMultiple;
@@ -97,6 +99,8 @@ public:
        BC_Title *format_title;
        FormatFormat *format_button;
        BC_TextBox *format_text;
+       FormatFFMPEG *format_ffmpeg;
+       FFMpegType *ffmpeg_type;
        BC_ITumbler *channels_tumbler;
 
        BC_Title *audio_title;
@@ -152,6 +156,34 @@ public:
        FormatTools *format;
 };
 
+class FormatFFMPEG : public FFMPEGPopup
+{
+public:
+       FormatFFMPEG(int x, int y, FormatTools *format);
+       ~FormatFFMPEG();
+       
+       int handle_event();
+       FormatTools *format;
+// squash show/hide window
+       int show_window(int flush=1) { return 0; }
+       int hide_window(int flush=1) { return 0; }
+       int show(int flush=1) { return BC_SubWindow::show_window(flush); }
+       int hide(int flush=1) { return BC_SubWindow::hide_window(flush); }
+};
+
+class FFMpegType : public BC_TextBox
+{
+public:
+       FFMpegType(int x, int y, int w, int h, const char *text)
+        : BC_TextBox(x, y, w, h, text) {}
+       ~FFMpegType() {}
+// squash show/hide window
+       int show_window(int flush=1) { return 0; }
+       int hide_window(int flush=1) { return 0; }
+       int show(int flush=1) { return BC_SubWindow::show_window(flush); }
+       int hide(int flush=1) { return BC_SubWindow::hide_window(flush); }
+};
+
 class FormatAParams : public BC_Button
 {
 public: