projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update internationalization data
[goodguy/history.git]
/
cinelerra-5.0
/
cinelerra
/
preferencesthread.C
diff --git
a/cinelerra-5.0/cinelerra/preferencesthread.C
b/cinelerra-5.0/cinelerra/preferencesthread.C
index dc52ad4cb8e82c3b93b1a1f8776e54dc6d975d86..b52b3594f8f0767771727cb2c065e0a6f8268d3f 100644
(file)
--- a/
cinelerra-5.0/cinelerra/preferencesthread.C
+++ b/
cinelerra-5.0/cinelerra/preferencesthread.C
@@
-38,6
+38,7
@@
#include "levelwindow.h"
#include "levelwindowgui.h"
#include "mainerror.h"
#include "levelwindow.h"
#include "levelwindowgui.h"
#include "mainerror.h"
+#include "mbuttons.h"
#include "meterpanel.h"
#include "mutex.h"
#include "mwindow.h"
#include "meterpanel.h"
#include "mutex.h"
#include "mwindow.h"
@@
-63,7
+64,7
@@
PreferencesMenuitem::PreferencesMenuitem(MWindow *mwindow)
PreferencesMenuitem::PreferencesMenuitem(MWindow *mwindow)
- : BC_MenuItem(_("Preferences..."),
"Shift+P"
, 'P')
+ : BC_MenuItem(_("Preferences..."),
_("Shift+P")
, 'P')
{
this->mwindow = mwindow;
{
this->mwindow = mwindow;
@@
-208,6
+209,7
@@
int PreferencesThread::apply_settings()
BC_Signals::set_catch_intr(mwindow->preferences->trap_sigintr);
mwindow->reset_android_remote();
BC_Signals::set_catch_intr(mwindow->preferences->trap_sigintr);
mwindow->reset_android_remote();
+ mwindow->gui->mbuttons->ffmpeg_toggle->update(mwindow->preferences->ffmpeg_early_probe);
//edl->session->recording_format->dump();
//mwindow->edl->session->recording_format->dump();
//edl->session->recording_format->dump();
//mwindow->edl->session->recording_format->dump();
@@
-347,7
+349,7
@@
PreferencesWindow::PreferencesWindow(MWindow *mwindow,
PreferencesThread *thread,
int x,
int y)
PreferencesThread *thread,
int x,
int y)
- : BC_Window(
PROGRAM_NAME ": Preferences"
,
+ : BC_Window(
_(PROGRAM_NAME ": Preferences")
,
x,
y,
WIDTH,
x,
y,
WIDTH,