ardour/livetrax
13
0
Fork 0
Code

Use PortaudioIO::get_current_host_api_type utility function in PortaudioIO class

Browse Source
This commit is contained in:
Tim Mayberry 2015-08-22 21:21:41 +10:00
parent c6c0654b5a
commit 201d91aedd
1 changed files with 4 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libs/backends/portaudio/portaudio_io.cc
View File

@ -73,25 +73,14 @@ PortAudioIO::~PortAudioIO ()
std::string std::string
PortAudioIO::control_app_name (int device_id) const PortAudioIO::control_app_name (int device_id) const
{ {
const PaHostApiInfo* info = Pa_GetHostApiInfo (_host_api_index);
std::string app_name;
if (info == NULL) {
DEBUG_AUDIO (string_compose ("Unable to determine Host API from index %1\n",
_host_api_index));
return app_name;
}
PaHostApiTypeId type_id = info->type;
#ifdef WITH_ASIO #ifdef WITH_ASIO
if (type_id == paASIO) { if (get_current_host_api_type() == paASIO) {
// is this used for anything, or just acts as a boolean? // is this used for anything, or just acts as a boolean?
return "PortaudioASIO"; return "PortaudioASIO";
} }
#endif #endif
return app_name; return std::string();
} }
void void
@ -178,15 +167,7 @@ PortAudioIO::get_asio_buffer_properties (int device_id,
return false; return false;
} }
const PaHostApiInfo* info = Pa_GetHostApiInfo (device_info->hostApi); if (get_current_host_api_type() != paASIO) {
if (info == NULL) {
DEBUG_AUDIO (string_compose (
"Unable to determine Host API from device index %1\n", device_id));
return false;
}
if (info->type != paASIO) {
DEBUG_AUDIO (string_compose ( DEBUG_AUDIO (string_compose (
"ERROR device_id %1 is not an ASIO device\n", device_id)); "ERROR device_id %1 is not an ASIO device\n", device_id));
return false; return false;
@ -271,17 +252,7 @@ int
PortAudioIO::available_buffer_sizes(int device_id, std::vector<uint32_t>& buffer_sizes) PortAudioIO::available_buffer_sizes(int device_id, std::vector<uint32_t>& buffer_sizes)
{ {
#ifdef WITH_ASIO #ifdef WITH_ASIO
const PaHostApiInfo* info = Pa_GetHostApiInfo (_host_api_index); if (get_current_host_api_type() == paASIO) {
if (info == NULL) {
DEBUG_AUDIO (string_compose ("Unable to determine Host API from index %1\n",
_host_api_index));
return -1;
}
PaHostApiTypeId type_id = info->type;
if (type_id == paASIO) {
if (get_asio_buffer_sizes (device_id, buffer_sizes)) { if (get_asio_buffer_sizes (device_id, buffer_sizes)) {
return 0; return 0;
} }