Added initial support for PulseAudio in KMix. The mixer/device channel to control

from the system tray widget is now selectable from the user and default
to the main one if not specifically selected. This allows to control
PulseAudio volume from KMix correctly.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 4 insertions, 2 deletions

diff --git a/kmix/kmixdockwidget.h b/kmix/kmixdockwidget.h
index 0899d28f..6be2b4b7 100644
--- a/kmix/kmixdockwidget.h
+++ b/kmix/kmixdockwidget.h
@@ -36,11 +36,11 @@ class MixDeviceWidget;
 class Mixer;
 class ViewDockAreaPopup;
 class Volume;
+class DialogSelectMaster;
 
 class KMixDockWidget : public KSystemTray  {
    Q_OBJECT
   
-
    friend class KMixWindow;
 
  public:
@@ -78,10 +78,12 @@ class KMixDockWidget : public KSystemTray  {
    char _oldPixmapType;
    bool _volumePopup;
    bool _dockIconMuting;
+   DialogSelectMaster *_dsm;
+
  private slots:
    void dockMute();
    void selectMaster();
-   void handleNewMaster(int soundcard_id, TQString& channel_id);
+   void handleNewMaster(bool defaultMaster, int soundcard_id, const TQString &channel_id);
 };
 
 #endif