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

List:       kde-commits
Subject:    extragear/multimedia/kmid/src
From:       Pedro Lopez-Cabanillas <pedro.lopez.cabanillas () gmail ! com>
Date:       2010-07-30 9:17:44
Message-ID: 20100730091744.8D9D3AC782 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1157123 by pedrol:

new dbus method currentSource()

 M  +7 -0      kmid2.cpp  
 M  +1 -0      kmid2.h  
 M  +8 -0      kmid_part.cpp  
 M  +5 -0      kmid_part.h  
 M  +3 -0      org.kde.KMid.xml  
 M  +3 -0      org.kde.KMidPart.xml  


--- trunk/extragear/multimedia/kmid/src/kmid2.cpp #1157122:1157123
@@ -1709,3 +1709,10 @@
         return m_midiout->volume(-1);
     return 1.0;
 }
+
+QString KMid2::currentSource() const
+{
+    if (m_midiobj != 0)
+        return m_midiobj->currentSource();
+    return QString();
+}
--- trunk/extragear/multimedia/kmid/src/kmid2.h #1157122:1157123
@@ -98,6 +98,7 @@
     qlonglong position();
     int state();
     double volumeFactor();
+    QString currentSource() const;
     bool openUrl(const QString& url);
 
 public slots:
--- trunk/extragear/multimedia/kmid/src/kmid_part.cpp #1157122:1157123
@@ -528,6 +528,7 @@
 
 void KMidPart::setAutoStart(bool start)
 {
+    kDebug() << start;
     d->m_autoStart = start;
 }
 
@@ -624,3 +625,10 @@
     kDebug() << "QString:" << str;
     return KParts::ReadOnlyPart::openUrl(url);
 }
+
+QString KMidPart::currentSource() const
+{
+    if (d->m_midiobj != 0)
+        return d->m_midiobj->currentSource();
+    return QString();
+}
--- trunk/extragear/multimedia/kmid/src/kmid_part.h #1157122:1157123
@@ -180,6 +180,11 @@
      */
     bool isMuted(int channel);
 
+    /**
+     * Returns the name of the currently loaded sequence, if any.
+     */
+    QString currentSource() const;
+
 public slots:
     /**
      * Pauses the playback
--- trunk/extragear/multimedia/kmid/src/org.kde.KMid.xml #1157122:1157123
@@ -36,6 +36,9 @@
         <arg name="channel" type="i" direction="in"/>
         <arg name="muted" type="b" direction="out"/>
     </method>
+    <method name="currentSource">
+        <arg name="source" type="s" direction="out"/>
+    </method>
     <signal name="beat">
         <arg name="bar" type="i"/>
         <arg name="part" type="i"/>
--- trunk/extragear/multimedia/kmid/src/org.kde.KMidPart.xml #1157122:1157123
@@ -20,6 +20,9 @@
         <arg name="channel" type="i" direction="in"/>
         <arg name="muted" type="b" direction="out"/>
     </method>
+    <method name="currentSource">
+        <arg name="source" type="s" direction="out"/>
+    </method>
     <signal name="beat">
         <arg name="bar" type="i"/>
         <arg name="part" type="i"/>
[prev in list] [next in list] [prev in thread] [next in thread]