* #28351: managerimpl: use unique_ptr instead of shared_ptr

This commit is contained in:
Tristan Matthews
2013-08-14 17:39:51 -04:00
parent c9f38b0ee5
commit 14758e0a5f

View File

@ -43,7 +43,7 @@
#include <vector>
#include <set>
#include <map>
#include <tr1/memory>
#include <memory>
#include <pthread.h>
#include "client/client.h"
@ -851,14 +851,14 @@ class ManagerImpl {
AudioLayer* audiodriver_;
// Main thread
std::tr1::shared_ptr<DTMF> dtmfKey_;
std::unique_ptr<DTMF> dtmfKey_;
/////////////////////
// Protected by Mutex
/////////////////////
pthread_mutex_t toneMutex_;
std::tr1::shared_ptr<TelephoneTone> telephoneTone_;
std::tr1::shared_ptr<AudioFile> audiofile_;
std::unique_ptr<TelephoneTone> telephoneTone_;
std::unique_ptr<AudioFile> audiofile_;
// To handle volume control
// short speakerVolume_;