diff --git a/src/media/audio/portaudio/portaudiolayer.cpp b/src/media/audio/portaudio/portaudiolayer.cpp index 3703fe1b85996da53a328d8714af595905133e7a..9f2c22624fc8783a6fb67d37870e6ab3d1411521 100644 --- a/src/media/audio/portaudio/portaudiolayer.cpp +++ b/src/media/audio/portaudio/portaudiolayer.cpp @@ -318,13 +318,8 @@ PortAudioLayer::PortAudioLayerImpl::init(PortAudioLayer& parent) terminate(); } -#ifdef RING_UWP - indexRing_ = indexOut_ = Pa_GetDefaultOutputDevice(); - indexIn_ = Pa_GetDefaultInputDevice(); -#else indexRing_ = indexOut_ = indexOut_ == paNoDevice ? Pa_GetDefaultOutputDevice() : indexOut_; indexIn_ = indexIn_ == paNoDevice ? Pa_GetDefaultInputDevice() : indexIn_; -#endif if (indexOut_ != paNoDevice) { if (const auto outputDeviceInfo = Pa_GetDeviceInfo(indexOut_)) { diff --git a/src/preferences.cpp b/src/preferences.cpp index 976ac9676ab74347bb3e04c42ecb8ca9ddf74642..8a4b74b7127458e59e1b6326c7b789c43a07e777 100644 --- a/src/preferences.cpp +++ b/src/preferences.cpp @@ -141,7 +141,12 @@ static const char * const DECODING_ACCELERATED_KEY = "decodingAccelerated"; #endif static const char * const DFT_PULSE_LENGTH_STR = "250"; /** Default DTMF length */ -static const char * const ALSA_DFT_CARD = "0"; /** Default sound card index */ +#ifndef _MSC_VER +static const char * const ALSA_DFT_CARD = "0"; /** Default sound card index */ +#else +static const char * const ALSA_DFT_CARD = "-1"; /** Default sound card index (Portaudio) */ +#endif // _MSC_VER + Preferences::Preferences() : accountOrder_("")