X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowgui.C;h=76efb7efeb81e0897ec85a0ec8503bfcd1ea33a9;hb=8068cd62fe64d3e6d95d563b4cab15f768411ba9;hp=23fa22a2f1e48b0385070a17bb44c97a82d9222a;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C
index 23fa22a2..76efb7ef 100644
--- a/cinelerra-5.1/cinelerra/mwindowgui.C
+++ b/cinelerra-5.1/cinelerra/mwindowgui.C
@@ -119,6 +119,7 @@ MWindowGUI::MWindowGUI(MWindow *mwindow)
 	edit_menu = 0;
 	plugin_menu = 0;
 	keyframe_menu = 0;
+	keyframe_hide = 0;
  	transition_menu = 0;
 	remote_control = 0;
 	cwindow_remote_handler = 0;
@@ -142,7 +143,9 @@ MWindowGUI::~MWindowGUI()
 	delete resource_thread;
 	resource_pixmaps.remove_all_objects();
 	delete swindow;
+#ifdef HAVE_DVB
 	delete channel_info;
+#endif
 	delete db_window;
 	delete x_divider;
 	delete y_divider;
@@ -344,13 +347,17 @@ void MWindowGUI::create_objects()
 	if(debug) printf("MWindowGUI::create_objects %d\n", __LINE__);
 	add_subwindow(keyframe_menu = new KeyframePopup(mwindow, this));
 	keyframe_menu->create_objects();
+	add_subwindow(keyframe_hide = new KeyframeHidePopup(mwindow, this));
+	keyframe_hide->create_objects();
 
 
 	if(debug) printf("MWindowGUI::create_objects %d\n", __LINE__);
 	add_subwindow(transition_menu = new TransitionPopup(mwindow, this));
 	transition_menu->create_objects();
 
+#ifdef HAVE_DVB
 	channel_info = new ChannelInfo(mwindow);
+#endif
 	db_window = new DbWindow(mwindow);
 	swindow = new SWindow(mwindow);
 
@@ -1011,7 +1018,7 @@ int MWindowGUI::drag_stop()
 		if(pane[i]) result |= pane[i]->canvas->drag_stop(
 			&redraw);
 	}
-
+	mwindow->edl->optimize();
 
 // since we don't have subwindows we have to terminate any drag operation
 	if(result)
@@ -1409,9 +1416,11 @@ int MWindowGUI::keyboard_listener(int key)
 	case KPHAND:
 		mwindow->quit(0);
 		break;
+#ifdef HAVE_DVB
 	case KPBOOK:
 		channel_info->toggle_scan();
 		break;
+#endif
 	case KPMENU:
 		if( !remote_control->deactivate() )
 			remote_control->activate();
@@ -2389,7 +2398,8 @@ FFMpegToggle::FFMpegToggle(MWindow *mwindow, MButtons *mbuttons, int x, int y)
 {
 	this->mwindow = mwindow;
 	this->mbuttons = mbuttons;
-	set_tooltip(_("FFMpeg early probe"));
+	set_tooltip( mwindow->preferences->ffmpeg_early_probe ?
+		_("Try FFMpeg first") : _("Try FFMpeg last"));
 }
 
 FFMpegToggle::~FFMpegToggle()
@@ -2399,6 +2409,8 @@ FFMpegToggle::~FFMpegToggle()
 int FFMpegToggle::handle_event()
 {
 	mwindow->preferences->ffmpeg_early_probe = get_value();
+	set_tooltip( mwindow->preferences->ffmpeg_early_probe ?
+		_("Try FFMpeg first") : _("Try FFMpeg last"));
 	mwindow->show_warning(&mwindow->preferences->warn_indexes,
 		_("Changing the base codecs may require rebuilding indexes."));
 	return 1;