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

merge fixes

Browse source
This commit is contained in:
Volker Fischer 2020-06-14 21:00:19 +02:00
parent 7bce1230c4
commit cf543eab7c
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/protocol.cpp
View file

@ -1565,7 +1565,7 @@ void CProtocol::CreateRecorderStateMes ( const ERecorderState eRecorderState )
int iPos = 0; // init position pointer int iPos = 0; // init position pointer
// build data vector // build data vector
// recorder state // server jam recorder state (1 byte)
PutValOnStream ( vecData, iPos, static_cast<uint32_t> ( eRecorderState ), 1 ); PutValOnStream ( vecData, iPos, static_cast<uint32_t> ( eRecorderState ), 1 );
CreateAndSendMessage ( PROTMESSID_RECORDER_STATE, vecData ); CreateAndSendMessage ( PROTMESSID_RECORDER_STATE, vecData );
@ -1581,11 +1581,17 @@ bool CProtocol::EvaluateRecorderStateMes(const CVector<uint8_t>& vecData)
return true; // return error code return true; // return error code
} }
// server jam recorder state // server jam recorder state (1 byte)
const ERecorderState eRecorderState = static_cast<ERecorderState> ( GetValFromStream ( vecData, iPos, 1 ) ); const int iRecorderState =
static_cast<int> ( GetValFromStream ( vecData, iPos, 1 ) );
if ( iRecorderState != RS_UNDEFINED ) // ... to be defined ...
{
return true;
}
// invoke message action // invoke message action
emit RecorderStateReceived ( eRecorderState ); emit RecorderStateReceived ( static_cast<ERecorderState> ( iRecorderState ) );
return false; // no error return false; // no error
} }