Backend MERGE:
Paul Davis' change 3d12a4da82
[To be reviewed by] Paul Davis
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@ class WavesMidiPort;
|
||||
class WavesAudioBackend : public AudioBackend, WCMRAudioDeviceManagerClient
|
||||
{
|
||||
public:
|
||||
WavesAudioBackend (AudioEngine& e, AudioBackendInfo&);
|
||||
WavesAudioBackend (AudioEngine& e);
|
||||
virtual ~WavesAudioBackend ();
|
||||
|
||||
/* AUDIOBACKEND API */
|
||||
|
||||
Reference in New Issue
Block a user