Skip to content

Commit 241ac64

Browse files
committed
introduce function SetControllerInFaderLevel to be able to use controller in for RPC interface
1 parent e6080e5 commit 241ac64

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

src/client.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,7 @@ void CClient::OnHandledSignal ( int sigNum )
881881
#endif
882882
}
883883

884-
void CClient::OnControllerInFaderLevel ( int iChannelIdx, int iValue )
884+
void CClient::SetControllerInFaderLevel ( int iChannelIdx, int iValue )
885885
{
886886
// in case of a headless client the faders cannot be moved so we need
887887
// to send the controller information directly to the server

src/client.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,8 @@ class CClient : public QObject
260260
void OnTimerRemoteChanGainOrPan();
261261
void StartTimerGainOrPan();
262262

263+
void SetControllerInFaderLevel ( int iChannelIdx, int iValue );
264+
263265
void SetInputBoost ( const int iNewBoost ) { iInputBoost = iNewBoost; }
264266

265267
void SetRemoteInfo() { Channel.SetRemoteInfo ( ChannelInfo ); }
@@ -432,7 +434,7 @@ protected slots:
432434
void OnCLPingWithNumClientsReceived ( CHostAddress InetAddr, int iMs, int iNumClients );
433435

434436
void OnSndCrdReinitRequest ( int iSndCrdResetType );
435-
void OnControllerInFaderLevel ( int iChannelIdx, int iValue );
437+
void OnControllerInFaderLevel ( int iChannelIdx, int iValue ) { SetControllerInFaderLevel ( iChannelIdx, iValue ); }
436438
void OnControllerInPanValue ( int iChannelIdx, int iValue );
437439
void OnControllerInFaderIsSolo ( int iChannelIdx, bool bIsSolo );
438440
void OnControllerInFaderIsMute ( int iChannelIdx, bool bIsMute );

src/clientrpc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ CClientRpc::CClientRpc ( CClient* pClient, CRpcServer* pRpcServer, QObject* pare
348348
}
349349

350350
// TODO How to set fader level in client correctly? OnControllerInFaderLevel is definitely the function we need to call...
351-
//pClient->OnControllerInFaderLevel ( jsonChannelIndex.toInt(), jsonLevel.toInt() );
351+
pClient->SetControllerInFaderLevel ( jsonChannelIndex.toInt(), jsonLevel.toInt() );
352352
response["result"] = "ok";
353353
} );
354354
}

0 commit comments

Comments
 (0)