From 2251b3395ac880f0b24db47615bf21ed97ec69f3 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 12 May 2020 01:34:29 +0900 Subject: 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 --- kmix/kmix.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'kmix/kmix.cpp') diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp index fc33d671..98548db9 100644 --- a/kmix/kmix.cpp +++ b/kmix/kmix.cpp @@ -155,7 +155,7 @@ KMixWindow::initWidgets() // Mixer widget line mixerNameLayout = new TQHBox( centralWidget(), "mixerNameLayout" ); - widgetsLayout->setStretchFactor( mixerNameLayout, 0 ); + widgetsLayout->setStretchFactor( mixerNameLayout, 0 ); TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum); mixerNameLayout->setSizePolicy(qsp); mixerNameLayout->setSpacing(KDialog::spacingHint()); @@ -170,7 +170,7 @@ KMixWindow::initWidgets() widgetsLayout->addWidget( mixerNameLayout ); m_wsMixers = new TQWidgetStack( centralWidget(), "MixerWidgetStack" ); - widgetsLayout->setStretchFactor( m_wsMixers, 10 ); + widgetsLayout->setStretchFactor( m_wsMixers, 10 ); widgetsLayout->addWidget( m_wsMixers ); if ( m_showMenubar ) @@ -306,10 +306,14 @@ KMixWindow::loadConfig() m_surroundView = config->readBoolEntry("Experimental-ViewSurround", false ); m_gridView = config->readBoolEntry("Experimental-ViewGrid", false ); const TQString& orientationString = config->readEntry("Orientation", "Horizontal"); - TQString mixerMasterCard = config->readEntry( "MasterMixer", "" ); - Mixer::setMasterCard(mixerMasterCard); - TQString masterDev = config->readEntry( "MasterMixerDevice", "" ); - Mixer::setMasterCardDevice(masterDev); + bool useDefaultMaster = config->readBoolEntry( "UseDefaultMaster", true ); + if (!useDefaultMaster) + { + TQString mixerMasterCard = config->readEntry( "MasterMixer", "" ); + Mixer::setMasterCard(mixerMasterCard); + TQString masterDev = config->readEntry( "MasterMixerDevice", "" ); + Mixer::setMasterCardDevice(masterDev); + } if ( valueStyleString == "Absolute" ) m_valueStyle = MixDeviceWidget::NABSOLUTE; -- cgit v1.2.1