X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=702bd8a7c6fde6bb0aaa68bbe0354f74b607efd2;hb=9ffdfbe8e6fa7daaad4dcfdd46b6ac7b6e7a47e8;hp=0fe6752f3598394b1fe16e6d1900e18a6c0631ba;hpb=1da768016a2ecba0296b03d75c02879f99a0f582;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 0fe6752f..702bd8a7 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -243,6 +243,7 @@ MWindow::MWindow()
 	in_destructor = 0;
 	speed_edl = 0;
 	beeper = 0;
+	redraw_tracks = 0;
 	shuttle = 0;
 	wintv = 0;
 	x10tv = 0;
@@ -265,9 +266,10 @@ MWindow::~MWindow()
 #ifdef HAVE_DVB
 	gui->channel_info->stop();
 #endif
-	delete beeper;
-	delete create_bd;       create_bd = 0;
-	delete create_dvd;      create_dvd = 0;
+	delete beeper;		beeper = 0;
+	delete redraw_tracks;	redraw_tracks = 0;
+	delete create_bd;	create_bd = 0;
+	delete create_dvd;	create_dvd = 0;
 #ifdef HAVE_SHUTTLE
 	delete shuttle;         shuttle = 0;
 #endif
@@ -1210,6 +1212,20 @@ ZWindow *MWindow::get_mixer(Mixer *&mixer)
 	return zwindow;
 }
 
