Browse Source

Cleanup.

tags/v1.9.10
Stephane Letz 11 years ago
parent
commit
ae81d3cb41
4 changed files with 5 additions and 6 deletions
  1. +1
    -1
      common/JackNetAPI.cpp
  2. +1
    -1
      common/JackNetInterface.cpp
  3. +2
    -3
      common/JackNetTool.cpp
  4. +1
    -1
      posix/JackNetUnixSocket.cpp

+ 1
- 1
common/JackNetAPI.cpp View File

@@ -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)) { switch (GetPacketType(&fParams)) {


case SLAVE_AVAILABLE: case SLAVE_AVAILABLE:


+ 1
- 1
common/JackNetInterface.cpp View File

@@ -743,7 +743,7 @@ namespace Jack


// everything is OK, copy parameters // everything is OK, copy parameters
fParams = host_params; fParams = host_params;
// connect the socket // connect the socket
if (fSocket.Connect() == SOCKET_ERROR) { if (fSocket.Connect() == SOCKET_ERROR) {
jack_error("Error in connect : %s", StrError(NET_ERROR_CODE)); jack_error("Error in connect : %s", StrError(NET_ERROR_CODE));


+ 2
- 3
common/JackNetTool.cpp View File

@@ -94,7 +94,7 @@ namespace Jack
NetMidiBuffer::NetMidiBuffer(session_params_t* params, uint32_t nports, char* net_buffer) NetMidiBuffer::NetMidiBuffer(session_params_t* params, uint32_t nports, char* net_buffer)
{ {
fNPorts = nports; fNPorts = nports;
fMaxBufsize = fNPorts * sizeof(sample_t) * params->fPeriodSize ;
fMaxBufsize = fNPorts * sizeof(sample_t) * params->fPeriodSize;
fMaxPcktSize = params->fMtu - sizeof(packet_header_t); fMaxPcktSize = params->fMtu - sizeof(packet_header_t);
fBuffer = new char[fMaxBufsize]; fBuffer = new char[fMaxBufsize];
fPortBuffer = new JackMidiBuffer* [fNPorts]; fPortBuffer = new JackMidiBuffer* [fNPorts];
@@ -102,7 +102,6 @@ namespace Jack
fPortBuffer[port_index] = NULL; fPortBuffer[port_index] = NULL;
} }
fNetBuffer = net_buffer; fNetBuffer = net_buffer;

fCycleBytesSize = params->fMtu fCycleBytesSize = params->fMtu
* (max(params->fSendMidiChannels, params->fReturnMidiChannels) * (max(params->fSendMidiChannels, params->fReturnMidiChannels)
* params->fPeriodSize * sizeof(sample_t) / (params->fMtu - sizeof(packet_header_t))); * 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("Transport cycle state : %u", data->fState);
jack_info("**********************************************"); jack_info("**********************************************");
} }
SERVER_EXPORT void MidiBufferHToN(JackMidiBuffer* src_buffer, JackMidiBuffer* dst_buffer) SERVER_EXPORT void MidiBufferHToN(JackMidiBuffer* src_buffer, JackMidiBuffer* dst_buffer)
{ {
dst_buffer->magic = htonl(src_buffer->magic); dst_buffer->magic = htonl(src_buffer->magic);


+ 1
- 1
posix/JackNetUnixSocket.cpp View File

@@ -445,7 +445,7 @@ namespace Jack
#endif #endif
int res; int res;
if ((res = recvfrom(fSockfd, buffer, nbytes, flags, reinterpret_cast<socket_address_t*>(&fSendAddr), &addr_len)) < 0) { 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; return res;
} }


Loading…
Cancel
Save