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/dialogselectmaster.h b/kmix/dialogselectmaster.h
index 8150b197..88ce89f4 100644
--- a/kmix/dialogselectmaster.h
+++ b/kmix/dialogselectmaster.h
@@ -22,7 +22,7 @@ class DialogSelectMaster : public KDialogBase
     ~DialogSelectMaster();
 
  signals:
-    void newMasterSelected(int, TQString& );
+    void newMasterSelected(bool defaultMaster, int soundcard_id, const TQString &channel_id);
 
  public slots:
     void apply();
@@ -33,11 +33,13 @@ class DialogSelectMaster : public KDialogBase
     TQVBoxLayout* _layout;
     KComboBox* m_cMixer;
     TQScrollView* m_scrollableChannelSelector;
-    TQVBox *m_vboxForScrollView;
+    TQVBox *m_vboxChannels, *m_vboxForScrollView;
     TQButtonGroup *m_buttonGroupForScrollView;
+    TQRadioButton *m_defaultMaster, *m_userMaster;
     TQStringList m_mixerPKs;
 
  private slots:
+   void masterSelectionChanged(int _unused);
    void createPageByID(int mixerId);
 };