refs #320 Prepare Voice to new vatlib API

This commit is contained in:
Roland Winklmeier
2014-12-25 20:43:56 +01:00
parent 111c539e89
commit 13a05f729e
4 changed files with 45 additions and 25 deletions

View File

@@ -16,7 +16,7 @@
#include "context_settings.h"
#include "context_runtime.h"
#include "dbus_server.h"
#include "voice_vatlib.h"
#include "voice.h"
#include "voice_channel.h"
#include "input_manager.h"
#include "blackinput/keyboard.h"
@@ -163,8 +163,7 @@ namespace BlackCore
//! Connection in transition
bool inTransitionState() const;
// TODO: see #339, MS' comment on deletion in another thread
QScopedPointer<CVoiceVatlib> m_voice; //!< underlying voice lib
std::unique_ptr<CVoiceVatlib> m_voice; //!< underlying voice lib
CInputManager *m_inputManager = nullptr;
CInputManager::RegistrationHandle m_handlePtt;