diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-05-01 09:14:25 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-05-01 09:14:25 -0400 |
commit | 66559cd795eb27c389e2dd2d973ec6b280ac2763 (patch) | |
tree | cd7ff769badf27c7842bdfe2e97682e7bc9cb922 /libs/backends/wavesaudio/waves_audiobackend.cc | |
parent | 6544df039bf95899204c05c665bfec4d0d86e85b (diff) |
Add AudioBackend::info() method to retrieve AudioBackendInfo object
Goal is to be able to call AudioBackendInfo::already_configured() from the right place.
Diffstat (limited to 'libs/backends/wavesaudio/waves_audiobackend.cc')
-rw-r--r-- | libs/backends/wavesaudio/waves_audiobackend.cc | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/libs/backends/wavesaudio/waves_audiobackend.cc b/libs/backends/wavesaudio/waves_audiobackend.cc index e08c60af2b..e64d65566c 100644 --- a/libs/backends/wavesaudio/waves_audiobackend.cc +++ b/libs/backends/wavesaudio/waves_audiobackend.cc @@ -23,6 +23,16 @@ using namespace ARDOUR; +#ifdef __MINGW64__ + extern "C" __declspec(dllexport) ARDOUR::AudioBackendInfo* descriptor () +#else + extern "C" ARDOURBACKEND_API ARDOUR::AudioBackendInfo* descriptor () +#endif +{ + // COMMENTED DBG LOGS */ std::cout << "waves_backend.dll : ARDOUR::AudioBackendInfo* descriptor (): " << std::endl; + return &WavesAudioBackend::backend_info (); +} + void WavesAudioBackend::AudioDeviceManagerNotification (NotificationReason reason, void* parameter) { switch (reason) { @@ -83,8 +93,8 @@ void WavesAudioBackend::AudioDeviceManagerNotification (NotificationReason reaso } -WavesAudioBackend::WavesAudioBackend (AudioEngine& e) - : AudioBackend (e) +WavesAudioBackend::WavesAudioBackend (AudioEngine& e, AudioBackendInfo& info) + : AudioBackend (e, info) , _audio_device_manager (this) , _midi_device_manager (*this) , _device (NULL) @@ -1274,7 +1284,7 @@ WavesAudioBackend::__waves_backend_factory (AudioEngine& e) { // COMMENTED DBG LOGS */ std::cout << "WavesAudioBackend::__waves_backend_factory ():" << std::endl; if (!__instance) { - __instance.reset (new WavesAudioBackend (e)); + __instance.reset (new WavesAudioBackend (e, descriptor())); } return __instance; } @@ -1365,12 +1375,3 @@ AudioBackendInfo WavesAudioBackend::__backend_info = { WavesAudioBackend::__already_configured, }; -#ifdef __MINGW64__ - extern "C" __declspec(dllexport) ARDOUR::AudioBackendInfo* descriptor () -#else - extern "C" ARDOURBACKEND_API ARDOUR::AudioBackendInfo* descriptor () -#endif -{ - // COMMENTED DBG LOGS */ std::cout << "waves_backend.dll : ARDOUR::AudioBackendInfo* descriptor (): " << std::endl; - return &WavesAudioBackend::backend_info (); -} |