Commit c0688b7a authored by Tristan Matthews's avatar Tristan Matthews

* #30347: call: remove ScopedLock

parent eb78cda6
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include "manager.h" #include "manager.h"
#include "audio/mainbuffer.h" #include "audio/mainbuffer.h"
#include "history/historyitem.h" #include "history/historyitem.h"
#include "scoped_lock.h"
Call::Call(const std::string& id, Call::CallType type, const std::string &accountID) Call::Call(const std::string& id, Call::CallType type, const std::string &accountID)
: callMutex_() : callMutex_()
...@@ -51,40 +50,37 @@ Call::Call(const std::string& id, Call::CallType type, const std::string &accoun ...@@ -51,40 +50,37 @@ Call::Call(const std::string& id, Call::CallType type, const std::string &accoun
, timestamp_start_(0) , timestamp_start_(0)
, timestamp_stop_(0) , timestamp_stop_(0)
{ {
pthread_mutex_init(&callMutex_, NULL);
time(&timestamp_start_); time(&timestamp_start_);
} }
Call::~Call() Call::~Call()
{ {}
pthread_mutex_destroy(&callMutex_);
}
void void
Call::setConnectionState(ConnectionState state) Call::setConnectionState(ConnectionState state)
{ {
sfl::ScopedLock m(callMutex_); std::lock_guard<std::mutex> lock(callMutex_);
connectionState_ = state; connectionState_ = state;
} }
Call::ConnectionState Call::ConnectionState
Call::getConnectionState() Call::getConnectionState()
{ {
sfl::ScopedLock m(callMutex_); std::lock_guard<std::mutex> lock(callMutex_);
return connectionState_; return connectionState_;
} }
void void
Call::setState(CallState state) Call::setState(CallState state)
{ {
sfl::ScopedLock m(callMutex_); std::lock_guard<std::mutex> lock(callMutex_);
callState_ = state; callState_ = state;
} }
Call::CallState Call::CallState
Call::getState() Call::getState()
{ {
sfl::ScopedLock m(callMutex_); std::lock_guard<std::mutex> lock(callMutex_);
return callState_; return callState_;
} }
...@@ -129,21 +125,21 @@ Call::getStateStr() ...@@ -129,21 +125,21 @@ Call::getStateStr()
std::string std::string
Call::getLocalIp() Call::getLocalIp()
{ {
sfl::ScopedLock m(callMutex_); std::lock_guard<std::mutex> lock(callMutex_);
return localIPAddress_; return localIPAddress_;
} }
unsigned int unsigned int
Call::getLocalAudioPort() Call::getLocalAudioPort()
{ {
sfl::ScopedLock m(callMutex_); std::lock_guard<std::mutex> lock(callMutex_);
return localAudioPort_; return localAudioPort_;
} }
unsigned int unsigned int
Call::getLocalVideoPort() Call::getLocalVideoPort()
{ {
sfl::ScopedLock m(callMutex_); std::lock_guard<std::mutex> lock(callMutex_);
return localVideoPort_; return localVideoPort_;
} }
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <sstream> #include <sstream>
#include <map> #include <map>
#include <pthread.h> #include <mutex>
#include "audio/recordable.h" #include "audio/recordable.h"
/* /*
...@@ -233,7 +233,7 @@ class Call : public Recordable { ...@@ -233,7 +233,7 @@ class Call : public Recordable {
private: private:
std::string getTypeStr() const; std::string getTypeStr() const;
/** Protect every attribute that can be changed by two threads */ /** Protect every attribute that can be changed by two threads */
pthread_mutex_t callMutex_; std::mutex callMutex_;
// Informations about call socket / audio // Informations about call socket / audio
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment