dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GstEnginePipeline: Use std::shared_ptr with deleteLater() for fader timeline

Browse Source 
Fixes #890
This commit is contained in:
Jonas Kvinge
2022-02-05 19:33:21 +01:00
parent ffef339ebd
commit 7caeb47637
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/engine/gstenginepipeline.cpp
View File

@@ -122,6 +122,13 @@ GstEnginePipeline::~GstEnginePipeline() {
if (pipeline_) { if (pipeline_) {
if (fader_) {
if (fader_->state() != QTimeLine::NotRunning) {
fader_->stop();
}
fader_.reset();
}
if (pad_added_cb_id_ != -1) { if (pad_added_cb_id_ != -1) {
g_signal_handler_disconnect(G_OBJECT(pipeline_), pad_added_cb_id_); g_signal_handler_disconnect(G_OBJECT(pipeline_), pad_added_cb_id_);
} }
@@ -1414,7 +1421,12 @@ void GstEnginePipeline::StartFader(const qint64 duration_nanosec, const QTimeLin
} }
} }
fader_ = std::make_unique<QTimeLine>(duration_msec, this); fader_.reset(new QTimeLine(duration_msec), [](QTimeLine *timeline) {
if (timeline->state() != QTimeLine::NotRunning) {
timeline->stop();
}
timeline->deleteLater();
});
QObject::connect(fader_.get(), &QTimeLine::valueChanged, this, &GstEnginePipeline::SetVolumeModifier); QObject::connect(fader_.get(), &QTimeLine::valueChanged, this, &GstEnginePipeline::SetVolumeModifier);
QObject::connect(fader_.get(), &QTimeLine::finished, this, &GstEnginePipeline::FaderTimelineFinished); QObject::connect(fader_.get(), &QTimeLine::finished, this, &GstEnginePipeline::FaderTimelineFinished);
fader_->setDirection(direction); fader_->setDirection(direction);

2
src/engine/gstenginepipeline.h
View File

@@ -269,7 +269,7 @@ class GstEnginePipeline : public QObject {
uint volume_percent_; uint volume_percent_;
qreal volume_modifier_; qreal volume_modifier_;
std::unique_ptr<QTimeLine> fader_; std::shared_ptr<QTimeLine> fader_;
QBasicTimer fader_fudge_timer_; QBasicTimer fader_fudge_timer_;
bool use_fudge_timer_; bool use_fudge_timer_;