Commit ae81d3cb authored by Stephane Letz's avatar Stephane Letz
Browse files

Cleanup.

parent f90f76fb
......@@ -245,7 +245,7 @@ struct JackNetExtMaster : public JackNetMasterInterface {
}
}
if (rx_bytes == sizeof(session_params_t )) {
if (rx_bytes == sizeof(session_params_t)) {
switch (GetPacketType(&fParams)) {
case SLAVE_AVAILABLE:
......
......@@ -743,7 +743,7 @@ namespace Jack
// everything is OK, copy parameters
fParams = host_params;
// connect the socket
if (fSocket.Connect() == SOCKET_ERROR) {
jack_error("Error in connect : %s", StrError(NET_ERROR_CODE));
......
......@@ -94,7 +94,7 @@ namespace Jack
NetMidiBuffer::NetMidiBuffer(session_params_t* params, uint32_t nports, char* net_buffer)
{
fNPorts = nports;
fMaxBufsize = fNPorts * sizeof(sample_t) * params->fPeriodSize ;
fMaxBufsize = fNPorts * sizeof(sample_t) * params->fPeriodSize;
fMaxPcktSize = params->fMtu - sizeof(packet_header_t);
fBuffer = new char[fMaxBufsize];
fPortBuffer = new JackMidiBuffer* [fNPorts];
......@@ -102,7 +102,6 @@ namespace Jack
fPortBuffer[port_index] = NULL;
}
fNetBuffer = net_buffer;
fCycleBytesSize = params->fMtu
* (max(params->fSendMidiChannels, params->fReturnMidiChannels)
* params->fPeriodSize * sizeof(sample_t) / (params->fMtu - sizeof(packet_header_t)));
......@@ -1271,7 +1270,7 @@ namespace Jack
jack_info("Transport cycle state : %u", data->fState);
jack_info("**********************************************");
}
SERVER_EXPORT void MidiBufferHToN(JackMidiBuffer* src_buffer, JackMidiBuffer* dst_buffer)
{
dst_buffer->magic = htonl(src_buffer->magic);
......
......@@ -445,7 +445,7 @@ namespace Jack
#endif
int res;
if ((res = recvfrom(fSockfd, buffer, nbytes, flags, reinterpret_cast<socket_address_t*>(&fSendAddr), &addr_len)) < 0) {
jack_error("CatchHost fd = %ld err = %s", fSockfd, strerror(errno));
jack_log("CatchHost fd = %ld err = %s", fSockfd, strerror(errno));
}
return res;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment