X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpluginlv2ui.C;h=17f072a2c6bf63b6c5960f21d7c364aa10e5199c;hp=b8f99ab1318d1ada59f5a20cfbdc4c91adbd1702;hb=502b6f3b6fd04f6b01c6d70dcb81aa304dd0db1c;hpb=02595181cff2bce97eb19634bc3855778cb8c3b6

diff --git a/cinelerra-5.1/cinelerra/pluginlv2ui.C b/cinelerra-5.1/cinelerra/pluginlv2ui.C
index b8f99ab1..17f072a2 100644
--- a/cinelerra-5.1/cinelerra/pluginlv2ui.C
+++ b/cinelerra-5.1/cinelerra/pluginlv2ui.C
@@ -160,13 +160,38 @@ void PluginLV2UI::run_lilv(int samples)
 
 void PluginLV2ChildUI::start_gui()
 {
-	gui->start_gui();
+	if( gui ) gui->start_gui();
 	update_lv2_input(config.ctls, 1);
 	connect_ports(config, PORTS_CONTROL | PORTS_ATOM);
+	int n = 0;
+#if 1
+// some plugins must have pointers, or they crash
+	float inp[nb_inputs], out[nb_outputs];
+	memset(&inp, 0, nb_inputs*sizeof(float));
+	memset(&out, 0, nb_outputs*sizeof(float));
+	int ich = 0, och = 0;
+	for( int i=0; i<config.nb_ports; ++i ) {
+		const LilvPort *lp = lilv_plugin_get_port_by_index(lilv, i);
+		if( !lp ) continue;
+		int port = config.ports[i];
+		if( !(port & PORTS_AUDIO) ) continue;
+		if( (port & PORTS_INPUT) ) {
+			lilv_instance_connect_port(inst, i, &inp[ich++]);
+			continue;
+		}
+		if( (port & PORTS_OUTPUT) ) {
+			lilv_instance_connect_port(inst, i, &out[och++]);
+			continue;
+		}
+	}
+	n = 1;
+#endif
 	updates = 0;
-	run_lilv(0);
-	send_host(LV2_SHOW, 0, 0);
-	hidden = 0;
+	run_lilv(n);
+	if( gui ) {
+		send_host(LV2_SHOW, 0, 0);
+		hidden = 0;
+	}
 }
 
 void PluginLV2UI::update_host()
@@ -183,19 +208,14 @@ static void lv2ui_extui_host_ui_closed(void *p)
 	ui->hidden = -1;
 }
 
-int PluginLV2ChildUI::init_ui(const char *path, int sample_rate)
+int PluginLV2ChildUI::init_ui(const char *path, int sample_rate, int bfrsz)
 {
 	char *title = PluginLV2UI::title;
 	if( load_lv2(path, title) ) return 1;
-	if( init_lv2(config, sample_rate) ) return 1;
+	if( init_lv2(config, sample_rate, bfrsz) ) return 1;
 
 	lilv_uis = lilv_plugin_get_uis(lilv);
-	if( !lilv_uis ) {
-		printf("lv2: lilv_plugin_get_uis(%s) failed\n", path);
-		return 1;
-	}
-
-	if( !gui && wgt_type ) {
+	if( !gui && lilv_uis && wgt_type ) {
 		LilvNode *gui_type = lilv_new_uri(world, wgt_type);
 		LILV_FOREACH(uis, i, lilv_uis) {
 			const LilvUI *ui = lilv_uis_get(lilv_uis, i);
@@ -209,7 +229,7 @@ int PluginLV2ChildUI::init_ui(const char *path, int sample_rate)
 		}
 		lilv_node_free(gui_type);
 	}
-	if( !gui && gtk_type ) {
+	if( !gui && lilv_uis && gtk_type ) {
 		LilvNode *gui_type = lilv_new_uri(world, gtk_type);
 		LILV_FOREACH(uis, i, lilv_uis) {
 			const LilvUI *ui = lilv_uis_get(lilv_uis, i);
@@ -224,18 +244,13 @@ int PluginLV2ChildUI::init_ui(const char *path, int sample_rate)
 		ui_type = gtk_type;
 	}
 
-	if( !gui ) {
-		printf("lv2_gui: init_ui failed: %s\n", title);
-		return 1;
-	}
-
 	lilv_instance_activate(inst);
 	return 0;
 }
 
 void PluginLV2ChildUI::reset_gui()
 {
-	gui->reset_gui();
+	if( gui ) gui->reset_gui();
 	if( sinst )     { suil_instance_free(sinst);  sinst = 0; }
 	if( ui_host )   { suil_host_free(ui_host);    ui_host = 0; }
 
@@ -248,16 +263,19 @@ void PluginLV2ChildUI::reset_gui()
 // main loop
 int PluginLV2ChildUI::run_ui()
 {
-	double last_time = 0, fps = 30;
-	int64_t frame_usecs = 1e6 / fps;
+	double last_time = 0;
+	int64_t frame_usecs = 1e6 / refreshrate;
 	running = 1;
 	done = 0;
 	while( !done ) {
 		if( hidden < 0 ) {
-			gui->top_level = 0;
+			if( gui ) gui->top_level = 0;
 			reset_gui();
-			done = -1;
-			break;
+			if( !is_forked() ) {
+				done = -1;
+				break;
+			}
+			hidden = 1;
 		}
 		if( updates ) {
 			if( (updates & UPDATE_PORTS) )
@@ -292,13 +310,16 @@ int PluginLV2ChildUI::child_iteration(int64_t usec)
 	int ret = 0;
 	if( is_forked() )
 		ret = read_child(usec);
-	else
+	else if( gui )
 		usleep(usec);
+	else
+		ret = -1;
+
 	if( ret > 0 ) {
 		switch( child_token ) {
 		case LV2_OPEN: {
 			open_bfr_t *open_bfr = (open_bfr_t *)child_data;
-			if( init_ui(open_bfr->path, open_bfr->sample_rate) ) {
+			if( init_ui(open_bfr->path, open_bfr->sample_rate, open_bfr->bfrsz) ) {
 				printf("lv2ui: unable to init: %s\n", open_bfr->path);
 				exit(1);
 			}