projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework shapewipe gui layout
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
preferencesthread.C
diff --git
a/cinelerra-5.1/cinelerra/preferencesthread.C
b/cinelerra-5.1/cinelerra/preferencesthread.C
index 28b5ecc37c4975ec1b0c7972f097c92b006d58bb..73d8d5d4e4ab06b717729af0bee3911d5d9c5334 100644
(file)
--- a/
cinelerra-5.1/cinelerra/preferencesthread.C
+++ b/
cinelerra-5.1/cinelerra/preferencesthread.C
@@
-174,10
+174,10
@@
int PreferencesThread::update_framerate()
{
if(thread_running)
{
{
if(thread_running)
{
- lock_
gui
("PreferencesThread::update_framerate");
+ lock_
dialog
("PreferencesThread::update_framerate");
PreferencesWindow *window = (PreferencesWindow*)get_gui();
if(window) window->update_framerate();
PreferencesWindow *window = (PreferencesWindow*)get_gui();
if(window) window->update_framerate();
- unlock_
gui
();
+ unlock_
dialog
();
}
return 0;
}
}
return 0;
}
@@
-187,10
+187,10
@@
void PreferencesThread::update_rates()
{
if(thread_running)
{
{
if(thread_running)
{
- lock_
gui
("PreferencesThread::update_framerate");
+ lock_
dialog
("PreferencesThread::update_framerate");
PreferencesWindow *window = (PreferencesWindow*)get_gui();
if(window) window->update_rates();
PreferencesWindow *window = (PreferencesWindow*)get_gui();
if(window) window->update_rates();
- unlock_
gui
();
+ unlock_
dialog
();
}
}
}
}
@@
-212,6
+212,9
@@
int PreferencesThread::apply_settings()
(*this_aconfig != *aconfig) || (*this_vconfig != *vconfig) ||
!preferences->brender_asset->equivalent(*mwindow->preferences->brender_asset, 0, 1, edl);
(*this_aconfig != *aconfig) || (*this_vconfig != *vconfig) ||
!preferences->brender_asset->equivalent(*mwindow->preferences->brender_asset, 0, 1, edl);
+ if( preferences->autocolor_assets != mwindow->preferences->autocolor_assets )
+ redraw_indexes = 1;
+
if( preferences->yuv_color_space != mwindow->preferences->yuv_color_space ||
preferences->yuv_color_range != mwindow->preferences->yuv_color_range ) {
YUV::yuv.yuv_set_colors(
if( preferences->yuv_color_space != mwindow->preferences->yuv_color_space ||
preferences->yuv_color_range != mwindow->preferences->yuv_color_range ) {
YUV::yuv.yuv_set_colors(
@@
-270,7
+273,7
@@
int PreferencesThread::apply_settings()
//edl->session->recording_format->dump();
//mwindow->edl->session->recording_format->dump();
//edl->session->recording_format->dump();
//mwindow->edl->session->recording_format->dump();
-
+#ifdef GLx4
if(((mwindow->edl->session->output_w % 4) ||
(mwindow->edl->session->output_h % 4)) &&
mwindow->edl->session->playback_config->vconfig->driver == PLAYBACK_X11_GL)
if(((mwindow->edl->session->output_w % 4) ||
(mwindow->edl->session->output_h % 4)) &&
mwindow->edl->session->playback_config->vconfig->driver == PLAYBACK_X11_GL)
@@
-279,7
+282,7
@@
int PreferencesThread::apply_settings()
_("This project's dimensions are not multiples of 4 so\n"
"it can't be rendered by OpenGL."));
}
_("This project's dimensions are not multiples of 4 so\n"
"it can't be rendered by OpenGL."));
}
-
+#endif
if(redraw_meters)
{
if(redraw_meters)
{
@@
-343,9
+346,16
@@
int PreferencesThread::apply_settings()
//printf("PreferencesThread::apply_settings 10\n");
}
//printf("PreferencesThread::apply_settings 10\n");
}
- if(redraw_
times || redraw_overlay
s)
+ if(redraw_
indexe
s)
{
mwindow->gui->lock_window("PreferencesThread::apply_settings 4");
{
mwindow->gui->lock_window("PreferencesThread::apply_settings 4");
+ mwindow->gui->draw_trackmovement();
+ mwindow->gui->unlock_window();
+ }
+
+ if(redraw_times || redraw_overlays || redraw_indexes)
+ {
+ mwindow->gui->lock_window("PreferencesThread::apply_settings 5");
mwindow->gui->flush();
mwindow->gui->unlock_window();
}
mwindow->gui->flush();
mwindow->gui->unlock_window();
}