[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kmix/kmix-improvements] src: Add current level to masterVolumeChanged signal
From:       Trever Fischer <tdfischer () fedoraproject ! org>
Date:       2013-02-19 19:56:03
Message-ID: 20130219195603.298D2A60DA () git ! kde ! org
[Download RAW message or body]

Git commit d88bc0fefeee7884ac7269ee02bcb1e1c8ddae67 by Trever Fischer.
Committed on 27/09/2012 at 18:17.
Pushed by tdfischer into branch 'kmix-improvements'.

Add current level to masterVolumeChanged signal

M  +7    -2    src/daemon/KMixDApp.cpp
M  +3    -2    src/daemon/KMixDApp.h
M  +3    -1    src/dbus/org.kde.kmix.kmixd.xml

http://commits.kde.org/kmix/d88bc0fefeee7884ac7269ee02bcb1e1c8ddae67

diff --git a/src/daemon/KMixDApp.cpp b/src/daemon/KMixDApp.cpp
index 8673324..5a8990d 100644
--- a/src/daemon/KMixDApp.cpp
+++ b/src/daemon/KMixDApp.cpp
@@ -93,13 +93,18 @@ void KMixDApp::controlAdded(Control *control)
 {
     if (control->category() == Control::HardwareOutput) {
         if (m_master)
-            disconnect(m_master, SIGNAL(volumeChanged(int, int)), this, SIGNAL(masterVolumeChanged()));
+            disconnect(m_master, SIGNAL(volumeChanged(int, int)), this, SLOT(updateMasterVolume()));
         m_master = control;
         emit masterChanged(QString("/controls/%1").arg(m_master->id()));
-        connect(m_master, SIGNAL(volumeChanged(int, int)), this, SIGNAL(masterVolumeChanged()));
+        connect(m_master, SIGNAL(volumeChanged(int, int)), this, SLOT(updateMasterVolume()));
     }
 }
 
+void KMixDApp::updateMasterVolume()
+{
+    emit masterVolumeChanged(masterVolume());
+}
+
 void KMixDApp::controlRemoved(Control *control)
 {
     if (control == m_master) {
diff --git a/src/daemon/KMixDApp.h b/src/daemon/KMixDApp.h
index ed0d680..47f0d9e 100644
--- a/src/daemon/KMixDApp.h
+++ b/src/daemon/KMixDApp.h
@@ -31,7 +31,7 @@ class KMixDApp : public QCoreApplication
     Q_OBJECT
     Q_PROPERTY(QStringList mixerGroups READ mixerGroups);
     Q_PROPERTY(QString masterControl READ masterControl);
-    Q_PROPERTY(int masterVolume READ masterVolume WRITE setMasterVolume);
+    Q_PROPERTY(int masterVolume READ masterVolume WRITE setMasterVolume NOTIFY masterVolumeChanged);
 public:
     KMixDApp(int &argc, char **argv);
     ~KMixDApp();
@@ -46,10 +46,11 @@ signals:
     void groupAdded(const QString &name);
     void groupRemoved(const QString &name);
     void masterChanged(const QString &path);
-    void masterVolumeChanged();
+    void masterVolumeChanged(int value);
 private slots:
     void controlAdded(Control *);
     void controlRemoved(Control *);
+    void updateMasterVolume();
 private:
     Control *m_master;
 };
diff --git a/src/dbus/org.kde.kmix.kmixd.xml b/src/dbus/org.kde.kmix.kmixd.xml
index 88c5401..22992c8 100644
--- a/src/dbus/org.kde.kmix.kmixd.xml
+++ b/src/dbus/org.kde.kmix.kmixd.xml
@@ -10,7 +10,9 @@
     <signal name="masterChanged">
         <arg name="id" type="s"/>
     </signal>
-    <signal name="masterVolumeChanged"/>
+    <signal name="masterVolumeChanged">
+        <arg name="level" type="d"/>
+    </signal>
     <property access="readwrite" name="masterVolume" type="i">
     <signal name="groupAdded">
         <arg name="name" type="s"/>

[prev in list] [next in list] [prev in thread] [next in thread]