X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fformattools.h;h=e0946a1fa41827e53ba2a8553f204292c6cd154a;hb=047485402c380ee034045712121c649ddf89eda4;hp=9f49c04fdce5a2ad137b980774c3b7ff66018309;hpb=954f0f49f9ae83187c2e4230df5794b5976f608f;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/formattools.h b/cinelerra-5.1/cinelerra/formattools.h
index 9f49c04f..e0946a1f 100644
--- a/cinelerra-5.1/cinelerra/formattools.h
+++ b/cinelerra-5.1/cinelerra/formattools.h
@@ -30,22 +30,9 @@
 #include "file.inc"
 #include "ffmpeg.h"
 #include "formatpopup.h"
+#include "formattools.inc"
 #include "mwindow.inc"
 
-class FormatAParams;
-class FormatVParams;
-class FormatAThread;
-class FormatVThread;
-class FormatChannels;
-class FormatPathButton;
-class FormatPathText;
-class FormatFormat;
-class FormatFFMPEG;
-class FFMpegType;
-class FormatAudio;
-class FormatVideo;
-class FormatMultiple;
-
 class FormatTools
 {
 public:
@@ -104,17 +91,14 @@ public:
 	BC_TextBox *format_text;
 	FormatFFMPEG *format_ffmpeg;
 	FFMpegType *ffmpeg_type;
-	BC_ITumbler *channels_tumbler;
 
 	BC_Title *audio_title;
-	BC_Title *channels_title;
-	FormatChannels *channels_button;
 	FormatAudio *audio_switch;
 
 	BC_Title *video_title;
 	FormatVideo *video_switch;
 
-	FormatMultiple *multiple_files;
+	FormatFilePerLabel *labeled_files;
 
 	ArrayList<PluginServer*> *plugindb;
 	MWindow *mwindow;
@@ -254,33 +238,16 @@ public:
 };
 
 
-class FormatChannels : public BC_TextBox
-{
-public:
-	FormatChannels(int x, int y, FormatTools *format);
-	~FormatChannels();
-	int handle_event();
-	FormatTools *format;
-};
-
-class FormatToTracks : public BC_CheckBox
-{
-public:
-	FormatToTracks(int x, int y, int *output);
-	~FormatToTracks();
-	int handle_event();
-	int *output;
-};
-
-class FormatMultiple : public BC_CheckBox
+class FormatFilePerLabel : public BC_CheckBox
 {
 public:
-	FormatMultiple(MWindow *mwindow, int x, int y, int *output);
-	~FormatMultiple();
+	FormatFilePerLabel(FormatTools *format, int x, int y, int *output);
+	~FormatFilePerLabel();
 	int handle_event();
 	void update(int *output);
+
+	FormatTools *format;
 	int *output;
-	MWindow *mwindow;
 };