X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fdvdcreate.C;h=175ef5477ceb24c39c5a5b680af513d163e3cc4f;hb=2ff681c423ff0f83efbaed49aa37195a3b37f6db;hp=8779e3c9345bce4120d951aec81aca5525955f02;hpb=0df48ad2d876409c5beeae2e21933a728ea76c33;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/dvdcreate.C b/cinelerra-5.1/cinelerra/dvdcreate.C
index 8779e3c9..175ef547 100644
--- a/cinelerra-5.1/cinelerra/dvdcreate.C
+++ b/cinelerra-5.1/cinelerra/dvdcreate.C
@@ -24,9 +24,13 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#if !defined(__FreeBSD__)
 #include <sys/stat.h>
 #include <sys/statfs.h>
-
+#else
+#include <sys/param.h>
+#include <sys/mount.h>
+#endif
 
 #define DVD_PAL_4x3	0
 #define DVD_PAL_16x9	1
@@ -177,7 +181,7 @@ char *DVD_BatchRenderJob::create_script(EDL *edl, ArrayList<Indexable *> *idxbls
 	int file_seq = farmed || labeled ? 1 : 0;
  	if( !muxed ) {
 		if( file_seq ) {
-			fprintf(fp, "cat > $dir/dvd.m2v $dir/dvd.m2v0*\n");
+			fprintf(fp, "cat > $dir/dvd.m2v $dir/dvd.m2v[0-9]*\n");
 			fprintf(fp, "mplex -M -f 8 -o $dir/dvd.mpg $dir/dvd.m2v $dir/dvd.ac3\n");
 			file_seq = 0;
 		}
@@ -486,7 +490,7 @@ void CreateDVD_Thread::handle_close_event(int result)
 		Tracks *tracks = mwindow->edl->tracks;
 		for( Track *vtrk=tracks->first; vtrk; vtrk=vtrk->next ) {
 			if( vtrk->data_type != TRACK_VIDEO ) continue;
-			if( !vtrk->record ) continue;
+			if( !vtrk->is_armed() ) continue;
 			vtrk->expand_view = 1;
 			PluginSet *plugin_set = new PluginSet(mwindow->edl, vtrk);
 			vtrk->plugin_set.append(plugin_set);
@@ -614,7 +618,7 @@ BC_Window* CreateDVD_Thread::new_gui()
 	int scr_x = mwindow->gui->get_screen_x(0, -1);
 	int scr_w = mwindow->gui->get_screen_w(0, -1);
 	int scr_h = mwindow->gui->get_screen_h(0, -1);
-	int w = xS(520), h = yS(280);
+	int w = xS(560), h = yS(280);
 	int x = scr_x + scr_w/2 - w/2, y = scr_h/2 - h/2;
 
 	gui = new CreateDVD_GUI(this, x, y, w, h);
@@ -645,7 +649,7 @@ int CreateDVD_OK::button_press_event()
 
 int CreateDVD_OK::keypress_event()
 {
-	return 0;
+	return context_help_check_and_show();
 }
 
 
@@ -873,6 +877,8 @@ CreateDVD_GUI::CreateDVD_GUI(CreateDVD_Thread *thread, int x, int y, int w, int
 	need_farmed = 0;
 	ok = 0;
 	cancel = 0;
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("DVD and Bluray Creation");
 }
 
 CreateDVD_GUI::~CreateDVD_GUI()
@@ -881,7 +887,7 @@ CreateDVD_GUI::~CreateDVD_GUI()
 
 void CreateDVD_GUI::create_objects()
 {
-	int xs10 = xS(10), xs30 = xS(30), xs35 = xS(35), xs170 = xS(170);
+	int xs10 = xS(10), xs35 = xS(35), xs170 = xS(170);
 	int ys5 = yS(5), ys10 = yS(10);
 	lock_window("CreateDVD_GUI::create_objects");
 	int pady = BC_TextBox::calculate_h(this, MEDIUMFONT, 0, 1) + ys5;
@@ -922,7 +928,7 @@ void CreateDVD_GUI::create_objects()
 	standard = new CreateDVD_Format(this, title->get_w() + padx, y);
 	add_subwindow(standard);
 	standard->create_objects();
-	x0 -= xs30;
+	x0 -= xS(60);
 	title = new BC_Title(x0, y, _("Scale:"), MEDIUMFONT, YELLOW);
 	add_subwindow(title);
 	x1 = x0+title->get_w()+padx;
@@ -1015,7 +1021,7 @@ insert_video_plugin(const char *title, KeyFrame *default_keyframe)
 	Tracks *tracks = mwindow->edl->tracks;
 	for( Track *vtrk=tracks->first; vtrk; vtrk=vtrk->next ) {
 		if( vtrk->data_type != TRACK_VIDEO ) continue;
-		if( !vtrk->record ) continue;
+		if( !vtrk->is_armed() ) continue;
 		vtrk->expand_view = 1;
 		PluginSet *plugin_set = new PluginSet(mwindow->edl, vtrk);
 		vtrk->plugin_set.append(plugin_set);
@@ -1039,7 +1045,7 @@ resize_tracks()
 	if( trk_h < dvd_height ) trk_h = dvd_height;
 	for( Track *vtrk=tracks->first; vtrk; vtrk=vtrk->next ) {
 		if( vtrk->data_type != TRACK_VIDEO ) continue;
-		if( !vtrk->record ) continue;
+		if( !vtrk->is_armed() ) continue;
 		vtrk->track_w = trk_w;
 		vtrk->track_h = trk_h;
 	}
@@ -1072,7 +1078,7 @@ option_presets()
 	max_w = 0;  max_h = 0;
 	int has_deinterlace = 0, has_scale = 0;
 	for( Track *trk=tracks->first; trk; trk=trk->next ) {
-		if( !trk->record ) continue;
+		if( !trk->is_armed() ) continue;
 		Edits *edits = trk->edits;
 		switch( trk->data_type ) {
 		case TRACK_VIDEO:
@@ -1111,7 +1117,7 @@ option_presets()
 		if( max_h != dvd_height ) use_resize_tracks = 1;
 	}
 	for( Track *trk=tracks->first; trk && !use_resize_tracks; trk=trk->next ) {
-		if( !trk->record ) continue;
+		if( !trk->is_armed() ) continue;
 		switch( trk->data_type ) {
 		case TRACK_VIDEO:
 			if( trk->track_w != max_w ) use_resize_tracks = 1;
@@ -1205,7 +1211,7 @@ int CreateDVD_ScaleItem::handle_event()
 
 
 CreateDVD_Scale::CreateDVD_Scale(CreateDVD_GUI *gui, int x, int y)
- : BC_PopupMenu(x, y, xS(100), "", 1)
+ : BC_PopupMenu(x, y, xS(140), "", 1)
 {
 	this->gui = gui;
 }