Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-21 16:55:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove unnecessary nullptr checks

Browse Source
This commit is contained in:
WarmUpTill
2020-10-23 23:57:45 +02:00
parent 8b9c93f76c
commit bc3fcde12d
1 changed files with 20 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/switch-media.cpp
View File

@@ -264,28 +264,20 @@ bool MediaSwitch::valid()
void MediaSwitch::clearSignalHandler()
{
obs_source_t *mediasource = obs_weak_source_get_source(source);
if (mediasource) {
signal_handler_t *sh =
obs_source_get_signal_handler(mediasource);
signal_handler_disconnect(sh, "media_stopped", MediaStopped,
this);
signal_handler_disconnect(sh, "media_ended", MediaEnded, this);
}
signal_handler_t *sh = obs_source_get_signal_handler(mediasource);
signal_handler_disconnect(sh, "media_stopped", MediaStopped, this);
signal_handler_disconnect(sh, "media_ended", MediaEnded, this);
obs_source_release(mediasource);
}
void MediaSwitch::resetSignalHandler()
{
obs_source_t *mediasource = obs_weak_source_get_source(source);
if (mediasource) {
signal_handler_t *sh =
obs_source_get_signal_handler(mediasource);
signal_handler_disconnect(sh, "media_stopped", MediaStopped,
this);
signal_handler_disconnect(sh, "media_ended", MediaEnded, this);
signal_handler_connect(sh, "media_stopped", MediaStopped, this);
signal_handler_connect(sh, "media_ended", MediaEnded, this);
}
signal_handler_t *sh = obs_source_get_signal_handler(mediasource);
signal_handler_disconnect(sh, "media_stopped", MediaStopped, this);
signal_handler_disconnect(sh, "media_ended", MediaEnded, this);
signal_handler_connect(sh, "media_stopped", MediaStopped, this);
signal_handler_connect(sh, "media_ended", MediaEnded, this);
obs_source_release(mediasource);
}
@@ -314,12 +306,9 @@ inline MediaSwitch::MediaSwitch(OBSWeakSource scene_, OBSWeakSource source_,
{
anyState = state > 7;
obs_source_t *mediasource = obs_weak_source_get_source(source);
if (mediasource) {
signal_handler_t *sh =
obs_source_get_signal_handler(mediasource);
signal_handler_connect(sh, "media_stopped", MediaStopped, this);
signal_handler_connect(sh, "media_ended", MediaEnded, this);
}
signal_handler_t *sh = obs_source_get_signal_handler(mediasource);
signal_handler_connect(sh, "media_stopped", MediaStopped, this);
signal_handler_connect(sh, "media_ended", MediaEnded, this);
obs_source_release(mediasource);
}
@@ -333,12 +322,9 @@ MediaSwitch::MediaSwitch(const MediaSwitch &other)
{
anyState = state > 7;
obs_source_t *mediasource = obs_weak_source_get_source(source);
if (mediasource) {
signal_handler_t *sh =
obs_source_get_signal_handler(mediasource);
signal_handler_connect(sh, "media_stopped", MediaStopped, this);
signal_handler_connect(sh, "media_ended", MediaEnded, this);
}
signal_handler_t *sh = obs_source_get_signal_handler(mediasource);
signal_handler_connect(sh, "media_stopped", MediaStopped, this);
signal_handler_connect(sh, "media_ended", MediaEnded, this);
obs_source_release(mediasource);
}
@@ -356,13 +342,9 @@ MediaSwitch::MediaSwitch(MediaSwitch &&other)
MediaSwitch::~MediaSwitch()
{
obs_source_t *mediasource = obs_weak_source_get_source(source);
if (mediasource) {
signal_handler_t *sh =
obs_source_get_signal_handler(mediasource);
signal_handler_disconnect(sh, "media_stopped", MediaStopped,
this);
signal_handler_disconnect(sh, "media_ended", MediaEnded, this);
}
signal_handler_t *sh = obs_source_get_signal_handler(mediasource);
signal_handler_disconnect(sh, "media_stopped", MediaStopped, this);
signal_handler_disconnect(sh, "media_ended", MediaEnded, this);
obs_source_release(mediasource);
}
@@ -382,14 +364,9 @@ MediaSwitch &MediaSwitch::operator=(MediaSwitch &&other) noexcept
swap(*this, other);
obs_source_t *mediasource = obs_weak_source_get_source(other.source);
if (mediasource) {
signal_handler_t *sh =
obs_source_get_signal_handler(mediasource);
signal_handler_disconnect(sh, "media_stopped", MediaStopped,
&other);
signal_handler_disconnect(sh, "media_ended", MediaEnded,
&other);
}
signal_handler_t *sh = obs_source_get_signal_handler(mediasource);
signal_handler_disconnect(sh, "media_stopped", MediaStopped, &other);
signal_handler_disconnect(sh, "media_ended", MediaEnded, &other);
obs_source_release(mediasource);
return *this;