X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=66b37fa922be50e2c4c168ad7422fe9f7d262c19;hb=686bc04a488847170d80ec603f8c33962a7aa928;hp=9a49f178ceb33b3d0765ad37e1d6235953244629;hpb=4a6b59824b2db18e6cc49b43a971923d5e5903ae;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 9a49f178..66b37fa9 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -939,14 +939,7 @@ void MWindow::init_preferences()
 {
 	preferences = new Preferences;
 	preferences->load_defaults(defaults);
-	const char *lv2_path = getenv("LV2_PATH");
-	if( lv2_path && strcmp(lv2_path, preferences->lv2_path) ) {
-		strncpy(preferences->lv2_path, lv2_path, sizeof(preferences->lv2_path));
-		remove_plugin_index();
-	}
-	else if( !lv2_path && preferences->lv2_path[0] ) {
-		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
@@ -1334,12 +1327,12 @@ void MWindow::close_mixers(int destroy)
 	}
 }
 
-ZWindow *MWindow::create_mixer(Indexable *indexable)
+ZWindow *MWindow::create_mixer(Indexable *indexable, double position)
 {
 	ArrayList<Indexable*> new_assets;
 	new_assets.append(indexable);
 	Track *track = edl->tracks->last;
-	load_assets(&new_assets, 0, LOADMODE_NEW_TRACKS, 0, 0, 0, 0, 0, 0);
+	load_assets(&new_assets, position, LOADMODE_NEW_TRACKS, 0, 0, 0, 0, 0, 0);
 	track = !track ? edl->tracks->first : track->next;
 	Mixer *mixer = 0;
 	ZWindow *zwindow = get_mixer(mixer);
@@ -1364,7 +1357,7 @@ ZWindow *MWindow::create_mixer(Indexable *indexable)
 	return zwindow;
 }
 
-void MWindow::create_mixers()
+void MWindow::create_mixers(double position)
 {
 	if( !session->drag_assets->size() &&
 	    !session->drag_clips->size() ) return;
@@ -1376,13 +1369,13 @@ void MWindow::create_mixers()
 	for( int i=0; i<session->drag_assets->size(); ++i ) {
 		Indexable *indexable = session->drag_assets->get(i);
 		if( !indexable->have_video() ) continue;
-		ZWindow *zwindow = create_mixer(indexable);
+		ZWindow *zwindow = create_mixer(indexable, position);
 		new_mixers.append(zwindow);
 	}
 	for( int i=0; i<session->drag_clips->size(); ++i ) {
 		Indexable *indexable = (Indexable*)session->drag_clips->get(i);
 		if( !indexable->have_video() ) continue;
-		ZWindow *zwindow = create_mixer(indexable);
+		ZWindow *zwindow = create_mixer(indexable, position);
 		new_mixers.append(zwindow);
 	}
 
@@ -2737,6 +2730,12 @@ void MWindow::create_objects(int want_gui,
 	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()
 {