X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=cf16cd9354528066b1f040cbe60055c2d7df0aa1;hb=81915b8dd7046fd88697e3a9cc1a11b891be62db;hp=4afbd81888f3f67b020d023f8c61dd7d3db5f81e;hpb=84ac8a2bb3357c04a3f67cf763b0f61ddbbd021d;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 4afbd818..cf16cd93 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -303,7 +303,7 @@ MWindow::~MWindow()
 	gui->del_keyboard_listener(
 		(int (BC_WindowBase::*)(BC_WindowBase *))
 		&MWindowGUI::keyboard_listener);
-	reset_caches();
+	reset_caches(0);
 #if 0
 // release the hounds
 	if( awindow && awindow->gui ) awindow->gui->close(0);
@@ -2919,7 +2919,7 @@ void MWindow::run()
 	run_lock->unlock();
 }
 
-void MWindow::show_vwindow()
+void MWindow::show_vwindow(int raise)
 {
 	int total_running = 0;
 	session->show_vwindow = 1;
@@ -2929,19 +2929,17 @@ void MWindow::show_vwindow()
 	for(int j = 0; j < vwindows.size(); j++) {
 		VWindow *vwindow = vwindows[j];
 		if( !vwindow->is_running() ) continue;
+		total_running++;
+		if( !raise && !vwindow->gui->is_hidden() ) continue;
 		vwindow->gui->lock_window("MWindow::show_vwindow");
 		vwindow->gui->show_window(0);
 		vwindow->gui->raise_window();
 		vwindow->gui->flush();
 		vwindow->gui->unlock_window();
-		total_running++;
 	}
-
 // If no windows visible
-	if(!total_running)
-	{
+	if( !total_running )
 		get_viewer(1, DEFAULT_VWINDOW);
-	}
 
 	gui->mainmenu->show_vwindow->set_checked(1);
 }
@@ -3016,8 +3014,8 @@ void MWindow::restore_windows()
 			vwindow->gui->unlock_window();
 		}
 	}
-	else
-		show_vwindow();
+	else 
+		show_vwindow(0);
 
 	if( !session->show_awindow && !awindow->gui->is_hidden() ) {
 		awindow->gui->lock_window("MWindow::restore_windows");
@@ -4089,18 +4087,18 @@ void MWindow::update_preferences(Preferences *prefs)
 	if( prefs != preferences )
 		preferences->copy_from(prefs);
 	if( cwindow->playback_engine )
-		cwindow->playback_engine->preferences->copy_from(prefs);
+		cwindow->playback_engine->update_preferences(prefs);
 	for(int i = 0; i < vwindows.size(); i++) {
 		VWindow *vwindow = vwindows[i];
 		if( !vwindow->is_running() ) continue;
 		if( vwindow->playback_engine )
-			vwindow->playback_engine->preferences->copy_from(prefs);
+			vwindow->playback_engine->update_preferences(prefs);
 	}
 	for(int i = 0; i < zwindows.size(); i++) {
 		ZWindow *zwindow = zwindows[i];
 		if( !zwindow->is_running() ) continue;
 		if( zwindow->zgui->playback_engine )
-			zwindow->zgui->playback_engine->preferences->copy_from(prefs);
+			zwindow->zgui->playback_engine->update_preferences(prefs);
 	}
 }
 
@@ -4475,31 +4473,24 @@ int MWindow::create_aspect_ratio(float &w, float &h, int width, int height)
 	return 0;
 }
 
-void MWindow::reset_caches()
+void MWindow::reset_caches(int locked)
 {
-	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();
-	video_cache->remove_all();
-	if( cwindow->playback_engine ) {
-		if( cwindow->playback_engine->audio_cache )
-			cwindow->playback_engine->audio_cache->remove_all();
-		if( cwindow->playback_engine->video_cache )
-			cwindow->playback_engine->video_cache->remove_all();
-	}
+	if( cwindow->playback_engine )
+		cwindow->playback_engine->create_cache();
 	for(int i = 0; i < vwindows.size(); i++) {
 		VWindow *vwindow = vwindows[i];
 		if( !vwindow->is_running() ) continue;
 		if( !vwindow->playback_engine ) continue;
-		if( vwindow->playback_engine->audio_cache )
-			vwindow->playback_engine->audio_cache->remove_all();
-		if( vwindow->playback_engine->video_cache )
-			vwindow->playback_engine->video_cache->remove_all();
+		vwindow->playback_engine->create_cache();
 	}
-	if( locked ) gui->lock_window("MWindow::reset_caches");
+	gui->lock_window("MWindow::reset_caches");
+	frame_cache->remove_all();
+	wave_cache->remove_all();
+	audio_cache->remove_all();
+	video_cache->remove_all();
+	if( !locked ) gui->unlock_window();
 }
 
 void MWindow::remove_from_caches(Indexable *idxbl)