X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fzwindow.C;h=a833b284fbf09c5ad866d27f22833a4cb91c984f;hb=fb3e53778e49a406768506de9bf8edfd3d4c36e6;hp=f40e804b19d3f73e412366e4ad1883d24e04ea80;hpb=5d8a7826b0f80f00622e46baf75453995a76e343;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/zwindow.C b/cinelerra-5.1/cinelerra/zwindow.C
index f40e804b..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,8 +186,10 @@ ZWindow::ZWindow(MWindow *mwindow)
 	idx = -1;
 	edl = 0;
 	highlighted = 0;
+	playable = 1;
 	title[0] = 0;
 	zgui = 0;
+	zoom = 0;
 }
 
 ZWindow::~ZWindow()
@@ -233,6 +236,7 @@ void ZWindow::stop_playback(int wait)
 void ZWindow::handle_mixer(int command, int wait_tracking,
 		int use_inout, int toggle_audio, int loop_play, float speed)
 {
+	if( !playable ) return;
 	PlaybackEngine *engine = zgui->playback_engine;
 	engine->next_command->toggle_audio = toggle_audio;
 	engine->next_command->loop_play = loop_play;
@@ -258,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;
 }