X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowgui.C;h=c21f83479be36845d1cf24900320a11401b41c7c;hb=58d99c74e65066486dbebf7e1cb3087e7de1c92b;hp=9724470dc31d927b695eaa452aa0b1531979858b;hpb=dafc18d66d48cd981a012d2e73a3b3db5351c538;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C
index 9724470d..c21f8347 100644
--- a/cinelerra-5.1/cinelerra/mwindowgui.C
+++ b/cinelerra-5.1/cinelerra/mwindowgui.C
@@ -918,16 +918,22 @@ int MWindowGUI::visible(int64_t x1, int64_t x2, int64_t view_x1, int64_t view_x2
 }
 
 
-int MWindowGUI::show_message(char *message, int color)
+void MWindowGUI::show_message(const char *message, int color)
 {
-// printf("MWindowGUI::show_message %d: %s 0x%08x 0x%08x\n",
-// __LINE__, message, color, mwindow->theme->message_normal);
-	if(color < 0) color = mwindow->theme->message_normal;
-	statusbar->status_text->set_color(color);
-	statusbar->status_text->update(message);
-	return 0;
+	statusbar->set_message(message, color);
+}
+void MWindowGUI::set_default_message(const char *message)
+{
+	statusbar->set_default_message(message);
+}
+void MWindowGUI::reset_default_message()
+{
+	statusbar->reset_default_message();
+}
+void MWindowGUI::default_message()
+{
+	statusbar->default_message();
 }
-
 
 // Drag motion called from other window
 int MWindowGUI::drag_motion()
@@ -2272,12 +2278,12 @@ int PaneButton::button_release_event()
 
 
 FFMpegToggle::FFMpegToggle(MWindow *mwindow, MButtons *mbuttons, int x, int y)
- : BC_Toggle(x, y, mwindow->theme->ffmpeg_toggle, mwindow->preferences->ffmpeg_early_probe)
+ : BC_Toggle(x, y, mwindow->theme->ffmpeg_toggle,
+	 mwindow->preferences->get_file_probe_armed("FFMPEG_Early") > 0 ? 1 : 0)
 {
 	this->mwindow = mwindow;
 	this->mbuttons = mbuttons;
-	set_tooltip( mwindow->preferences->ffmpeg_early_probe ?
-		_("Try FFMpeg first") : _("Try FFMpeg last"));
+	set_tooltip(get_value() ? FFMPEG_EARLY_TIP : FFMPEG_LATE_TIP);
 }
 
 FFMpegToggle::~FFMpegToggle()
@@ -2286,9 +2292,11 @@ 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"));
+	int ffmpeg_early_probe = get_value();
+	set_tooltip(ffmpeg_early_probe ? FFMPEG_EARLY_TIP : FFMPEG_LATE_TIP);
+	mwindow->preferences->set_file_probe_armed("FFMPEG_Early", ffmpeg_early_probe);
+	mwindow->preferences->set_file_probe_armed("FFMPEG_Late", !ffmpeg_early_probe);
+
 	mwindow->show_warning(&mwindow->preferences->warn_indexes,
 		_("Changing the base codecs may require rebuilding indexes."));
 	return 1;