Hello community,
here is the log from the commit of package plasma5-pa for openSUSE:Factory checked in at 2017-03-03 17:27:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasma5-pa (Old)
and /work/SRC/openSUSE:Factory/.plasma5-pa.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-pa"
Fri Mar 3 17:27:01 2017 rev:27 rq:461488 version:5.9.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/plasma5-pa/plasma5-pa.changes 2017-02-19 01:13:35.725631590 +0100
+++ /work/SRC/openSUSE:Factory/.plasma5-pa.new/plasma5-pa.changes 2017-03-03 17:27:02.301489876 +0100
@@ -1,0 +2,10 @@
+Tue Feb 28 19:55:22 CET 2017 - fabian@ritter-vogt.de
+
+- Update to 5.9.3
+ * New bugfix release
+ * For more details please see:
+ * https://www.kde.org/announcements/plasma-5.9.3.php
+- Changes since 5.9.2:
+ * StreamRestore: Cache values in writeChanges until receiving change from pa
+
+-------------------------------------------------------------------
Old:
----
plasma-pa-5.9.2.tar.xz
New:
----
plasma-pa-5.9.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma5-pa.spec ++++++
--- /var/tmp/diff_new_pack.tAs7oe/_old 2017-03-03 17:27:02.785421421 +0100
+++ /var/tmp/diff_new_pack.tAs7oe/_new 2017-03-03 17:27:02.789420855 +0100
@@ -18,7 +18,7 @@
%bcond_without lang
Name: plasma5-pa
-Version: 5.9.2
+Version: 5.9.3
Release: 0
Summary: The new Plasma5 Volume Manager
License: GPL-2.0+
++++++ plasma-pa-5.9.2.tar.xz -> plasma-pa-5.9.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-pa-5.9.2/CMakeLists.txt new/plasma-pa-5.9.3/CMakeLists.txt
--- old/plasma-pa-5.9.2/CMakeLists.txt 2017-02-14 14:28:15.000000000 +0100
+++ new/plasma-pa-5.9.3/CMakeLists.txt 2017-02-28 14:06:34.000000000 +0100
@@ -1,7 +1,7 @@
project(plasma-volume-control)
cmake_minimum_required(VERSION 2.8.12)
-set(PROJECT_VERSION "5.9.2")
+set(PROJECT_VERSION "5.9.3")
set(PROJECT_VERSION_MAJOR 5)
set (QT_MIN_VERSION "5.4.0")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-pa-5.9.2/po/ca@valencia/kcm_pulseaudio.po new/plasma-pa-5.9.3/po/ca@valencia/kcm_pulseaudio.po
--- old/plasma-pa-5.9.2/po/ca@valencia/kcm_pulseaudio.po 2017-02-14 14:27:37.000000000 +0100
+++ new/plasma-pa-5.9.3/po/ca@valencia/kcm_pulseaudio.po 2017-02-28 14:05:35.000000000 +0100
@@ -103,13 +103,13 @@
#, kde-format
msgctxt "@title:tab"
msgid "Recording"
-msgstr "Enregistrament"
+msgstr "Gravació"
#: kcm/package/contents/ui/main.qml:55
#, kde-format
msgctxt "@label"
msgid "No Applications Recording Audio"
-msgstr "No hi ha cap aplicació enregistrant àudio"
+msgstr "No hi ha cap aplicació gravant àudio"
#: kcm/package/contents/ui/main.qml:59
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-pa-5.9.2/po/cs/kcm_pulseaudio.po new/plasma-pa-5.9.3/po/cs/kcm_pulseaudio.po
--- old/plasma-pa-5.9.2/po/cs/kcm_pulseaudio.po 2017-02-14 14:27:37.000000000 +0100
+++ new/plasma-pa-5.9.3/po/cs/kcm_pulseaudio.po 2017-02-28 14:05:36.000000000 +0100
@@ -1,13 +1,13 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
-# Vít Pelčák , 2015, 2016.
+# Vít Pelčák , 2015, 2016, 2017.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-01-26 06:51+0100\n"
-"PO-Revision-Date: 2016-07-18 09:37+0100\n"
+"PO-Revision-Date: 2017-02-24 16:51+0100\n"
"Last-Translator: Vít Pelčák \n"
"Language-Team: Czech \n"
"Language: cs\n"
@@ -77,7 +77,7 @@
#: kcm/package/contents/ui/main.qml:36
#, kde-format
msgid "This module allows to set up the Pulseaudio sound subsystem."
-msgstr ""
+msgstr "Tento modul umožňuje nastavit zvukový podsystém Pulseaudio."
#: kcm/package/contents/ui/main.qml:39
#, kde-format
@@ -89,7 +89,7 @@
#, kde-format
msgctxt "@label"
msgid "No Applications Playing Audio"
-msgstr ""
+msgstr "Žádná aplikace nepřehrává audio"
#: kcm/package/contents/ui/main.qml:49
#, kde-format
@@ -101,7 +101,7 @@
#, kde-format
msgctxt "@label"
msgid "No Applications Recording Audio"
-msgstr ""
+msgstr "Žádná aplikace nenahrává audio"
#: kcm/package/contents/ui/main.qml:59
#, kde-format
@@ -137,7 +137,7 @@
#, kde-format
msgctxt "@label"
msgid "No Additional Configuration Available"
-msgstr ""
+msgstr "Není dostupné žádné další nastavení"
#: kcm/package/contents/ui/MuteButton.qml:28
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-pa-5.9.2/po/cs/plasma_applet_org.kde.plasma.volume.po new/plasma-pa-5.9.3/po/cs/plasma_applet_org.kde.plasma.volume.po
--- old/plasma-pa-5.9.2/po/cs/plasma_applet_org.kde.plasma.volume.po 2017-02-14 14:27:37.000000000 +0100
+++ new/plasma-pa-5.9.3/po/cs/plasma_applet_org.kde.plasma.volume.po 2017-02-28 14:05:36.000000000 +0100
@@ -1,13 +1,13 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
-# Vít Pelčák , 2015, 2016.
+# Vít Pelčák , 2015, 2016, 2017.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-01-26 06:51+0100\n"
-"PO-Revision-Date: 2016-08-01 14:37+0100\n"
+"PO-Revision-Date: 2017-02-22 14:15+0100\n"
"Last-Translator: Vít Pelčák \n"
"Language-Team: Czech \n"
"Language: cs\n"
@@ -56,7 +56,7 @@
#, kde-format
msgctxt "label of device items"
msgid "%1 (%2)"
-msgstr ""
+msgstr "%1 (%2)"
#: contents/ui/ListItemBase.qml:214
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-pa-5.9.2/po/nb/kcm_pulseaudio.po new/plasma-pa-5.9.3/po/nb/kcm_pulseaudio.po
--- old/plasma-pa-5.9.2/po/nb/kcm_pulseaudio.po 2017-02-14 14:27:53.000000000 +0100
+++ new/plasma-pa-5.9.3/po/nb/kcm_pulseaudio.po 2017-02-28 14:06:02.000000000 +0100
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2016-11-19 20:21+0100\n"
+"POT-Creation-Date: 2017-01-26 06:51+0100\n"
"PO-Revision-Date: 2015-08-27 17:01+0200\n"
"Last-Translator: Bjørn Steensrud \n"
"Language-Team: Norwegian Bokmål \n"
@@ -157,18 +157,18 @@
msgid "%1: %2"
msgstr "%1: %2"
-#: kcm/package/contents/ui/VolumeSlider.qml:82
+#: kcm/package/contents/ui/VolumeSlider.qml:87
#, kde-format
msgid "100%"
msgstr ""
-#: kcm/package/contents/ui/VolumeSlider.qml:98
+#: kcm/package/contents/ui/VolumeSlider.qml:103
#, kde-format
msgctxt "volume percentage"
msgid "%1%"
msgstr "%1%"
-#: kcm/package/contents/ui/VolumeSlider.qml:104
+#: kcm/package/contents/ui/VolumeSlider.qml:109
#, kde-format
msgctxt "only used for sizing, should be widest possible string"
msgid "100%"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-pa-5.9.2/src/streamrestore.cpp new/plasma-pa-5.9.3/src/streamrestore.cpp
--- old/plasma-pa-5.9.2/src/streamrestore.cpp 2017-02-14 14:27:32.000000000 +0100
+++ new/plasma-pa-5.9.3/src/streamrestore.cpp 2017-02-28 14:05:27.000000000 +0100
@@ -38,6 +38,7 @@
void StreamRestore::update(const pa_ext_stream_restore_info *info)
{
+ m_cache.valid = false;
const QString infoName = QString::fromUtf8(info->name);
if (m_name != infoName) {
m_name = infoName;
@@ -80,7 +81,11 @@
void StreamRestore::setDevice(const QString &device)
{
- writeChanges(m_volume, m_channelMap, m_muted, device);
+ if (m_cache.valid) {
+ writeChanges(m_cache.volume, m_cache.channelMap, m_cache.muted, device);
+ } else {
+ writeChanges(m_volume, m_channelMap, m_muted, device);
+ }
}
qint64 StreamRestore::volume() const
@@ -90,11 +95,16 @@
void StreamRestore::setVolume(qint64 volume)
{
- pa_cvolume vol = m_volume;
+ pa_cvolume vol = m_cache.valid ? m_cache.volume : m_volume;
for (int i = 0; i < vol.channels; ++i) {
vol.values[i] = volume;
}
- writeChanges(vol, m_channelMap, m_muted, m_device);
+
+ if (m_cache.valid) {
+ writeChanges(vol, m_cache.channelMap, m_cache.muted, m_cache.device);
+ } else {
+ writeChanges(vol, m_channelMap, m_muted, m_device);
+ }
}
bool StreamRestore::isMuted() const
@@ -104,11 +114,11 @@
void StreamRestore::setMuted(bool muted)
{
- if (m_muted == muted) {
- return;
+ if (m_cache.valid) {
+ writeChanges(m_cache.volume, m_cache.channelMap, muted, m_cache.device);
+ } else {
+ writeChanges(m_volume, m_channelMap, muted, m_device);
}
-
- writeChanges(m_volume, m_channelMap, muted, m_device);
}
bool StreamRestore::hasVolume() const
@@ -139,9 +149,14 @@
void StreamRestore::setChannelVolume(int channel, qint64 volume)
{
Q_ASSERT(channel >= 0 && channel < m_volume.channels);
- pa_cvolume vol = m_volume;
+ pa_cvolume vol = m_cache.valid ? m_cache.volume : m_volume;
vol.values[channel] = volume;
- writeChanges(vol, m_channelMap, m_muted, m_device);
+
+ if (m_cache.valid) {
+ writeChanges(vol, m_cache.channelMap, m_cache.muted, m_cache.device);
+ } else {
+ writeChanges(vol, m_channelMap, m_muted, m_device);
+ }
}
quint32 StreamRestore::deviceIndex() const
@@ -167,6 +182,12 @@
info.device = deviceData.isEmpty() ? nullptr : deviceData.constData();
info.mute = muted;
+ m_cache.valid = true;
+ m_cache.volume = volume;
+ m_cache.channelMap = channelMap;
+ m_cache.muted = muted;
+ m_cache.device = device;
+
context()->streamRestoreWrite(&info);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-pa-5.9.2/src/streamrestore.h new/plasma-pa-5.9.3/src/streamrestore.h
--- old/plasma-pa-5.9.2/src/streamrestore.h 2017-02-14 14:27:32.000000000 +0100
+++ new/plasma-pa-5.9.3/src/streamrestore.h 2017-02-28 14:05:27.000000000 +0100
@@ -86,6 +86,14 @@
pa_channel_map m_channelMap;
QStringList m_channels;
bool m_muted;
+
+ struct {
+ bool valid = false;
+ pa_cvolume volume;
+ pa_channel_map channelMap;
+ bool muted;
+ QString device;
+ } m_cache;
};
} // QPulseAudio