1.1 --- a/naspro-bridges-bad/dssi/descriptor.c	Fri Sep 11 17:51:34 2009 +0200
     1.2 +++ b/naspro-bridges-bad/dssi/descriptor.c	Fri Sep 11 18:54:39 2009 +0200
     1.3 @@ -58,8 +58,7 @@
     1.4  	desc->classes_1 = 0;
     1.5  	desc->classes_2 = 0;
     1.6  
     1.7 -	is_synth = ((ddesc->run_synth != NULL)
     1.8 -		    || (ddesc->run_multiple_synths != NULL)) ? 1 : 0;
     1.9 +	is_synth = (ddesc->run_synth != NULL) ? 1 : 0;
    1.10  	for (i = 0; i < desc->port_descs_count - is_synth; i++)
    1.11  	  {
    1.12  		/* This check is due to Josh Green's broken vocoder plugin */
    1.13 @@ -163,7 +162,7 @@
    1.14  		  }
    1.15  	  }
    1.16  
    1.17 -	if ((ddesc->run_synth != NULL) || (ddesc->run_multiple_synths != NULL))
    1.18 +	if (ddesc->run_synth != NULL)
    1.19  	  {
    1.20  		desc->port_descs[i].name = "MIDI in";
    1.21  

     2.1 --- a/naspro-bridges-bad/dssi/lv2api.c	Fri Sep 11 17:51:34 2009 +0200
     2.2 +++ b/naspro-bridges-bad/dssi/lv2api.c	Fri Sep 11 18:54:39 2009 +0200
     2.3 @@ -180,8 +180,7 @@
     2.4  
     2.5  	i = (struct instance *)instance;
     2.6  
     2.7 -	if ((i->ld_desc->d_desc->run_synth != NULL)
     2.8 -	    || (i->ld_desc->d_desc->run_multiple_synths != NULL))
     2.9 +	if (i->ld_desc->d_desc->run_synth != NULL)
    2.10  	  {
    2.11  		/* Convert LV2 MIDI events to ALSA sequencer events */
    2.12  		p = i->lv2_ev_buf->data;
    2.13 @@ -194,7 +193,7 @@
    2.14  			p += sizeof(LV2_Event);
    2.15  			data = p;
    2.16  			p += lv2_ev->size + (((lv2_ev->size + 4) % 8)
    2.17 -					    ? (8 - (lv2_ev->size+4) % 8) : 0);
    2.18 +					     ? (8 - (lv2_ev->size+4) % 8) : 0);
    2.19  
    2.20  			if (lv2_ev->type == 0)
    2.21  			  {
    2.22 @@ -230,14 +229,10 @@
    2.23  
    2.24  		/* Order ALSA sequencer events by timestamp */
    2.25  		qsort(i->dssi_evs, cnt, sizeof(snd_seq_event_t), cmp_timestamp);
    2.26 -	  }
    2.27  
    2.28 -	if (i->ld_desc->d_desc->run_synth != NULL)
    2.29  		i->ld_desc->d_desc->run_synth(i->l_handle, sample_count,
    2.30  					      i->dssi_evs, cnt);
    2.31 -	else if (i->ld_desc->d_desc->run_multiple_synths != NULL)
    2.32 -		i->ld_desc->d_desc->run_multiple_synths(
    2.33 -			1, &i->l_handle, sample_count, &i->dssi_evs, &cnt);
    2.34 +	  }
    2.35  	else
    2.36  		i->ld_desc->d_desc->LADSPA_Plugin->run(i->l_handle,
    2.37  						       sample_count);

     3.1 --- a/naspro-bridges-bad/dssi/pluglib.c	Fri Sep 11 17:51:34 2009 +0200
     3.2 +++ b/naspro-bridges-bad/dssi/pluglib.c	Fri Sep 11 18:54:39 2009 +0200
     3.3 @@ -48,6 +48,7 @@
     3.4  	char *tmp_uris;
     3.5  	size_t descs_count, ports_count, uris_size;
     3.6  	unsigned long i;
     3.7 +	char *c;
     3.8  
     3.9  	dl_module = nacore_dl_open(file);
    3.10  	if (dl_module == NULL)
    3.11 @@ -67,10 +68,10 @@
    3.12  			continue;
    3.13  
    3.14  		ports_count += ddesc->LADSPA_Plugin->PortCount;
    3.15 -		if ((ddesc->run_synth != NULL)
    3.16 -		    || (ddesc->run_multiple_synths != NULL))
    3.17 +		if (ddesc->run_synth != NULL)
    3.18  			ports_count++;
    3.19 -		uris_size += strlen(basename)
    3.20 +		c = strrchr(basename, '.');
    3.21 +		uris_size += c - basename
    3.22  			     + strlen(ddesc->LADSPA_Plugin->Label) + 11;
    3.23  		descs_count++;
    3.24  	  }
    3.25 @@ -122,13 +123,17 @@
    3.26  			tmp_pluglibs->port_descs + ports_count;
    3.27  		tmp_pluglibs->descs[descs_count].port_descs_count =
    3.28  			ddesc->LADSPA_Plugin->PortCount;
    3.29 -		if ((ddesc->run_synth != NULL)
    3.30 -		    || (ddesc->run_multiple_synths != NULL))
    3.31 +		if (ddesc->run_synth != NULL)
    3.32  			tmp_pluglibs->descs[descs_count].port_descs_count++;
    3.33  		tmp_pluglibs->descs[descs_count].uri =
    3.34  			tmp_pluglibs->uris + uris_size;
    3.35 -		sprintf(tmp_pluglibs->descs[descs_count].uri, "urn:dssi:%s:%s",
    3.36 -			basename, ddesc->LADSPA_Plugin->Label);
    3.37 +		c = strrchr(basename, '.');
    3.38 +		strcpy(tmp_pluglibs->descs[descs_count].uri, "urn:dssi:");
    3.39 +		strncat(tmp_pluglibs->descs[descs_count].uri, basename,
    3.40 +			c - basename);
    3.41 +		strcat(tmp_pluglibs->descs[descs_count].uri, ":");
    3.42 +		strcat(tmp_pluglibs->descs[descs_count].uri,
    3.43 +		       ddesc->LADSPA_Plugin->Label);
    3.44  
    3.45  		_nadssi_descriptor_fill(tmp_pluglibs->descs + descs_count,
    3.46  					ddesc);
    3.47 @@ -137,8 +142,7 @@
    3.48  				    tmp_pluglibs->descs + descs_count);
    3.49  
    3.50  		ports_count += ddesc->LADSPA_Plugin->PortCount;
    3.51 -		if ((ddesc->run_synth != NULL)
    3.52 -		    || (ddesc->run_multiple_synths != NULL))
    3.53 +		if (ddesc->run_synth != NULL)
    3.54  			ports_count++;
    3.55  		uris_size += strlen(basename)
    3.56  			     + strlen(ddesc->LADSPA_Plugin->Label) + 11;