X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=e86eb4b8dfadeb9a9c1e23b3aec4659a1857470b;hp=da6056d91674465fa5e6c19b94b3ecdb10a7b22a;hb=c905fabd0678fcc8ab9e32e4443ad8709adafefd;hpb=4710b00debcb86b8ff626c4af3473afe338408ae

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index da6056d9..e86eb4b8 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -80,6 +80,7 @@
 #include "mainsession.h"
 #include "mainundo.h"
 #include "mbuttons.h"
+#include "mixersalign.h"
 #include "mutex.h"
 #include "mwindowgui.h"
 #include "mwindow.h"
@@ -240,6 +241,7 @@ MWindow::MWindow()
 	speed_edl = 0;
 	proxy_beep = 0;
 	shuttle = 0;
+	mixers_align = 0;
 }
 
 
@@ -264,6 +266,7 @@ MWindow::~MWindow()
 	delete shuttle;         shuttle = 0;
 	delete batch_render;    batch_render = 0;
 	delete render;          render = 0;
+	delete mixers_align;    mixers_align = 0;
 	commit_commercial();
 	if( commercials && !commercials->remove_user() ) commercials = 0;
 	close_mixers();
@@ -936,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
@@ -1186,8 +1182,12 @@ ZWindow *MWindow::get_mixer(Mixer *&mixer)
 	zwindows_lock->lock("MWindow::get_mixer");
 	if( !mixer ) mixer = edl->mixers.new_mixer();
 	ZWindow *zwindow = 0;
-	for( int i=0; !zwindow && i<zwindows.size(); ++i )
-		if( zwindows[i]->idx < 0 ) zwindow = zwindows[i];
+	for( int i=0; !zwindow && i<zwindows.size(); ++i ) {
+		ZWindow *zwdw = zwindows[i];
+		if( zwdw->running() ) continue;
+		if( zwdw->idx >= 0 ) continue;
+		zwindow = zwindows[i];
+	}
 	if( !zwindow )
 		zwindows.append(zwindow = new ZWindow(this));
 	zwindow->idx = mixer->idx;
@@ -1317,6 +1317,7 @@ void MWindow::close_mixers(int destroy)
 	for( int i=zwindows.size(); --i>=0; ) {
 		ZWindow *zwindow = zwindows[i];
 		if( zwindow->idx < 0 ) continue;
+		zwindow->idx = -1;
 		zwindow->destroy = destroy;
 		ZWindowGUI *zgui = zwindow->zgui;
 		zgui->lock_window("MWindow::select_zwindow 0");
@@ -1331,12 +1332,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);
@@ -1361,7 +1362,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;
@@ -1373,13 +1374,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);
 	}
 
@@ -1549,6 +1550,8 @@ void MWindow::init_menus()
 	ILACEFIXMETHODLISTADD(ILACE_FIXMETHOD_NONE);
 	ILACEFIXMETHODLISTADD(ILACE_FIXMETHOD_UPONE);
 	ILACEFIXMETHODLISTADD(ILACE_FIXMETHOD_DOWNONE);
+
+	mixers_align = new MixersAlign(this);
 }
 
 void MWindow::init_indexes()
@@ -2196,6 +2199,8 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 		edl->local_session->loop_playback = 0;
 		edl->local_session->set_selectionstart(0);
 		edl->local_session->set_selectionend(0);
+		edl->local_session->unset_inpoint();
+		edl->local_session-> unset_outpoint();
 		set_brender_active(0, 0);
 		fit_selection();
 		goto_start();
@@ -2732,6 +2737,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()
 {