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

List:       kde-commits
Subject:    KDE/kdemultimedia/kmix
From:       Colin Guthrie <cguthrie () mandriva ! org>
Date:       2011-04-03 11:51:48
Message-ID: 20110403115148.773DFAC8CE () svn ! kde ! org
[Download RAW message or body]

SVN commit 1226943 by cguthrie:

kmix: Do not allow 'channel configuration' with PulseAudio.

When the mixer is 'dynamic', configuring the channels is problematic and leads to \
some strange problems. This is step one on masking that functionality when used with \
PA.

CCBUG: 265317
CCBUG: 237239
CCBUG: 264835

 M  +6 -0      apps/kmix.cpp  
 M  +5 -0      gui/viewbase.cpp  


--- trunk/KDE/kdemultimedia/kmix/apps/kmix.cpp #1226942:1226943
@@ -1135,6 +1135,12 @@
             m_defaultCardOnStart = kmw->getGuiprof()->getId();
         // As switching the tab does NOT mean switching the master card, we do not \
                need to update dock icon here.
         // It would lead to unnecesary flickering of the (complete) dock area.
+
+        // We only show the "Configure Channels..." menu item if the mixer is not \
dynamic +        ViewBase* view = kmw->currentView();
+        QAction* action = actionCollection()->action( "toggle_channels_currentview" \
); +        if (view && action)
+            action->setVisible( !view->getMixer()->dynamic() );
     }
 }
 
--- trunk/KDE/kdemultimedia/kmix/gui/viewbase.cpp #1226942:1226943
@@ -33,6 +33,7 @@
 #include <kactioncollection.h>
 #include <ktoggleaction.h>
 #include <kstandardaction.h>
+#include <kmessagebox.h>
 // KMix
 #include "dialogviewconfiguration.h"
 #include "gui/guiprofile.h"
@@ -73,9 +74,11 @@
          }
       }
    }
+   if ( !_mixer->dynamic() ) {
    QAction *action = _localActionColletion->addAction("toggle_channels");
    action->setText(i18n("&Channels"));
    connect(action, SIGNAL(triggered(bool) ), SLOT(configureView()));
+   }
    connect ( _mixer, SIGNAL(controlChanged()), this, SLOT(refreshVolumeLevels()) );
    connect ( _mixer, SIGNAL(controlsReconfigured(const QString&)), this, \
SLOT(controlsReconfigured(const QString&)) );  }
@@ -280,6 +283,8 @@
  */
 void ViewBase::configureView() {
 
+    Q_ASSERT( !_mixer->dynamic() );
+    
     DialogViewConfiguration* dvc = new DialogViewConfiguration(0, *this);
     dvc->show();
     // !! The dialog is modal. Does it delete itself?


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