Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
14758e0a
Commit
14758e0a
authored
Aug 14, 2013
by
Tristan Matthews
Browse files
* #28351: managerimpl: use unique_ptr instead of shared_ptr
parent
c9f38b0e
Changes
1
Hide whitespace changes
Inline
Side-by-side
daemon/src/managerimpl.h
View file @
14758e0a
...
...
@@ -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_;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment