diff options
author | GZharun <grygoriiz@wavesglobal.com> | 2015-05-14 17:47:38 +0300 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-29 14:18:14 -0400 |
commit | 5d4f1c3419d3bab12502692c5590060f4faef1bc (patch) | |
tree | b6ccd5d30a0905680d73bfd7bc33361c39a874e6 /libs/backends/wavesaudio | |
parent | edbbc8344a721a8ce3919e36c410fb25b0e95cb0 (diff) |
Backend MERGE:
Paul Davis' change 3d12a4da82100466f1e5e286260759f07c2e657a
[To be reviewed by] Paul Davis
Diffstat (limited to 'libs/backends/wavesaudio')
-rw-r--r-- | libs/backends/wavesaudio/waves_audiobackend.cc | 6 | ||||
-rw-r--r-- | libs/backends/wavesaudio/waves_audiobackend.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/backends/wavesaudio/waves_audiobackend.cc b/libs/backends/wavesaudio/waves_audiobackend.cc index c52b209dc9..0b02a9c52d 100644 --- a/libs/backends/wavesaudio/waves_audiobackend.cc +++ b/libs/backends/wavesaudio/waves_audiobackend.cc @@ -99,8 +99,8 @@ void WavesAudioBackend::AudioDeviceManagerNotification (NotificationReason reaso } -WavesAudioBackend::WavesAudioBackend (AudioEngine& e, AudioBackendInfo& info) - : AudioBackend (e, info) +WavesAudioBackend::WavesAudioBackend (AudioEngine& e) + : AudioBackend (e, __backend_info) , _audio_device_manager (this) , _midi_device_manager (*this) , _device (NULL) @@ -1246,7 +1246,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, *(descriptor()))); + _instance.reset (new WavesAudioBackend (e)); } return __instance; } diff --git a/libs/backends/wavesaudio/waves_audiobackend.h b/libs/backends/wavesaudio/waves_audiobackend.h index 9cd9b74a6e..74322b1084 100644 --- a/libs/backends/wavesaudio/waves_audiobackend.h +++ b/libs/backends/wavesaudio/waves_audiobackend.h @@ -70,7 +70,7 @@ class WavesMidiPort; class WavesAudioBackend : public AudioBackend, WCMRAudioDeviceManagerClient { public: - WavesAudioBackend (AudioEngine& e, AudioBackendInfo&); + WavesAudioBackend (AudioEngine& e); virtual ~WavesAudioBackend (); /* AUDIOBACKEND API */ |