X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fdvdcreate.h;h=cfb9b00b63638ed251f186373838a5bace8c3fac;hp=b30ff18eeb1b1e215d556ca1a02bf249b3f2dea6;hb=2e48b660e37eb5c661264d601211e16cb6cd6e89;hpb=69846fe5913069496f392998feba71847299e3df

diff --git a/cinelerra-5.1/cinelerra/dvdcreate.h b/cinelerra-5.1/cinelerra/dvdcreate.h
index b30ff18e..cfb9b00b 100644
--- a/cinelerra-5.1/cinelerra/dvdcreate.h
+++ b/cinelerra-5.1/cinelerra/dvdcreate.h
@@ -9,7 +9,9 @@
 #include "bclistboxitem.inc"
 #include "bcmenuitem.h"
 #include "bctextbox.h"
+#include "browsebutton.h"
 #include "mwindow.h"
+#include "rescale.h"
 
 #include "dvdcreate.inc"
 
@@ -36,8 +38,7 @@ public:
 	void handle_close_event(int result);
 	BC_Window* new_gui();
 	int option_presets();
-	int create_dvd_jobs(ArrayList<BatchRenderJob*> *jobs,
-		const char *tmp_path, const char *asset_title);
+	int create_dvd_jobs(ArrayList<BatchRenderJob*> *jobs, const char *asset_path);
 	int insert_video_plugin(const char *title, KeyFrame *default_keyframe);
 	int resize_tracks();
 
@@ -47,7 +48,7 @@ public:
 	char tmp_path[BCTEXTLEN];
 	int use_deinterlace, use_inverse_telecine;
 	int use_scale, use_resize_tracks;
-	int use_wide_audio, use_wide_aspect;
+	int use_wide_audio;
 	int use_histogram, use_label_chapters;
 	int use_ffmpeg, use_standard;
 
@@ -112,6 +113,7 @@ class CreateDVD_AssetTitle : public BC_TextBox
 public:
 	CreateDVD_AssetTitle(CreateDVD_GUI *gui, int x, int y, int w);
 	~CreateDVD_AssetTitle();
+	int handle_event();
 
 	CreateDVD_GUI *gui;
 };
@@ -136,15 +138,6 @@ public:
 	CreateDVD_GUI *gui;
 };
 
-class CreateDVD_Scale : public BC_CheckBox
-{
-public:
-	CreateDVD_Scale(CreateDVD_GUI *gui, int x, int y);
-	~CreateDVD_Scale();
-
-	CreateDVD_GUI *gui;
-};
-
 class CreateDVD_ResizeTracks : public BC_CheckBox
 {
 public:
@@ -181,15 +174,6 @@ public:
 	CreateDVD_GUI *gui;
 };
 
-class CreateDVD_WideAspect : public BC_CheckBox
-{
-public:
-	CreateDVD_WideAspect(CreateDVD_GUI *gui, int x, int y);
-	~CreateDVD_WideAspect();
-
-	CreateDVD_GUI *gui;
-};
-
 class CreateDVD_UseFFMpeg : public BC_CheckBox
 {
 public:
@@ -217,18 +201,18 @@ public:
 	CreateDVD_AssetTitle *asset_title;
 	int tmp_x, tmp_y;
 	CreateDVD_TmpPath *tmp_path;
+	BrowseButton *btmp_path;
 	CreateDVD_DiskSpace *disk_space;
 	CreateDVD_Format *standard;
+	CreateDVD_Scale *scale;
 	ArrayList<BC_ListBoxItem *> media_sizes;
 	CreateDVD_MediaSize *media_size;
 	CreateDVD_Deinterlace *need_deinterlace;
 	CreateDVD_InverseTelecine *need_inverse_telecine;
-	CreateDVD_Scale *need_scale;
 	CreateDVD_UseFFMpeg *need_use_ffmpeg;
 	CreateDVD_ResizeTracks *need_resize_tracks;
 	CreateDVD_Histogram *need_histogram;
 	CreateDVD_WideAudio *need_wide_audio;
-	CreateDVD_WideAspect *need_wide_aspect;
 	CreateDVD_LabelChapters *need_label_chapters;
 	int ok_x, ok_y, ok_w, ok_h;
 	CreateDVD_OK *ok;
@@ -240,7 +224,7 @@ class CreateDVD_FormatItem : public BC_MenuItem
 {
 public:
 	int handle_event();
-	CreateDVD_FormatItem(CreateDVD_Format *popup, int standard, const char *name);
+	CreateDVD_FormatItem(CreateDVD_Format *popup, int standard, const char *text);
 	~CreateDVD_FormatItem();
 
 	CreateDVD_Format *popup;
@@ -254,8 +238,32 @@ public:
 	int handle_event();
 	CreateDVD_Format(CreateDVD_GUI *gui, int x, int y);
 	~CreateDVD_Format();
+	void set_value(int v) { set_text(get_item(v)->get_text()); }
+
+	CreateDVD_GUI *gui;
+};
+
+class CreateDVD_ScaleItem : public BC_MenuItem
+{
+public:
+	int handle_event();
+	CreateDVD_ScaleItem(CreateDVD_Scale *popup, int scale, const char *text);
+	~CreateDVD_ScaleItem();
+
+	CreateDVD_Scale *popup;
+	int scale;
+};
+
+class CreateDVD_Scale : public BC_PopupMenu
+{
+public:
+	void create_objects();
+	int handle_event();
+	CreateDVD_Scale(CreateDVD_GUI *gui, int x, int y);
+	~CreateDVD_Scale();
 
 	CreateDVD_GUI *gui;
+	void set_value(int v) { set_text(Rescale::scale_types[v]); }
 };
 
 class CreateDVD_MediaSize : public BC_PopupTextBox