diff --git a/common/JackDriverLoader.h b/common/JackDriverLoader.h index 9205d773..87d6728b 100644 --- a/common/JackDriverLoader.h +++ b/common/JackDriverLoader.h @@ -25,7 +25,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include "driver_interface.h" #include "JackDriver.h" - #ifdef WIN32 #include diff --git a/common/JackLoopbackDriver.cpp b/common/JackLoopbackDriver.cpp index 234713e5..f90fb1a2 100644 --- a/common/JackLoopbackDriver.cpp +++ b/common/JackLoopbackDriver.cpp @@ -51,113 +51,3 @@ int JackLoopbackDriver::Process() } } // end of namespace - -/* -#ifdef __cplusplus -extern "C" { -#endif - -jack_driver_desc_t * driver_get_descriptor () -{ - jack_driver_desc_t * desc; - jack_driver_param_desc_t * params; - unsigned int i; - - desc = (jack_driver_desc_t*)calloc (1, sizeof (jack_driver_desc_t)); - strcpy (desc->name, "dummy"); - desc->nparams = 5; - - params = (jack_driver_param_desc_t*)calloc (desc->nparams, sizeof (jack_driver_param_desc_t)); - - i = 0; - strcpy (params[i].name, "capture"); - params[i].character = 'C'; - params[i].type = JackDriverParamUInt; - params[i].value.ui = 2U; - strcpy (params[i].short_desc, "Number of capture ports"); - strcpy (params[i].long_desc, params[i].short_desc); - - i++; - strcpy (params[i].name, "playback"); - params[i].character = 'P'; - params[i].type = JackDriverParamUInt; - params[1].value.ui = 2U; - strcpy (params[i].short_desc, "Number of playback ports"); - strcpy (params[i].long_desc, params[i].short_desc); - - i++; - strcpy (params[i].name, "rate"); - params[i].character = 'r'; - params[i].type = JackDriverParamUInt; - params[i].value.ui = 48000U; - strcpy (params[i].short_desc, "Sample rate"); - strcpy (params[i].long_desc, params[i].short_desc); - - i++; - strcpy (params[i].name, "period"); - params[i].character = 'p'; - params[i].type = JackDriverParamUInt; - params[i].value.ui = 1024U; - strcpy (params[i].short_desc, "Frames per period"); - strcpy (params[i].long_desc, params[i].short_desc); - - i++; - strcpy (params[i].name, "wait"); - params[i].character = 'w'; - params[i].type = JackDriverParamUInt; - params[i].value.ui = 21333U; - strcpy (params[i].short_desc, - "Number of usecs to wait between engine processes"); - strcpy (params[i].long_desc, params[i].short_desc); - - desc->params = params; - - return desc; -} - -Jack::JackDriverClientInterface* driver_initialize(Jack::JackEngine* engine, Jack::JackSynchro** table, const JSList* params) -{ - jack_nframes_t sample_rate = 48000; - jack_nframes_t period_size = 1024; - unsigned int capture_ports = 2; - unsigned int playback_ports = 2; - const JSList * node; - const jack_driver_param_t * param; - - for (node = params; node; node = jack_slist_next (node)) { - param = (const jack_driver_param_t *) node->data; - - switch (param->character) { - - case 'C': - capture_ports = param->value.ui; - break; - - case 'P': - playback_ports = param->value.ui; - break; - - case 'r': - sample_rate = param->value.ui; - break; - - case 'p': - period_size = param->value.ui; - break; - - } - } - Jack::JackDriverClientInterface* driver = new Jack::JackLoopbackDriver("loopback", engine, table); - if (driver->Open(period_size, sample_rate, 1, 1, capture_ports, playback_ports, "loopback") == 0) { - return driver; - } else { - delete driver; - return NULL; - } -} - -#ifdef __cplusplus -} -#endif -*/ -