eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

small corrections

Browse source
This commit is contained in:
Tarmo Johannes 2020-05-13 00:11:06 +03:00
parent 764ed82ccb
commit d68ccf40b7
3 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Jamulus.pro
View file

@ -8,7 +8,9 @@ contains(CONFIG, "noupcasename") {
CONFIG += qt \ CONFIG += qt \
thread \ thread \
release debug
CONFIG(debug, debug|release) { CONFIG += qt warn_on rtti exceptions }
QT += widgets \ QT += widgets \
network \ network \

18
src/audiomixerboard.cpp
View file

@ -67,8 +67,8 @@ CChannelFader::CChannelFader ( QWidget* pNW,
pFader->setTickInterval ( AUD_MIX_FADER_MAX / 9 ); pFader->setTickInterval ( AUD_MIX_FADER_MAX / 9 );
// setup panning slider // setup panning slider
pPan->setRange( 0, AUD_MIX_FADER_MAX); pPan->setRange( 0, AUD_MIX_PAN_MAX);
pPan->setValue(AUD_MIX_FADER_MAX/2); pPan->setValue(AUD_MIX_PAN_MAX/2);
// setup fader tag label (black bold text which is centered) // 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 // init gain and pan value -> maximum value as definition according to server
pFader->setValue ( AUD_MIX_FADER_MAX ); 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 // reset mute/solo check boxes and level meter
pcbMute->setChecked ( false ); pcbMute->setChecked ( false );
@ -304,7 +304,7 @@ void CChannelFader::SetFaderLevel ( const int iLevel )
void CChannelFader::SetPanValue(const int iPan) void CChannelFader::SetPanValue(const int iPan)
{ {
// first make a range check // 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 // we set the new fader level in the GUI (slider control) and also tell the
// server about the change // server about the change
@ -340,16 +340,8 @@ void CChannelFader::SendFaderLevelToServer ( const int iLevel )
void CChannelFader::SendPanValueToServer ( const int iPan ) void CChannelFader::SendPanValueToServer ( const int iPan )
{ {
double dPan = static_cast<double> ( iPan ) / AUD_MIX_PAN_MAX;
// 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<double> ( iPan ) / AUD_MIX_FADER_MAX;
emit panValueChanged ( dPan ); emit panValueChanged ( dPan );
}
} }
void CChannelFader::OnMuteStateChanged ( int value ) void CChannelFader::OnMuteStateChanged ( int value )

5
src/global.h
View file

@ -149,6 +149,11 @@ LED bar: lbr
// audio mixer fader maximum value // audio mixer fader maximum value
#define AUD_MIX_FADER_MAX 100 #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, // maximum number of recognized sound cards installed in the system,
// definition for "no device" // definition for "no device"
#define MAX_NUMBER_SOUND_CARDS 129 // e.g. 16 inputs, 8 outputs + default entry (MacOS) #define MAX_NUMBER_SOUND_CARDS 129 // e.g. 16 inputs, 8 outputs + default entry (MacOS)