projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
no /. in ffmpeg init_decode segv, build index fix audio wave, stop playback state...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
mwindow.C
diff --git
a/cinelerra-5.1/cinelerra/mwindow.C
b/cinelerra-5.1/cinelerra/mwindow.C
index 14d06c93d7ce38e60a5ec28eb9f4cb9384071367..66b37fa922be50e2c4c168ad7422fe9f7d262c19 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindow.C
+++ b/
cinelerra-5.1/cinelerra/mwindow.C
@@
-939,7
+939,7
@@
void MWindow::init_preferences()
{
preferences = new Preferences;
preferences->load_defaults(defaults);
{
preferences = new Preferences;
preferences->load_defaults(defaults);
- File::setenv_path("LV2_PATH",preferences->lv2_path,
0
);
+ File::setenv_path("LV2_PATH",preferences->lv2_path,
1
);
session = new MainSession(this);
session->load_defaults(defaults);
// set x11_host, screens, window_config
session = new MainSession(this);
session->load_defaults(defaults);
// set x11_host, screens, window_config
@@
-2730,6
+2730,12
@@
void MWindow::create_objects(int want_gui,
BC_WindowBase::get_resources()->vframe_shm = 1;
}
BC_WindowBase::get_resources()->vframe_shm = 1;
}
+int MWindow::uses_opengl()
+{
+ if( !playback_3d || !playback_3d->running() ) return 0;
+ PlaybackConfig *playback_config = edl->session->playback_config;
+ return playback_config->vconfig->driver == PLAYBACK_X11_GL ? 1 : 0;
+}
void MWindow::show_splash()
{
void MWindow::show_splash()
{