Hello community, here is the log from the commit of package phonon for openSUSE:Factory checked in at 2013-09-23 10:45:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phonon (Old) and /work/SRC/openSUSE:Factory/.phonon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phonon" Changes: -------- --- /work/SRC/openSUSE:Factory/phonon/phonon.changes 2013-09-16 10:06:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.phonon.new/phonon.changes 2013-09-23 11:17:38.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 17 10:06:24 UTC 2013 - [email protected] + +- Added 0001-Revert-cache-volume-inside-PAStreams-when-trying-to-.patch, + which resolves a regression in volume getting restored after each + knotify event (kde#324975) + +------------------------------------------------------------------- New: ---- 0001-Revert-cache-volume-inside-PAStreams-when-trying-to-.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phonon.spec ++++++ --- /var/tmp/diff_new_pack.hzIq05/_old 2013-09-23 11:17:39.000000000 +0200 +++ /var/tmp/diff_new_pack.hzIq05/_new 2013-09-23 11:17:39.000000000 +0200 @@ -26,6 +26,8 @@ #Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/src/%{name}-%{version}.tar.xz Source0: %{name}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM 0001-Revert-cache-volume-inside-PAStreams-when-trying-to-.patch (kde#324975) +Patch0: 0001-Revert-cache-volume-inside-PAStreams-when-trying-to-.patch BuildRequires: automoc4 BuildRequires: cmake BuildRequires: fdupes @@ -70,6 +72,7 @@ %prep %setup -q +%patch0 -p1 %build %cmake_kde4 -d build -- -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=true ++++++ 0001-Revert-cache-volume-inside-PAStreams-when-trying-to-.patch ++++++ >From aafdd09931cd0eca5117abf34ffd10f3a0296378 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan <[email protected]> Date: Tue, 17 Sep 2013 11:05:26 +0200 Subject: [PATCH 1/1] Revert "cache volume inside PAStreams when trying to set it on an invalid one" --- phonon/pulsestream.cpp | 21 --------------------- phonon/pulsestream_p.h | 8 -------- phonon/pulsesupport.cpp | 4 ---- 3 files changed, 33 deletions(-) diff --git a/phonon/pulsestream.cpp b/phonon/pulsestream.cpp index 06fbed9..ef0eb3a 100644 --- a/phonon/pulsestream.cpp +++ b/phonon/pulsestream.cpp @@ -35,7 +35,6 @@ PulseStream::PulseStream(QString streamUuid, QString role) , mIndex(PA_INVALID_INDEX) , mDevice(-1) , mMute(false) - , mCachedVolume(-1) , mRole(role) { pa_cvolume_init(&mVolume); @@ -79,8 +78,6 @@ static const qreal VOLTAGE_TO_LOUDNESS_EXPONENT = qreal(1.0/LOUDNESS_TO_VOLTAGE_ void PulseStream::setVolume(const pa_cvolume *volume) { - if (mCachedVolume != -1) - QMetaObject::invokeMethod(this, "applyCachedVolume", Qt::QueuedConnection); if (pa_cvolume_equal(&mVolume, volume) == 0) { memcpy(&mVolume, volume, sizeof(mVolume)); qreal vol = (qreal)pa_cvolume_avg(volume) / PA_VOLUME_NORM; @@ -99,29 +96,11 @@ void PulseStream::setMute(bool mute) } } -qreal PulseStream::cachedVolume() const -{ - return mCachedVolume; -} - -void PulseStream::setCachedVolume(qreal volume) -{ - mCachedVolume = volume; -} - QString PulseStream::role() const { return mRole; } -void PulseStream::applyCachedVolume() -{ - if (mCachedVolume == -1) - return; - PulseSupport::getInstance()->setOutputVolume(mStreamUuid, mCachedVolume); - mCachedVolume = -1; -} - } // namespace Phonon #include "moc_pulsestream_p.cpp" diff --git a/phonon/pulsestream_p.h b/phonon/pulsestream_p.h index 3c64868..51775fa 100644 --- a/phonon/pulsestream_p.h +++ b/phonon/pulsestream_p.h @@ -52,9 +52,6 @@ namespace Phonon void setVolume(const pa_cvolume *volume); void setMute(bool mute); - qreal cachedVolume() const; - void setCachedVolume(qreal volume); - QString role() const; signals: @@ -62,17 +59,12 @@ namespace Phonon void volumeChanged(qreal volume); void muteChanged(bool mute); - private slots: - void applyCachedVolume(); - private: QString mStreamUuid; uint32_t mIndex; int mDevice; pa_cvolume mVolume; bool mMute; - // -1 = not set - qreal mCachedVolume; QString mRole; }; } // namespace Phonon diff --git a/phonon/pulsesupport.cpp b/phonon/pulsesupport.cpp index 66ea31d..8a091e3 100644 --- a/phonon/pulsesupport.cpp +++ b/phonon/pulsesupport.cpp @@ -1325,10 +1325,6 @@ bool PulseSupport::setOutputVolume(QString streamUuid, qreal volume) { return false; } pa_operation_unref(o); - } else if (s_outputStreams.contains(streamUuid) && s_outputStreams[streamUuid]->index() == PA_INVALID_INDEX) { - logMessage(QString::fromLatin1("Setting volume on an invalid stream ..... this better be intended")); - PulseStream *stream = s_outputStreams[streamUuid]; - stream->setCachedVolume(volume); } return true; #endif -- 1.8.4 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
