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

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 9a49f178..14d06c93 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, 0);
 	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);
 	}