X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferencesthread.C;h=bf921724d531bee53da724ae209c508aa9aae89b;hb=eecf057a9d6b8c8cffc7d0001bff89bc9cac7b05;hp=dbda188f782fa605f920ad5f76e8d7dd9b4dd7c0;hpb=b5c58822be78c8820692c916e296a2230bb2b9e2;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/preferencesthread.C b/cinelerra-5.1/cinelerra/preferencesthread.C
index dbda188f..bf921724 100644
--- a/cinelerra-5.1/cinelerra/preferencesthread.C
+++ b/cinelerra-5.1/cinelerra/preferencesthread.C
@@ -211,6 +211,25 @@ int PreferencesThread::apply_settings()
 		(*this_aconfig != *aconfig) || (*this_vconfig != *vconfig) ||
 		!preferences->brender_asset->equivalent(*mwindow->preferences->brender_asset, 0, 1, edl);
 
+	if( preferences->yuv_color_space != mwindow->preferences->yuv_color_space ||
+	    preferences->yuv_color_range != mwindow->preferences->yuv_color_range ) {
+		YUV::yuv.yuv_set_colors(
+			preferences->yuv_color_space,
+			preferences->yuv_color_range);
+		rerender = 1;
+	}
+
+	if( preferences->highlight_inverse != mwindow->preferences->highlight_inverse ) {
+		mwindow->gui->lock_window("PreferencesThread::apply_settings 0");
+		mwindow->gui->hide_cursor(0);
+		mwindow->gui->unlock_window();
+		redraw_overlays = 1;
+	}
+	PreferencesWindow *window = (PreferencesWindow*)get_gui();
+	if( window ) window->unlock_window();
+	mwindow->init_brender();
+	if( window ) window->lock_window("PreferencesThread::apply_settings 5");
+
 	if( strcmp(preferences->theme, mwindow->preferences->theme) != 0 )
 		mwindow->restart_status = -1; // reload, need new bcresources
 	if( strcmp(preferences->plugin_icons, mwindow->preferences->plugin_icons) != 0 )
@@ -218,7 +237,6 @@ int PreferencesThread::apply_settings()
 
 	mwindow->edl->copy_session(edl, 1);
 	mwindow->preferences->copy_from(preferences);
-	mwindow->init_brender();
 
 	BC_Signals::set_catch_segv(mwindow->preferences->trap_sigsegv);
 	BC_Signals::set_catch_intr(mwindow->preferences->trap_sigintr);
@@ -233,7 +251,7 @@ int PreferencesThread::apply_settings()
 	}
 
 	mwindow->reset_android_remote();
-	int ffmpeg_early_probe = mwindow->preferences->get_file_probe_armed("FFPMEG_Early");
+	int ffmpeg_early_probe = mwindow->preferences->get_file_probe_armed("FFMPEG_Early");
 	mwindow->gui->ffmpeg_toggle->update(ffmpeg_early_probe);
 	mwindow->gui->ffmpeg_toggle->set_tooltip(ffmpeg_early_probe ?
 		FFMPEG_EARLY_TIP : FFMPEG_LATE_TIP);
@@ -292,6 +310,7 @@ int PreferencesThread::apply_settings()
 	if(redraw_overlays)
 	{
 		mwindow->gui->lock_window("PreferencesThread::apply_settings 2");
+		mwindow->gui->show_cursor(0);
 		mwindow->gui->draw_overlays(1);
 		mwindow->gui->unlock_window();
 	}
@@ -309,10 +328,7 @@ int PreferencesThread::apply_settings()
 //printf("PreferencesThread::apply_settings 1\n");
 // This doesn't stop and restart, only reloads the assets before
 // the next play command.
-		mwindow->cwindow->playback_engine->que->send_command(CURRENT_FRAME,
-			CHANGE_ALL,
-			mwindow->edl,
-			1);
+		mwindow->cwindow->refresh_frame(CHANGE_ALL, mwindow->edl);
 //printf("PreferencesThread::apply_settings 10\n");
 	}