X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fzwindow.C;h=a833b284fbf09c5ad866d27f22833a4cb91c984f;hb=3643286e2dbb3002604a62e3e6fd834716b4ae63;hp=3c340844cb70734a2ccf039a2783f9606db3629a;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/zwindow.C b/cinelerra-5.1/cinelerra/zwindow.C
index 3c340844..a833b284 100644
--- a/cinelerra-5.1/cinelerra/zwindow.C
+++ b/cinelerra-5.1/cinelerra/zwindow.C
@@ -32,6 +32,7 @@
 #include "renderengine.h"
 #include "timelinepane.h"
 #include "track.h"
+#include "tracks.h"
 #include "transportque.h"
 #include "zwindow.h"
 #include "zwindowgui.h"
@@ -185,9 +186,10 @@ ZWindow::ZWindow(MWindow *mwindow)
 	idx = -1;
 	edl = 0;
 	highlighted = 0;
-	destroy = 1;
+	playable = 1;
 	title[0] = 0;
 	zgui = 0;
+	zoom = 0;
 }
 
 ZWindow::~ZWindow()
@@ -207,7 +209,8 @@ BC_Window* ZWindow::new_gui()
 
 void ZWindow::handle_done_event(int result)
 {
-	if( destroy )
+	stop_playback(1);
+	if( result )
 		mwindow->del_mixer(this);
 	idx = -1;
 }
@@ -218,12 +221,11 @@ void ZWindow::handle_close_event(int result)
 
 void ZWindow::change_source(EDL *edl)
 {
-	if( this->edl && edl != this->edl )
+	if( this->edl == edl ) return;
+	zgui->playback_engine->refresh_frame(CHANGE_ALL, edl);
+	if( this->edl )
 		this->edl->remove_user();
 	this->edl = edl;
-	if( edl != 0 ) {
-		zgui->playback_engine->refresh_frame(CHANGE_ALL, edl);
-	}
 }
 
 void ZWindow::stop_playback(int wait)
@@ -231,11 +233,15 @@ void ZWindow::stop_playback(int wait)
 	zgui->playback_engine->stop_playback(wait);
 }
 
-void ZWindow::issue_command(int command, int wait_tracking,
-		int use_inout, int update_refresh, int toggle_audio, int loop_play)
+void ZWindow::handle_mixer(int command, int wait_tracking,
+		int use_inout, int toggle_audio, int loop_play, float speed)
 {
-	zgui->playback_engine->issue_command(edl, command,
-			wait_tracking, use_inout, update_refresh, toggle_audio, loop_play);
+	if( !playable ) return;
+	PlaybackEngine *engine = zgui->playback_engine;
+	engine->next_command->toggle_audio = toggle_audio;
+	engine->next_command->loop_play = loop_play;
+	engine->next_command->speed = speed;
+	engine->send_command(command, edl, wait_tracking, use_inout);
 }
 
 void ZWindow::update_mixer_ids()
@@ -256,10 +262,20 @@ void ZWindow::update_mixer_ids()
 
 void ZWindow::set_title(const char *tp)
 {
+	Track *track = 0;
 	Mixer *mixer = mwindow->edl->mixers.get_mixer(idx);
-	if( mixer ) mixer->set_title(tp);
+	if( mixer ) {
+ 		mixer->set_title(tp);
+		for( track=mwindow->edl->tracks->first; track; track=track->next ) {
+			if( track->data_type != TRACK_VIDEO ) continue;
+			int mixer_id = track->get_mixer_id();
+			int k = mixer->mixer_ids.size();
+			while( --k >= 0 && mixer_id != mixer->mixer_ids[k] );
+			if( k >= 0 ) break;
+		}
+	}
 	char *cp = title, *ep = cp + sizeof(title)-1;
-	cp += snprintf(title, ep-cp, _("Mixer %d"), idx);
+	cp += snprintf(title, ep-cp, track ? track->title : _("Mixer %d"), idx);
 	if( tp ) cp += snprintf(cp, ep-cp, ": %s", tp);
 	*cp = 0;
 }