X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fdvdcreate.C;h=89072ef02faa14382d126cf47bfd5d2d0edbfec6;hb=60f8df69db9ddd8148bfc41a17bb0955b52a45e6;hp=cb8214a9b53cd04a55d7f1af37a6ee2b27e1468d;hpb=723142d62d61cde588e961426440f839ca9dcda9;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/dvdcreate.C b/cinelerra-5.1/cinelerra/dvdcreate.C
index cb8214a9..89072ef0 100644
--- a/cinelerra-5.1/cinelerra/dvdcreate.C
+++ b/cinelerra-5.1/cinelerra/dvdcreate.C
@@ -184,12 +184,18 @@ int CreateDVD_Thread::create_dvd_jobs(ArrayList<BatchRenderJob*> *jobs, const ch
 	fprintf(fp,"\n");
 	const char *exec_path = File::get_cinlib_path();
 	fprintf(fp,"PATH=$PATH:%s\n",exec_path);
-	if( mwindow->preferences->use_renderfarm )
-		fprintf(fp,"cat > $1/dvd.m2v $1/dvd.m2v0*\n");
-	if( !use_ffmpeg ) {
-		fprintf(fp,"mplex -M -f 8 -o $1/dvd.mpg $1/dvd.m2v $1/dvd.ac3\n");
-		fprintf(fp,"\n");
+ 	if( mwindow->preferences->use_renderfarm ||
+	    (use_label_chapters && edl->labels ) ) {
+		if( !use_ffmpeg ) {
+			fprintf(fp, "cat > $1/dvd.m2v $1/dvd.m2v0*\n");
+			fprintf(fp, "mplex -M -f 8 -o $1/dvd.mpg $1/dvd.m2v $1/dvd.ac3\n");
+		}
+		else
+			fprintf(fp, "ffmpeg -f concat -safe 0 -i <(for f in \"$1/dvd.mpg0\"*; do "
+					"echo \"file '$f'\"; done) -c copy -y $1/dvd.mpg\n");
 	}
+	else
+		fprintf(fp, "mplex -f 8 -o $1/dvd.mpg $1/dvd.m2v $1/dvd.ac3\n");
 	fprintf(fp,"rm -rf $1/iso\n");
 	fprintf(fp,"mkdir -p $1/iso\n");
 	fprintf(fp,"\n");
@@ -244,24 +250,13 @@ int CreateDVD_Thread::create_dvd_jobs(ArrayList<BatchRenderJob*> *jobs, const ch
 	fprintf(fp,"\n");
 	fclose(fp);
 
-	if( use_wide_audio ) {
-		session->audio_channels = session->audio_tracks = DVD_WIDE_CHANNELS;
-		session->achannel_positions[0] = 90;
-		session->achannel_positions[1] = 150;
-		session->achannel_positions[2] = 30;
-		session->achannel_positions[3] = 210;
-		session->achannel_positions[4] = 330;
-		session->achannel_positions[5] = 270;
-		if( edl->tracks->recordable_audio_tracks() == DVD_WIDE_CHANNELS )
-			mwindow->remap_audio(MWindow::AUDIO_1_TO_1);
-	}
-	else {
-		session->audio_channels = session->audio_tracks = DVD_CHANNELS;
-		session->achannel_positions[0] = 180;
-		session->achannel_positions[1] = 0;
-		if( edl->tracks->recordable_audio_tracks() == DVD_WIDE_CHANNELS )
-			mwindow->remap_audio(MWindow::AUDIO_5_1_TO_2);
-	}
+	session->audio_channels = session->audio_tracks =
+		!use_wide_audio ? DVD_CHANNELS : DVD_WIDE_CHANNELS;
+	for( int i=0; i<MAX_CHANNELS; ++i )
+		session->achannel_positions[i] = default_audio_channel_position(i, session->audio_channels);
+	int audio_mapping = edl->tracks->recordable_audio_tracks() == DVD_WIDE_CHANNELS &&
+		!use_wide_audio ? MWindow::AUDIO_5_1_TO_2 : MWindow::AUDIO_1_TO_1;
+	mwindow->remap_audio(audio_mapping);
 
 	double new_samplerate = session->sample_rate;
 	double new_framerate = session->frame_rate;
@@ -289,7 +284,7 @@ int CreateDVD_Thread::create_dvd_jobs(ArrayList<BatchRenderJob*> *jobs, const ch
 		return 1;
 	}
 
-	BatchRenderJob *job = new BatchRenderJob(mwindow->preferences);
+	BatchRenderJob *job = new BatchRenderJob(mwindow->preferences, use_label_chapters);
 	jobs->append(job);
 	strcpy(&job->edl_path[0], xml_filename);
 	Asset *asset = job->asset;
@@ -337,7 +332,7 @@ int CreateDVD_Thread::create_dvd_jobs(ArrayList<BatchRenderJob*> *jobs, const ch
 		asset->vmpeg_preset = 8;
 		asset->vmpeg_field_order = 0;
 		asset->vmpeg_pframe_distance = 0;
-		job = new BatchRenderJob(mwindow->preferences, SINGLE_PASS);
+		job = new BatchRenderJob(mwindow->preferences, 0, 0);
 		jobs->append(job);
 		strcpy(&job->edl_path[0], xml_filename);
 		asset = job->asset;
@@ -355,7 +350,7 @@ int CreateDVD_Thread::create_dvd_jobs(ArrayList<BatchRenderJob*> *jobs, const ch
 		asset->ac3_bitrate = dvd_kaudio_rate;
 	}
 
-	job = new BatchRenderJob(mwindow->preferences);
+	job = new BatchRenderJob(mwindow->preferences, 0, 0);
 	jobs->append(job);
 	job->edl_path[0] = '@';
 	strcpy(&job->edl_path[1], script_filename);