jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

notify_one: cleanup

Browse Source 
Change-Id: I26433e1463ecb261fb586431b6c43a3e6b931dcf
This commit is contained in:
Adrien Béraud
2021-06-22 15:09:49 -04:00
parent e5d95eb6d4
commit 93a34c9ab4
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/jamidht/connectionmanager.cpp
View File

@ -43,10 +43,10 @@ namespace jami {
struct ConnectionInfo
{
std::condition_variable responseCv_ {};
std::atomic_bool responseReceived_ {false};
PeerConnectionRequest response_ {};
std::mutex mutex_ {};
std::condition_variable responseCv_ {};
bool responseReceived_ {false};
PeerConnectionRequest response_ {};
std::unique_ptr<IceTransport> ice_ {nullptr};
// Used to store currently non ready TLS Socket
std::unique_ptr<TlsSocketEndpoint> tls_ {nullptr};
@ -325,11 +325,10 @@ ConnectionManager::Impl::connectDeviceStartIce(const DeviceId& deviceId, const d
return;
}
auto& response = info->response_;
if (!ice)
return;
auto sdp = ice->parseIceCandidates(response.ice_msg);
auto sdp = ice->parseIceCandidates(info->response_.ice_msg);
if (not ice->startIce({sdp.rem_ufrag, sdp.rem_pwd}, std::move(sdp.rem_candidates))) {
JAMI_WARN("[Account:%s] start ICE failed", account.getAccountID().c_str());
@ -607,14 +606,14 @@ ConnectionManager::Impl::onPeerResponse(const PeerConnectionRequest& req)
{
auto device = req.from;
JAMI_INFO() << account << " New response received from " << device.to_c_str();
auto info = getInfo(device, req.id);
if (!info) {
if (auto info = getInfo(device, req.id)) {
std::lock_guard<std::mutex> lk {info->mutex_};
info->responseReceived_ = true;
info->response_ = std::move(req);
info->responseCv_.notify_one();
} else {
JAMI_WARN() << account << " respond received, but cannot find request";
return;
}
info->responseReceived_ = true;
info->response_ = std::move(req);
info->responseCv_.notify_one();
}
void

2
src/media/audio/jack/jacklayer.cpp
View File

@ -413,8 +413,8 @@ void JackLayer::stopStream(AudioDeviceType)
if (status_ != Status::Started)
return;
status_ = Status::Idle;
data_ready_.notify_one();
}
data_ready_.notify_one();
if (jack_deactivate(playbackClient_) or jack_deactivate(captureClient_)) {
JAMI_ERR("JACK client could not deactivate");

1
src/media/audio/opensl/opensllayer.cpp
View File

@ -308,7 +308,6 @@ void
OpenSLLayer::engineServiceRec()
{
recCv.notify_one();
return;
}
void