projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blade and hard egdes, undo cache reset bug, sams ladspa icons, theme image access...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
pluginclient.C
diff --git
a/cinelerra-5.1/cinelerra/pluginclient.C
b/cinelerra-5.1/cinelerra/pluginclient.C
index bc6ca8eb9e191841b4ecb4952e1edf96fb3370d8..aaec69d86e107e92da749a70a46a63b3a7b6d26e 100644
(file)
--- a/
cinelerra-5.1/cinelerra/pluginclient.C
+++ b/
cinelerra-5.1/cinelerra/pluginclient.C
@@
-337,14
+337,8
@@
int PluginClient::show_gui()
thread->start();
thread->init_complete->lock("PluginClient::show_gui");
// Must wait before sending any hide_gui
thread->start();
thread->init_complete->lock("PluginClient::show_gui");
// Must wait before sending any hide_gui
- if(thread->window)
- {
- thread->window->init_wait();
- }
- else
- {
- return 1;
- }
+ if( !thread->window ) return 1;
+ thread->window->init_wait();
return 0;
}
return 0;
}
@@
-736,39
+730,29
@@
int PluginClient::get_interpolation_type()
float PluginClient::get_red()
{
float PluginClient::get_red()
{
- if(server->mwindow)
- return server->mwindow->edl->local_session->red;
- else
- if(server->edl)
- return server->edl->local_session->red;
- else
- return 0;
+ EDL *edl = server->mwindow ? server->mwindow->edl : server->edl;
+ return !edl ? 0 : edl->local_session->use_max ?
+ edl->local_session->red_max :
+ edl->local_session->red;
}
float PluginClient::get_green()
{
}
float PluginClient::get_green()
{
- if(server->mwindow)
- return server->mwindow->edl->local_session->green;
- else
- if(server->edl)
- return server->edl->local_session->green;
- else
- return 0;
+ EDL *edl = server->mwindow ? server->mwindow->edl : server->edl;
+ return !edl ? 0 : edl->local_session->use_max ?
+ edl->local_session->green_max :
+ edl->local_session->green;
}
float PluginClient::get_blue()
{
}
float PluginClient::get_blue()
{
- if(server->mwindow)
- return server->mwindow->edl->local_session->blue;
- else
- if(server->edl)
- return server->edl->local_session->blue;
- else
- return 0;
+ EDL *edl = server->mwindow ? server->mwindow->edl : server->edl;
+ return !edl ? 0 : edl->local_session->use_max ?
+ edl->local_session->blue_max :
+ edl->local_session->blue;
}
}
-
int64_t PluginClient::get_source_position()
{
return source_position;
int64_t PluginClient::get_source_position()
{
return source_position;