X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpluginclient.C;h=417dd917e2c4f0e9bb8e7f76b74e28323871e701;hb=6853a2c0b04cc5ff4e87a2022c914227f925cb7f;hp=6af3a3139a00c8fa67617869c84c553407c8a626;hpb=f110e7626d433b4724befe0871a3a35f9f81f264;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/pluginclient.C b/cinelerra-5.1/cinelerra/pluginclient.C
index 6af3a313..417dd917 100644
--- a/cinelerra-5.1/cinelerra/pluginclient.C
+++ b/cinelerra-5.1/cinelerra/pluginclient.C
@@ -75,7 +75,7 @@ void PluginClientThread::run()
 	if(client->window_x < 0) client->window_x = info.get_abs_cursor_x();
 	if(client->window_y < 0) client->window_y = info.get_abs_cursor_y();
 	if(!window)
-		window = client->new_window();
+		window = (PluginClientWindow*)client->new_window();
 
 	if(window) {
 		window->lock_window("PluginClientThread::run");
@@ -91,6 +91,7 @@ void PluginClientThread::run()
 //printf("PluginClientThread::run %p %d\n", this, __LINE__);
 		window->hide_window(1);
 		window->unlock_window();
+		window->done_event(result);
 // Can't save defaults in the destructor because it's not called immediately
 // after closing.
 		/* if(client->defaults) */ client->save_defaults_xml();
@@ -148,14 +149,19 @@ PluginClientWindow::PluginClientWindow(PluginClient *client,
  : BC_Window(client->gui_string,
 	client->window_x /* - w / 2 */,
 	client->window_y /* - h / 2 */,
-	w, h, min_w, min_h, allow_resize, 0, 1)
+	(int)(w*get_resources()->font_scale+0.5), (int)(h*get_resources()->font_scale+0.5),
+	(int)(min_w*get_resources()->font_scale+0.5), (int)(min_h*get_resources()->font_scale+0.5),
+	allow_resize, 0, 1)
 {
 	this->client = client;
 }
 
 PluginClientWindow::PluginClientWindow(const char *title,
 	int x, int y, int w, int h, int min_w, int min_h, int allow_resize)
- : BC_Window(title, x, y, w, h, min_w, min_h, allow_resize, 0, 1)
+ : BC_Window(title, x, y,
+        (int)(w*get_resources()->font_scale+0.5), (int)(h*get_resources()->font_scale+0.5),
+        (int)(min_w*get_resources()->font_scale+0.5), (int)(min_h*get_resources()->font_scale+0.5),
+	allow_resize, 0, 1)
 {
 	this->client = 0;
 }
@@ -336,14 +342,8 @@ int PluginClient::show_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;
 }
 
@@ -735,39 +735,29 @@ int PluginClient::get_interpolation_type()
 
 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()
 {
-	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()
 {
-	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;