From 05d174eeb308efeb4e1e3f7d5c3cbcd3a8409cc4 Mon Sep 17 00:00:00 2001 From: sletz Date: Wed, 9 Jul 2008 16:26:50 +0000 Subject: [PATCH] Add sample rate parameter in audioadapters git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2673 0c269be4-1314-0410-8aa9-9f06e86f4224 --- linux/alsa/JackAlsaAdapter.cpp | 10 +++++++++- linux/alsa/JackAlsaDriver.cpp | 1 - macosx/JackCoreAudioAdapter.cpp | 10 +++++++++- windows/JackPortAudioAdapter.cpp | 10 +++++++++- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/linux/alsa/JackAlsaAdapter.cpp b/linux/alsa/JackAlsaAdapter.cpp index 3b53dd56..de66df7c 100644 --- a/linux/alsa/JackAlsaAdapter.cpp +++ b/linux/alsa/JackAlsaAdapter.cpp @@ -109,7 +109,7 @@ extern "C" desc = (jack_driver_desc_t*)calloc(1, sizeof(jack_driver_desc_t)); strcpy (desc->name, "alsa-adapter"); - desc->nparams = 7; + desc->nparams = 8; params = (jack_driver_param_desc_t*)calloc(desc->nparams, sizeof(jack_driver_param_desc_t)); i = 0; @@ -137,6 +137,14 @@ extern "C" strcpy(params[i].value.str, "hw:0"); strcpy(params[i].short_desc, "ALSA device name"); 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, "nperiods"); diff --git a/linux/alsa/JackAlsaDriver.cpp b/linux/alsa/JackAlsaDriver.cpp index 3d32b073..e6830b3a 100644 --- a/linux/alsa/JackAlsaDriver.cpp +++ b/linux/alsa/JackAlsaDriver.cpp @@ -2573,7 +2573,6 @@ extern "C" strcpy (params[i].short_desc, "Try 16-bit samples before 32-bit"); strcpy (params[i].long_desc, params[i].short_desc); - i++; strcpy (params[i].name, "input-latency"); params[i].character = 'I'; diff --git a/macosx/JackCoreAudioAdapter.cpp b/macosx/JackCoreAudioAdapter.cpp index 4a543151..56a10114 100644 --- a/macosx/JackCoreAudioAdapter.cpp +++ b/macosx/JackCoreAudioAdapter.cpp @@ -575,7 +575,7 @@ extern "C" desc = (jack_driver_desc_t*)calloc(1, sizeof(jack_driver_desc_t)); strcpy(desc->name, "coreaudio-adapter"); - desc->nparams = 8; + desc->nparams = 9; desc->params = (jack_driver_param_desc_t*)calloc(desc->nparams, sizeof(jack_driver_param_desc_t)); i = 0; @@ -617,6 +617,14 @@ extern "C" strcpy(desc->params[i].value.str, "will take default CoreAudio output device"); strcpy(desc->params[i].short_desc, "Provide playback ports. Optionally set CoreAudio device name"); strcpy(desc->params[i].long_desc, desc->params[i].short_desc); + + i++; + strcpy(desc->params[i].name, "rate"); + desc->params[i].character = 'r'; + desc->params[i].type = JackDriverParamUInt; + desc->params[i].value.ui = 44100U; + strcpy(desc->params[i].short_desc, "Sample rate"); + strcpy(desc->params[i].long_desc, desc->params[i].short_desc); i++; strcpy(desc->params[i].name, "duplex"); diff --git a/windows/JackPortAudioAdapter.cpp b/windows/JackPortAudioAdapter.cpp index d9f67423..cf7a2c96 100644 --- a/windows/JackPortAudioAdapter.cpp +++ b/windows/JackPortAudioAdapter.cpp @@ -169,7 +169,7 @@ extern "C" desc = (jack_driver_desc_t*)calloc(1, sizeof(jack_driver_desc_t)); strcpy(desc->name, "portaudio-adapter"); - desc->nparams = 8; + desc->nparams = 9; desc->params = (jack_driver_param_desc_t*)calloc(desc->nparams, sizeof(jack_driver_param_desc_t)); i = 0; @@ -220,6 +220,14 @@ extern "C" strcpy(desc->params[i].short_desc, "Provide both capture and playback ports"); strcpy(desc->params[i].long_desc, desc->params[i].short_desc); + i++; + strcpy(desc->params[i].name, "rate"); + desc->params[i].character = 'r'; + desc->params[i].type = JackDriverParamUInt; + desc->params[i].value.ui = 44100U; + strcpy(desc->params[i].short_desc, "Sample rate"); + strcpy(desc->params[i].long_desc, desc->params[i].short_desc); + i++; strcpy(desc->params[i].name, "device"); desc->params[i].character = 'd';