From 3a3d811e827e2d6c2602e29b5f4a285d5306d9a5 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Fri, 21 Aug 2015 22:12:07 +1000 Subject: [PATCH] Use StandardDevices enum in PortaudioIO for default devices This just makes it a bit easier to read through the code rather than using magic numbers. --- libs/backends/portaudio/portaudio_io.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/backends/portaudio/portaudio_io.cc b/libs/backends/portaudio/portaudio_io.cc index 809666f36d..9013a9d9c2 100644 --- a/libs/backends/portaudio/portaudio_io.cc +++ b/libs/backends/portaudio/portaudio_io.cc @@ -113,7 +113,7 @@ PortAudioIO::available_sample_rates(int device_id, std::vector& sampleRat if (!initialize_pa()) return -1; // TODO use separate int device_input, int device_output ?! - if (device_id == -1) { + if (device_id == DeviceDefault) { device_id = get_default_input_device (); } @@ -431,12 +431,12 @@ PortAudioIO::add_default_devices () const PaDeviceInfo* nfo_i = Pa_GetDeviceInfo(get_default_input_device()); const PaDeviceInfo* nfo_o = Pa_GetDeviceInfo(get_default_output_device()); if (nfo_i && nfo_o) { - _input_devices.insert (std::pair (-1, + _input_devices.insert (std::pair (DeviceDefault, new paDevice("Default", nfo_i->maxInputChannels, nfo_o->maxOutputChannels ))); - _output_devices.insert (std::pair (-1, + _output_devices.insert (std::pair (DeviceDefault, new paDevice("Default", nfo_i->maxInputChannels, nfo_o->maxOutputChannels @@ -565,10 +565,10 @@ PortAudioIO::pcm_setup ( goto error; } - if (device_input == -1) { + if (device_input == DeviceDefault) { device_input = get_default_input_device (); } - if (device_output == -1) { + if (device_output == DeviceDefault) { device_output = get_default_output_device (); }