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

GstEnginePipeline: Set and notify volume only when changed

Browse Source 
Another fix for #1089
This commit is contained in:
Jonas Kvinge
2023-01-03 21:32:20 +01:00
parent 286b908062
commit 1dfe07003f
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/engine/gstenginepipeline.cpp
View File

@@ -98,6 +98,7 @@ GstEnginePipeline::GstEnginePipeline(QObject *parent)
pending_seek_nanosec_(-1), pending_seek_nanosec_(-1),
last_known_position_ns_(0), last_known_position_ns_(0),
next_uri_set_(false), next_uri_set_(false),
volume_internal_(-1.0),
volume_percent_(100), volume_percent_(100),
use_fudge_timer_(false), use_fudge_timer_(false),
pipeline_(nullptr), pipeline_(nullptr),
@@ -873,10 +874,9 @@ void GstEnginePipeline::NotifyVolumeCallback(GstElement *element, GParamSpec *pa
GstEnginePipeline *instance = reinterpret_cast<GstEnginePipeline*>(self); GstEnginePipeline *instance = reinterpret_cast<GstEnginePipeline*>(self);
gdouble volume = 0; g_object_get(G_OBJECT(instance->volume_), "volume", &instance->volume_internal_, nullptr);
g_object_get(G_OBJECT(instance->volume_), "volume", &volume, nullptr);
const uint volume_percent = static_cast<uint>(qBound(0L, lround(qBound(0.0, gst_stream_volume_convert_volume(GST_STREAM_VOLUME_FORMAT_LINEAR, GST_STREAM_VOLUME_FORMAT_CUBIC, volume), 1.0) / 0.01), 100L)); const uint volume_percent = static_cast<uint>(qBound(0L, lround(qBound(0.0, gst_stream_volume_convert_volume(GST_STREAM_VOLUME_FORMAT_LINEAR, GST_STREAM_VOLUME_FORMAT_CUBIC, instance->volume_internal_), 1.0) / 0.01), 100L));
if (volume_percent != instance->volume_percent_) { if (volume_percent != instance->volume_percent_) {
instance->volume_percent_ = volume_percent; instance->volume_percent_ = volume_percent;
emit instance->VolumeChanged(volume_percent); emit instance->VolumeChanged(volume_percent);
@@ -1516,8 +1516,11 @@ bool GstEnginePipeline::Seek(const qint64 nanosec) {
void GstEnginePipeline::SetVolume(const uint volume_percent) { void GstEnginePipeline::SetVolume(const uint volume_percent) {
if (volume_) { if (volume_) {
const double volume = gst_stream_volume_convert_volume(GST_STREAM_VOLUME_FORMAT_CUBIC, GST_STREAM_VOLUME_FORMAT_LINEAR, static_cast<double>(volume_percent) * 0.01); const double volume_internal = lround(static_cast<int>(gst_stream_volume_convert_volume(GST_STREAM_VOLUME_FORMAT_CUBIC, GST_STREAM_VOLUME_FORMAT_LINEAR, static_cast<double>(volume_percent) * 0.01) * 100.0)) / 100.0;
g_object_set(G_OBJECT(volume_), "volume", volume, nullptr); if (volume_internal != volume_internal_) {
volume_internal_ = volume_internal;
g_object_set(G_OBJECT(volume_), "volume", volume_internal, nullptr);
}
} }
volume_percent_ = volume_percent; volume_percent_ = volume_percent;

1
src/engine/gstenginepipeline.h
View File

@@ -275,6 +275,7 @@ class GstEnginePipeline : public QObject {
// Complete the transition to the next song when it starts playing // Complete the transition to the next song when it starts playing
bool next_uri_set_; bool next_uri_set_;
gdouble volume_internal_;
uint volume_percent_; uint volume_percent_;
std::shared_ptr<QTimeLine> fader_; std::shared_ptr<QTimeLine> fader_;