From d68ccf40b7fae68d88b902f8ba3f80694f8227d2 Mon Sep 17 00:00:00 2001 From: Tarmo Johannes Date: Wed, 13 May 2020 00:11:06 +0300 Subject: [PATCH] small corrections --- Jamulus.pro | 4 +++- src/audiomixerboard.cpp | 24 ++++++++---------------- src/global.h | 5 +++++ 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/Jamulus.pro b/Jamulus.pro index 80e04633..c1f04052 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -8,7 +8,9 @@ contains(CONFIG, "noupcasename") { CONFIG += qt \ thread \ - release + debug + +CONFIG(debug, debug|release) { CONFIG += qt warn_on rtti exceptions } QT += widgets \ network \ diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp index af367bb1..79433433 100644 --- a/src/audiomixerboard.cpp +++ b/src/audiomixerboard.cpp @@ -40,7 +40,7 @@ CChannelFader::CChannelFader ( QWidget* pNW, plbrChannelLevel = new CMultiColorLEDBar ( pLevelsBox ); pFader = new QSlider ( Qt::Vertical, pLevelsBox ); - pPan = new QSlider (Qt::Horizontal, pLevelsBox); + pPan = new QSlider (Qt::Horizontal, pLevelsBox); pMuteSoloBox = new QWidget ( pFrame ); pcbMute = new QCheckBox ( "Mute", pMuteSoloBox ); @@ -67,8 +67,8 @@ CChannelFader::CChannelFader ( QWidget* pNW, pFader->setTickInterval ( AUD_MIX_FADER_MAX / 9 ); // setup panning slider - pPan->setRange( 0, AUD_MIX_FADER_MAX); - pPan->setValue(AUD_MIX_FADER_MAX/2); + pPan->setRange( 0, AUD_MIX_PAN_MAX); + pPan->setValue(AUD_MIX_PAN_MAX/2); // setup fader tag label (black bold text which is centered) @@ -261,7 +261,7 @@ void CChannelFader::Reset() { // init gain and pan value -> maximum value as definition according to server pFader->setValue ( AUD_MIX_FADER_MAX ); - pPan->setValue ( AUD_MIX_FADER_MAX/2 ); + pPan->setValue ( AUD_MIX_PAN_MAX/2 ); // reset mute/solo check boxes and level meter pcbMute->setChecked ( false ); @@ -304,7 +304,7 @@ void CChannelFader::SetFaderLevel ( const int iLevel ) void CChannelFader::SetPanValue(const int iPan) { // first make a range check - if ( ( iPan >= 0 ) && ( iPan <= AUD_MIX_FADER_MAX ) ) + if ( ( iPan >= 0 ) && ( iPan <= AUD_MIX_PAN_MAX ) ) { // we set the new fader level in the GUI (slider control) and also tell the // server about the change @@ -339,17 +339,9 @@ void CChannelFader::SendFaderLevelToServer ( const int iLevel ) } void CChannelFader::SendPanValueToServer ( const int iPan ) -{ - - // if mute flag is set or other channel is on solo, do not apply the pan - if ( ( pcbMute->checkState() == Qt::Unchecked ) && - ( !bOtherChannelIsSolo || IsSolo() ) ) - { - // emit signal for new pan value - double dPan = static_cast ( iPan ) / AUD_MIX_FADER_MAX; - emit panValueChanged ( dPan ); - } - +{ + double dPan = static_cast ( iPan ) / AUD_MIX_PAN_MAX; + emit panValueChanged ( dPan ); } void CChannelFader::OnMuteStateChanged ( int value ) diff --git a/src/global.h b/src/global.h index 382f5599..97823ef6 100755 --- a/src/global.h +++ b/src/global.h @@ -149,6 +149,11 @@ LED bar: lbr // audio mixer fader maximum value #define AUD_MIX_FADER_MAX 100 + +// audio mixer panning maximum value +#define AUD_MIX_PAN_MAX 100 + + // maximum number of recognized sound cards installed in the system, // definition for "no device" #define MAX_NUMBER_SOUND_CARDS 129 // e.g. 16 inputs, 8 outputs + default entry (MacOS)