summaryrefslogtreecommitdiffstats
path: root/kmix/dialogselectmaster.h
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2020-05-12 01:34:29 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2020-05-25 13:24:32 +0900
commit2251b3395ac880f0b24db47615bf21ed97ec69f3 (patch)
tree219d0543f15a1b8651b87e78c33c7ae62d5bdb60 /kmix/dialogselectmaster.h
parenta00a998b33895808e19627966f047e7c32d2556c (diff)
downloadtdemultimedia-2251b3395ac880f0b24db47615bf21ed97ec69f3.tar.gz
tdemultimedia-2251b3395ac880f0b24db47615bf21ed97ec69f3.zip
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>
Diffstat (limited to 'kmix/dialogselectmaster.h')
-rw-r--r--kmix/dialogselectmaster.h6
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);
};