projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
upgrade to ffmpeg-2.8
[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 e8d96bbcf5ebabf7163a83f53a2e0cccd34443cd..f418ba25af742fd8510dff18ad94b5f6a2f0b1b9 100644
(file)
--- a/
cinelerra-5.0/cinelerra/preferencesthread.C
+++ b/
cinelerra-5.0/cinelerra/preferencesthread.C
@@
-49,6
+49,7
@@
#include "playbackprefs.h"
#include "preferences.h"
#include "recordprefs.h"
#include "playbackprefs.h"
#include "preferences.h"
#include "recordprefs.h"
+#include "shbtnprefs.h"
#include "theme.h"
#include "trackcanvas.h"
#include "transportque.h"
#include "theme.h"
#include "trackcanvas.h"
#include "transportque.h"
@@
-64,7
+65,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;
@@
-99,6
+100,7
@@
PreferencesThread::PreferencesThread(MWindow *mwindow)
PreferencesThread::~PreferencesThread()
{
PreferencesThread::~PreferencesThread()
{
+ close_window();
}
BC_Window* PreferencesThread::new_gui()
}
BC_Window* PreferencesThread::new_gui()
@@
-210,6
+212,7
@@
int PreferencesThread::apply_settings()
mwindow->reset_android_remote();
mwindow->gui->mbuttons->ffmpeg_toggle->update(mwindow->preferences->ffmpeg_early_probe);
mwindow->reset_android_remote();
mwindow->gui->mbuttons->ffmpeg_toggle->update(mwindow->preferences->ffmpeg_early_probe);
+ mwindow->gui->mainshbtns->load(mwindow->preferences);
//edl->session->recording_format->dump();
//mwindow->edl->session->recording_format->dump();
//edl->session->recording_format->dump();
//mwindow->edl->session->recording_format->dump();
@@
-349,7
+352,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,