mii/libdatachannel
1
0
Fork 0
mirror of https://github.com/mii443/libdatachannel.git synced 2025-08-22 23:25:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaced shared_from_this() with weak_from_this() where applicable

Browse Source
This commit is contained in:
Paul-Louis Ageneau
2021-03-01 20:20:06 +01:00
parent b8adccc0ec
commit 83453635a8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/impl/peerconnection.cpp
View File

@ -393,7 +393,7 @@ void PeerConnection::forwardMessage(message_ptr message) {
stream % 2 == remoteParity) { stream % 2 == remoteParity) {
channel = channel =
std::make_shared<NegotiatedDataChannel>(shared_from_this(), sctpTransport, stream); std::make_shared<NegotiatedDataChannel>(weak_from_this(), sctpTransport, stream);
channel->openCallback = weak_bind(&PeerConnection::triggerDataChannel, this, channel->openCallback = weak_bind(&PeerConnection::triggerDataChannel, this,
weak_ptr<DataChannel>{channel}); weak_ptr<DataChannel>{channel});
@ -562,9 +562,9 @@ shared_ptr<DataChannel> PeerConnection::emplaceDataChannel(Description::Role rol
// If the DataChannel is user-negotiated, do not negociate it here // If the DataChannel is user-negotiated, do not negociate it here
auto channel = auto channel =
init.negotiated init.negotiated
? std::make_shared<DataChannel>(shared_from_this(), stream, std::move(label), ? std::make_shared<DataChannel>(weak_from_this(), stream, std::move(label),
std::move(init.protocol), std::move(init.reliability)) std::move(init.protocol), std::move(init.reliability))
: std::make_shared<NegotiatedDataChannel>(shared_from_this(), stream, std::move(label), : std::make_shared<NegotiatedDataChannel>(weak_from_this(), stream, std::move(label),
std::move(init.protocol), std::move(init.protocol),
std::move(init.reliability)); std::move(init.reliability));
mDataChannels.emplace(std::make_pair(stream, channel)); mDataChannels.emplace(std::make_pair(stream, channel));
@ -647,7 +647,7 @@ shared_ptr<Track> PeerConnection::emplaceTrack(Description::Media description) {
track->setDescription(std::move(description)); track->setDescription(std::move(description));
if (!track) { if (!track) {
track = std::make_shared<Track>(shared_from_this(), std::move(description)); track = std::make_shared<Track>(weak_from_this(), std::move(description));
mTracks.emplace(std::make_pair(track->mid(), track)); mTracks.emplace(std::make_pair(track->mid(), track));
mTrackLines.emplace_back(track); mTrackLines.emplace_back(track);
} }
@ -663,7 +663,7 @@ void PeerConnection::incomingTrack(Description::Media description) {
} }
#endif #endif
if (mTracks.find(description.mid()) == mTracks.end()) { if (mTracks.find(description.mid()) == mTracks.end()) {
auto track = std::make_shared<Track>(shared_from_this(), std::move(description)); auto track = std::make_shared<Track>(weak_from_this(), std::move(description));
mTracks.emplace(std::make_pair(track->mid(), track)); mTracks.emplace(std::make_pair(track->mid(), track));
mTrackLines.emplace_back(track); mTrackLines.emplace_back(track);
triggerTrack(track); triggerTrack(track);