fix segv for plugin render_gui when plugin moved up/dn, opencv build fixes, opts...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / pluginserver.C

diff --git a/cinelerra-5.1/cinelerra/pluginserver.C b/cinelerra-5.1/cinelerra/pluginserver.C
index 6e42e947a4a10b3d51e5acc34ab54f4ed78e52b6..68724f278e669cddf0c483984ec568be29e21885 100644 (file)
--- a/cinelerra-5.1/cinelerra/pluginserver.C
+++ b/cinelerra-5.1/cinelerra/pluginserver.C
@@ -80,6 +80,7 @@ void PluginServer::init()
        modules = new ArrayList<Module*>;
        nodes = new ArrayList<VirtualNode*>;
        tip = 0;
+       gui_id = -1;
 }
 
 PluginServer::PluginServer()
@@ -641,6 +642,32 @@ void PluginServer::process_buffer(Samples **buffer,
 }
 
 
+PluginGUIs::PluginGUIs(MWindow *mwindow)
+{
+       this->mwindow = mwindow;
+       this->next_id = 0;
+}
+PluginGUIs::~PluginGUIs()
+{
+}
+
+void PluginGUIs::append(PluginServer *server)
+{
+       server->gui_id = next_id++;
+       ArrayList<PluginServer*>::append(server);
+}
+
+PluginServer *PluginGUIs::gui_server(int gui_id)
+{
+       for( int i=0; i<size(); ++i ) {
+               PluginServer *plugin_server = get(i);
+               if( plugin_server->gui_id == gui_id )
+                       return plugin_server;
+       }
+       return 0;
+}
+
+
 void PluginServer::send_render_gui(void *data)
 {
 //printf("PluginServer::send_render_gui 1 %p\n", attachmentpoint);
@@ -929,8 +956,11 @@ void PluginServer::raise_window()
 void PluginServer::show_gui()
 {
        if(!plugin_open) return;
-       if(plugin) client->total_len = plugin->length;
-       if(plugin) client->source_start = plugin->startproject;
+       if( plugin ) {
+               plugin->gui_id = gui_id;
+               client->total_len = plugin->length;
+               client->source_start = plugin->startproject;
+       }
        if(video)
        {
                client->source_position = Units::to_int64(
@@ -952,6 +982,7 @@ void PluginServer::show_gui()
 void PluginServer::hide_gui()
 {
        if(!plugin_open) return;
+       if( plugin ) plugin->gui_id = -1;
        if(client->defaults) client->save_defaults();
        client->hide_gui();
 }
@@ -1301,7 +1332,14 @@ void PluginServer::sync_parameters()
        }
 }
 
-
+int64_t PluginServer::get_startproject()
+{
+       return !plugin ? -1 : plugin->startproject;
+}
+int64_t PluginServer::get_endproject()
+{
+       return !plugin ? -1 : plugin->startproject + plugin->length;
+}
 
 void PluginServer::dump(FILE *fp)
 {