use integer for the fader level message
This commit is contained in:
parent
ea24503fdc
commit
91642b0c2e
9 changed files with 24 additions and 19 deletions
|
@ -1,6 +1,11 @@
|
|||
|
||||
|
||||
|
||||
3.4.4
|
||||
|
||||
- added support for controlling the audio mixer faders with a MIDI controller (MacOS only)
|
||||
|
||||
|
||||
|
||||
3.4.3 (2018-05-17)
|
||||
|
||||
|
|
|
@ -669,15 +669,15 @@ void CAudioMixerBoard::ApplyNewConClientList ( CVector<CChannelInfo>& vecChanInf
|
|||
emit NumClientsChanged ( iNumConnectedClients );
|
||||
}
|
||||
|
||||
void CAudioMixerBoard::SetFaderLevel ( const int iChannelIdx,
|
||||
const double dValue )
|
||||
void CAudioMixerBoard::SetFaderLevel ( const int iChannelIdx,
|
||||
const int iValue )
|
||||
{
|
||||
// only apply new fader level if channel index is valid and the fader is visible
|
||||
if ( ( iChannelIdx >= 0 ) && ( iChannelIdx < MAX_NUM_CHANNELS ) )
|
||||
{
|
||||
if ( vecpChanFader[iChannelIdx]->IsVisible() )
|
||||
{
|
||||
vecpChanFader[iChannelIdx]->SetFaderLevel ( dValue );
|
||||
vecpChanFader[iChannelIdx]->SetFaderLevel ( iValue );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -102,8 +102,8 @@ public:
|
|||
void SetServerName ( const QString& strNewServerName );
|
||||
void SetGUIDesign ( const EGUIDesign eNewDesign );
|
||||
|
||||
void SetFaderLevel ( const int iChannelIdx,
|
||||
const double dValue );
|
||||
void SetFaderLevel ( const int iChannelIdx,
|
||||
const int iValue );
|
||||
|
||||
// settings
|
||||
CVector<QString> vecStoredFaderTags;
|
||||
|
|
|
@ -198,8 +198,8 @@ CClient::CClient ( const quint16 iPortNumber,
|
|||
this, SLOT ( OnSndCrdReinitRequest ( int ) ) );
|
||||
|
||||
QObject::connect ( &Sound,
|
||||
SIGNAL ( ControllerInFaderLevel ( int, double ) ),
|
||||
SIGNAL ( ControllerInFaderLevel ( int, double ) ) );
|
||||
SIGNAL ( ControllerInFaderLevel ( int, int ) ),
|
||||
SIGNAL ( ControllerInFaderLevel ( int, int ) ) );
|
||||
|
||||
QObject::connect ( &Socket, SIGNAL ( InvalidPacketReceived ( CHostAddress ) ),
|
||||
this, SLOT ( OnInvalidPacketReceived ( CHostAddress ) ) );
|
||||
|
|
|
@ -411,7 +411,7 @@ signals:
|
|||
#endif
|
||||
|
||||
void Disconnected();
|
||||
void ControllerInFaderLevel ( int iChannelIdx, double dValue );
|
||||
void ControllerInFaderLevel ( int iChannelIdx, int iValue );
|
||||
};
|
||||
|
||||
#endif /* !defined ( CLIENT_HOIHGE76GEKJH98_3_43445KJIUHF1912__INCLUDED_ ) */
|
||||
|
|
|
@ -483,8 +483,8 @@ CClientDlg::CClientDlg ( CClient* pNCliP,
|
|||
this, SLOT ( OnCLPingTimeWithNumClientsReceived ( CHostAddress, int, int ) ) );
|
||||
|
||||
QObject::connect ( pClient,
|
||||
SIGNAL ( ControllerInFaderLevel ( int, double ) ),
|
||||
this, SLOT ( OnControllerInFaderLevel ( int, double ) ) );
|
||||
SIGNAL ( ControllerInFaderLevel ( int, int ) ),
|
||||
this, SLOT ( OnControllerInFaderLevel ( int, int ) ) );
|
||||
|
||||
#ifdef ENABLE_CLIENT_VERSION_AND_OS_DEBUGGING
|
||||
QObject::connect ( pClient,
|
||||
|
|
|
@ -134,9 +134,9 @@ public slots:
|
|||
int iPingTime,
|
||||
int iNumClients );
|
||||
|
||||
void OnControllerInFaderLevel ( const int iChannelIdx,
|
||||
const double dValue ) { MainMixerBoard->SetFaderLevel ( iChannelIdx,
|
||||
dValue ); }
|
||||
void OnControllerInFaderLevel ( const int iChannelIdx,
|
||||
const int iValue ) { MainMixerBoard->SetFaderLevel ( iChannelIdx,
|
||||
iValue ); }
|
||||
|
||||
#ifdef ENABLE_CLIENT_VERSION_AND_OS_DEBUGGING
|
||||
void OnCLVersionAndOSReceived ( CHostAddress InetAddr,
|
||||
|
|
|
@ -100,9 +100,9 @@ void CSoundBase::run()
|
|||
void CSoundBase::ParseMIDIMessage ( const CVector<int8_t>& vMIDIPaketBytes )
|
||||
{
|
||||
// TODO
|
||||
int iChannelIdx = 0;
|
||||
double dFaderLevel = 0;
|
||||
EmitControllerInFaderLevel ( iChannelIdx, dFaderLevel );
|
||||
int iChannelIdx = 0;
|
||||
int iFaderLevel = 0;
|
||||
EmitControllerInFaderLevel ( iChannelIdx, iFaderLevel );
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -89,8 +89,8 @@ public:
|
|||
void EmitReinitRequestSignal ( const ESndCrdResetType eSndCrdResetType )
|
||||
{ emit ReinitRequest ( eSndCrdResetType ); }
|
||||
|
||||
void EmitControllerInFaderLevel ( const int iChannelIdx,
|
||||
const double dValue ) { emit ControllerInFaderLevel ( iChannelIdx, dValue ); }
|
||||
void EmitControllerInFaderLevel ( const int iChannelIdx,
|
||||
const int iValue ) { emit ControllerInFaderLevel ( iChannelIdx, iValue ); }
|
||||
|
||||
protected:
|
||||
// driver handling
|
||||
|
@ -129,7 +129,7 @@ protected:
|
|||
|
||||
signals:
|
||||
void ReinitRequest ( int iSndCrdResetType );
|
||||
void ControllerInFaderLevel ( int iChannelIdx, double dValue );
|
||||
void ControllerInFaderLevel ( int iChannelIdx, int iValue );
|
||||
};
|
||||
|
||||
#endif /* !defined ( SOUNDBASE_HOIHGEH8_3_4344456456345634565KJIUHF1912__INCLUDED_ ) */
|
||||
|
|
Loading…
Reference in a new issue