ALSA fix + deactivating run_adding - Alex
authorterminatorX <>
Thu, 19 Jun 2003 15:18:23 +0000 (15:18 +0000)
committerterminatorX <>
Thu, 19 Jun 2003 15:18:23 +0000 (15:18 +0000)
src/tX_audiodevice.cc
src/tX_vttfx.cc

index 45807fcf2cf611228bf4cc6f15344342f84c7f60..66c293cef38ce29d7a275d458ae8150f829a52ae 100644 (file)
@@ -211,7 +211,7 @@ int tX_audiodevice_alsa :: open()
        sscanf(globals.alsa_device, "%i-%i: %s", &card, &device, foo);
        sprintf(pcm_name, "hw:%i,%i", card, device);
        
        sscanf(globals.alsa_device, "%i-%i: %s", &card, &device, foo);
        sprintf(pcm_name, "hw:%i,%i", card, device);
        
-       if (snd_pcm_open(&pcm_handle, pcm_name, stream, SND_PCM_NONBLOCK) < 0) {
+       if (snd_pcm_open(&pcm_handle, pcm_name, stream, NULL) < 0) {
                tX_error("ALSA: Failed to access PCM device \"%s\"", pcm_name);
                return -1;
        }
                tX_error("ALSA: Failed to access PCM device \"%s\"", pcm_name);
                return -1;
        }
index d673a3293e0ccae6cc2678ce4a6509d3c0e560a8..34ab35ee3d7e2796dc4056eedeff4278408687d7 100644 (file)
@@ -154,7 +154,7 @@ vtt_fx_ladspa :: vtt_fx_ladspa(LADSPA_Plugin *p, void *v)
        sp->set_vtt(vtt);
        controls.push_back(sp); 
 
        sp->set_vtt(vtt);
        controls.push_back(sp); 
 
-       if (plugin->getDescriptor()->run_adding && plugin->getDescriptor()->set_run_adding_gain) {      
+       /* if (plugin->getDescriptor()->run_adding && plugin->getDescriptor()->set_run_adding_gain) {   
                sp = sp_outgain = new tX_seqpar_vttfx_float();
                sp->set_mapping_parameters(3, 0, 0.01, 1);
                sprintf(buffer, "%s: Out Gain", plugin->getName());
                sp = sp_outgain = new tX_seqpar_vttfx_float();
                sp->set_mapping_parameters(3, 0, 0.01, 1);
                sprintf(buffer, "%s: Out Gain", plugin->getName());
@@ -163,7 +163,9 @@ vtt_fx_ladspa :: vtt_fx_ladspa(LADSPA_Plugin *p, void *v)
                controls.push_back(sp);
        } else {
                sp_outgain = NULL;
                controls.push_back(sp);
        } else {
                sp_outgain = NULL;
-       }
+       } */
+       
+       sp_outgain=NULL;
        
        /* connecting ports */
        for (port=0; port < plugin->getPortCount(); port++)
        
        /* connecting ports */
        for (port=0; port < plugin->getPortCount(); port++)