From ef2ed569065beaf28049b2b9767fcbc6dfa84aa6 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Wed, 24 Apr 2019 10:08:22 -0500 Subject: [PATCH] More refactoring for Mac compile breakage --- src/Qt/AudioPlaybackThread.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Qt/AudioPlaybackThread.cpp b/src/Qt/AudioPlaybackThread.cpp index d31f719e..678a9c09 100644 --- a/src/Qt/AudioPlaybackThread.cpp +++ b/src/Qt/AudioPlaybackThread.cpp @@ -42,10 +42,10 @@ namespace openshot m_pInstance = new AudioDeviceManagerSingleton; // Get preferred audio device name (if any) - string preferred_audio_device = Settings::Instance()->PLAYBACK_AUDIO_DEVICE_NAME; + juce::String preferred_audio_device = juce::String(Settings::Instance()->PLAYBACK_AUDIO_DEVICE_NAME.c_str()); // Initialize audio device only 1 time - String error = m_pInstance->audioDeviceManager.initialise ( + juce::String error = m_pInstance->audioDeviceManager.initialise ( 0, /* number of input channels */ 2, /* number of output channels */ 0, /* no XML settings.. */ @@ -67,7 +67,7 @@ namespace openshot for (int j = 0; j < deviceNames.size (); ++j ) { - const String deviceName = deviceNames[j]; + juce::String deviceName = deviceNames[j]; AudioDeviceInfo deviceInfo = {deviceName.toStdString(), t->getTypeName().toStdString()}; m_pInstance->audio_device_names.push_back(deviceInfo); }