[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-08-05 9:16:17
Message-ID: 20100805091617.9C81FAC7BC () svn ! kde ! org
[Download RAW message or body]

SVN commit 1159384 by pedrol:

Fix: channels window setters

 M  +1 -5      channels.cpp  
 M  +10 -3     kmid2.cpp  


--- trunk/extragear/multimedia/kmid/src/channels.cpp #1159383:1159384
@@ -296,7 +296,6 @@
 void Channels::setMuteChannel(int channel, bool mute)
 {
     m_mute[channel]->setChecked(mute);
-    slotMuteChannel(channel);
 }
 
 bool Channels::isChannelSoloed(int channel) const
@@ -307,7 +306,6 @@
 void Channels::setSoloChannel(int channel, bool solo)
 {
     m_solo[channel]->setChecked(solo);
-    slotSoloChannel(channel);
 }
 
 int Channels::channelPatch(int channel) const
@@ -317,14 +315,12 @@
 
 void Channels::setPatchChannel(int channel, int patch)
 {
-    slotPatch(channel, patch);
-    slotPatchChanged(channel);
+    m_patch[channel]->setCurrentIndex(patch);
 }
 
 void Channels::setLockChannel(int channel, bool lock)
 {
     m_lock[channel]->setChecked(lock);
-    slotLockChannel(channel);
 }
 
 void Channels::slotNameChannel(int channel)
--- trunk/extragear/multimedia/kmid/src/kmid2.cpp #1159383:1159384
@@ -482,6 +482,8 @@
     }
     if (m_channels != 0)
         for(int i = 0; i < MIDI_CHANNELS; ++i ) {
+            m_midiout->setLocked(i, false);
+            m_midiout->setMuted(i, false);
             m_channels->setLockChannel(i, false);
             m_channels->enableChannel(i, m_midiobj->channelUsed(i));
             m_channels->setChannelName(i, m_midiobj->channelLabel(i));
@@ -1451,7 +1453,7 @@
 void KMid2::slotLoadSongSettings()
 {
     int vol, pitch, skew, pgm;
-    bool locked;
+    bool locked, muted, solo;
     if (!m_songName.isEmpty()) {
         QString fileName = QString("songlib/%1.cfg").arg(m_songName);
         KConfig songSettings(KStandardDirs::locateLocal("appdata", fileName, false));
@@ -1484,9 +1486,14 @@
                     m_channels->setChannelName(i, name);
                     m_pianola->slotLabel(i, name);
                 }
-                m_channels->setMuteChannel(i, grp.readEntry("muted", false));
-                m_channels->setSoloChannel(i, grp.readEntry("solo", false));
 
+                muted = grp.readEntry("muted", false);
+                m_midiout->setMuted(i, muted);
+                m_channels->setMuteChannel(i, muted);
+
+                solo = grp.readEntry("solo", false);
+                m_channels->setSoloChannel(i, solo);
+
                 pgm = grp.readEntry("patch", -1);
                 m_channels->setPatchChannel(i, pgm);
                 if (pgm > -1)
[prev in list] [next in list] [prev in thread] [next in thread]