+ZWindow *MWindow::get_mixer(int idx)
+{
+	ZWindow *zwindow = 0;
+	zwindows_lock->lock("MWindow::get_mixer");
+	for( int i=0; !zwindow && i<zwindows.size(); ++i ) {
+		ZWindow *zwdw = zwindows[i];
+		if( !zwdw->running() ) continue;
+		if( zwdw->idx != idx ) continue;
+		zwindow = zwindows[i];
+	}
+	zwindows_lock->unlock();
+	return zwindow;
+}
+
 void MWindow::close_mixer(ZWindow *zwindow)
 {
 	zwindows_lock->lock("MWindow::close_mixer 0");
@@ -1296,11 +1312,11 @@ void MWindow::handle_mixers(EDL *edl, int command, int wait_tracking,
 			k = mixer->mixer_ids.size();
 			while( --k >= 0 && track->get_mixer_id() != mixer->mixer_ids[k] );
 			if( k >= 0 ) {
-				track->record = 1;
+				track->armed = 1;
 				track->play = track->data_type == TRACK_VIDEO ? 1 : 0;
 			}
 			else
-				track->record = track->play = 0;
+				track->armed = track->play = 0;
 		}
 		zwindow->change_source(mixer_edl);
 		zwindow->handle_mixer(command, 0,
@@ -1355,7 +1371,7 @@ ZWindow *MWindow::create_mixer(Indexable *indexable, double position)
 	Mixer *mixer = 0;
 	ZWindow *zwindow = get_mixer(mixer);
 	while( track ) {
-		track->play = track->record = 0;
+		track->play = track->armed = 0;
 		if( track->data_type == TRACK_VIDEO ) {
 			sprintf(track->title, _("Mixer %d"), zwindow->idx);
 		}
@@ -1498,6 +1514,14 @@ void MWindow::tile_mixers()
 	}
 }
 
+void MWindow::set_gang_tracks(int v)
+{
+	edl->session->gang_tracks = v;
+	gui->update(1, 1, 0, 0, 1, 0, 0);
+	gui->flush();
+}
+
+
 void MWindow::init_cache()
 {
 	audio_cache = new CICache(preferences);
@@ -1768,7 +1792,7 @@ int MWindow::put_commercial()
 	//check it
 	for(Track *track=tracks->first; track && !errmsg; track=track->next) {
 		if( track->data_type != TRACK_VIDEO ) continue;
-		if( !track->record ) continue;
+		if( !track->armed ) continue;
 		if( count > 0 ) { errmsg = _("multiple video tracks"); break; }
 		++count;
 		int64_t units_start = track->to_units(start,0);
@@ -1788,7 +1812,7 @@ int MWindow::put_commercial()
 	//run it
 	for(Track *track=tracks->first; track && !errmsg; track=track->next) {
 		if( track->data_type != TRACK_VIDEO ) continue;
-		if( !track->record ) continue;
+		if( !track->armed ) continue;
 		int64_t units_start = track->to_units(start,0);
 		int64_t units_end = track->to_units(end,0);
 		Edits *edits = track->edits;
@@ -2468,8 +2492,6 @@ int MWindow::to_proxy(Asset *asset, int new_scale, int new_use_scaler)
 		for( int i=0,n=edl->nested_edls.size(); i<n; ++i ) {
 			EDL *orig_nested = edl->nested_edls[i];
 			char new_path[BCTEXTLEN];
-			if( !ProxyRender::from_proxy_path(new_path, orig_nested, proxy_scale) )
-				continue;
 			proxy_render.to_proxy_path(new_path, orig_nested, proxy_scale);
 // test if proxy asset was already added to proxy_assets
 			int got_it = 0;
@@ -2973,6 +2995,7 @@ void MWindow::show_lwindow()
 
 void MWindow::restore_windows()
 {
+	gui->unlock_window();
 	if( !session->show_vwindow ) {
 		for( int i=0, n=vwindows.size(); i<n; ++i ) {
 			VWindow *vwindow = vwindows[i];
@@ -3017,6 +3040,7 @@ void MWindow::restore_windows()
 	else if( session->show_lwindow && lwindow->gui->is_hidden() )
 		show_lwindow();
 
+	gui->lock_window("MWindow::restore_windows");
 	gui->focus();
 }
 
@@ -3405,7 +3429,7 @@ int MWindow::get_hash_color(Edit *edit)
 	char path[BCTEXTLEN];
 	if( !edit->asset || edit->track->data_type != TRACK_VIDEO ||
 	    edl->session->proxy_scale == 1 ||
-	    ProxyRender::from_proxy_path(path, idxbl, edl->session->proxy_scale) )
+	    ProxyRender::from_proxy_path(path, (Asset*)idxbl, edl->session->proxy_scale) )
 		strcpy(path, idxbl->path);
 	char *cp = strrchr(path, '/');
 	cp = !cp ? path : cp+1;
@@ -3978,7 +4002,7 @@ void MWindow::clip_to_media()
 		char *bp = strrchr(clip->local_session->clip_title, '/');
 		bp = bp ? bp+1 : clip->local_session->clip_title;
 		cp += snprintf(cp, ep-cp, "%s", bp);
-		EDL *nested = edl->new_nested_edl(clip, path);
+		EDL *nested = edl->new_nested_clip(clip, path);
 		edl->clips.remove(clip);
 		clip->remove_user();
 		mainindexes->add_indexable(nested);
@@ -4441,7 +4465,9 @@ int MWindow::create_aspect_ratio(float &w, float &h, int width, int height)
 
 void MWindow::reset_caches()
 {
-	awindow->gui->stop_vicon_drawing();
+	int locked  = gui->get_window_lock();
+	if( locked ) gui->unlock_window();
+	awindow->gui->stop_vicon_drawing(1);
 	frame_cache->remove_all();
 	wave_cache->remove_all();
 	audio_cache->remove_all();
@@ -4461,11 +4487,12 @@ void MWindow::reset_caches()
 		if( vwindow->playback_engine->video_cache )
 			vwindow->playback_engine->video_cache->remove_all();
 	}
+	if( locked ) gui->lock_window("MWindow::reset_caches");
 }
 
 void MWindow::remove_from_caches(Indexable *idxbl)
 {
-	awindow->gui->stop_vicon_drawing();
+	awindow->gui->stop_vicon_drawing(1);
 	frame_cache->remove_item(idxbl);
 	wave_cache->remove_item(idxbl);
 	if( gui->render_engine &&
@@ -4505,7 +4532,7 @@ void MWindow::remove_from_caches(Indexable *idxbl)
 void MWindow::remove_assets_from_project(int push_undo, int redraw, int delete_indexes,
 		ArrayList<Indexable*> *drag_assets, ArrayList<EDL*> *drag_clips)
 {
-	awindow->gui->stop_vicon_drawing();
+	awindow->gui->stop_vicon_drawing(1);
 
 // Remove from VWindow.
 	if( drag_clips ) {
@@ -4989,7 +5016,7 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
 				track->track_h = edl->session->output_h;
 			}
 			else if( delete_tracks )
-				edl->tracks->delete_track(track);
+				edl->tracks->delete_track(track, 0);
 		}
 		edl->retrack();
 		edl->resample(old_framerate, session->frame_rate, TRACK_VIDEO);
@@ -5025,7 +5052,7 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
 						delete edit;
 				}
 				if( !track->edits->first )
-					edl->tracks->delete_track(track);
+					edl->tracks->delete_track(track, 0);
 			}
 		}
 		edl->rechannel();
@@ -5121,3 +5148,28 @@ int MWindow::get_cpus()
 	return get_cpus(edl->session->output_w, edl->session->output_h);
 }
 
+void MWindow::draw_trackmovement()
+{
+	if( !redraw_tracks )
+		redraw_tracks = new DrawTrackMovement(this);
+	redraw_tracks->start();
+}
+
+DrawTrackMovement::DrawTrackMovement(MWindow *mwindow)
+ : Thread(1, 0, 0)
+{
+	this->mwindow = mwindow;
+}
+DrawTrackMovement::~DrawTrackMovement()
+{
+	join();
+}
+
+void DrawTrackMovement::run()
+{
+	mwindow->gui->lock_window("DrawTrackMovement::run");
+	mwindow->edl->tracks->update_y_pixels(mwindow->theme);
+	mwindow->gui->draw_trackmovement();
+	mwindow->gui->unlock_window();
+}
+