X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Ffilempeg.C;h=6c889b92c6cb7a169d3fcde23571454939682c87;hb=2e48b660e37eb5c661264d601211e16cb6cd6e89;hp=9988673fe1215cfe1d41a9f64f2a2d8990205509;hpb=fbb844da24c44cce0509451116df248c861ef8f7;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/filempeg.C b/cinelerra-5.1/cinelerra/filempeg.C
index 9988673f..6c889b92 100644
--- a/cinelerra-5.1/cinelerra/filempeg.C
+++ b/cinelerra-5.1/cinelerra/filempeg.C
@@ -774,6 +774,7 @@ int FileMPEG::skim_video(int track, void *vp, skim_fn fn)
 
 
 
+#ifdef HAVE_COMMERCIAL
 int FileMPEG::toc_nail(void *vp, int track)
 {
 	File *file = (File *)vp;
@@ -788,7 +789,7 @@ int FileMPEG::toc_nail(void *vp, int track)
 	MWindow::commercials->get_frame(file, pid, position, tdat, mw, mh, width, height);
 	return 0;
 }
-
+#endif
 
 int FileMPEG::create_toc(char *toc_path)
 {
@@ -816,11 +817,13 @@ int FileMPEG::create_toc(char *toc_path)
 // File needs a table of contents.
 	struct timeval new_time, prev_time, start_time, current_time;
 	gettimeofday(&prev_time, 0);  gettimeofday(&start_time, 0);
+#ifdef HAVE_COMMERCIAL
 	if( file->preferences->scan_commercials ) {
 		set_skimming(-1, 1, toc_nail, file);
 		if( MWindow::commercials->resetDb() != 0 )
 			eprintf(_("cant access commercials database"));
 	}
+#endif
 // This gets around the fact that MWindowGUI may be locked.
 	char progress_title[BCTEXTLEN];
 	sprintf(progress_title, _("Creating %s\n"), toc_file);
@@ -864,10 +867,12 @@ int FileMPEG::create_toc(char *toc_path)
 		}
 	}
 
+#ifdef HAVE_COMMERCIAL
 	if( file->preferences->scan_commercials ) {
 		if( !result ) MWindow::commercials->write_ads(asset->path);
 		MWindow::commercials->closeDb();
 	}
+#endif
 
 	mpeg3_stop_toc(fd);
 	fd = 0;
@@ -1721,13 +1726,7 @@ MPEGConfigAudio::MPEGConfigAudio(BC_WindowBase *parent_window, Asset *asset)
  : BC_Window(_(PROGRAM_NAME ": Audio Compression"),
  	parent_window->get_abs_cursor_x(1),
  	parent_window->get_abs_cursor_y(1),
-	310,
-	120,
-	-1,
-	-1,
-	0,
-	0,
-	1)
+	310, 120, -1, -1, 0, 0, 1)
 {
 	this->parent_window = parent_window;
 	this->asset = asset;
@@ -1774,11 +1773,6 @@ int MPEGConfigAudio::close_event()
 }
 
 
-
-
-
-
-
 MPEGLayer::MPEGLayer(int x, int y, MPEGConfigAudio *gui)
  : BC_PopupMenu(x, y, 100, layer_to_string(gui->asset->ampeg_derivative))
 {
@@ -1833,9 +1827,7 @@ char* MPEGLayer::layer_to_string(int layer)
 
 
 MPEGABitrate::MPEGABitrate(int x, int y, MPEGConfigAudio *gui)
- : BC_PopupMenu(x,
- 	y,
-	100,
+ : BC_PopupMenu(x, y, 100,
  	bitrate_to_string(gui->string, gui->asset->ampeg_bitrate))
 {
 	this->gui = gui;
@@ -1913,13 +1905,7 @@ MPEGConfigVideo::MPEGConfigVideo(BC_WindowBase *parent_window,
  : BC_Window(_(PROGRAM_NAME ": Video Compression"),
  	parent_window->get_abs_cursor_x(1),
  	parent_window->get_abs_cursor_y(1),
-	500,
-	400,
-	-1,
-	-1,
-	0,
-	0,
-	1)
+	500, 400, -1, -1, 0, 0, 1)
 {
 	this->parent_window = parent_window;
 	this->asset = asset;