From 3d08431fe93234fedbbc29bcb2a41123419d7b53 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Thu, 29 Jan 2009 12:27:42 +0000
Subject: [PATCH] Support for BIG_ENDIAN machines in NetJack2 for MIDI ports.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3275 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 ChangeLog              |  1 +
 common/JackNetTool.cpp | 35 +++++++++++++++++++++++++++++++++--
 common/JackNetTool.h   |  2 ++
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6a47a603..8fe5fa48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,7 @@ Michael Voigt
 2009-01-29 Stephane Letz  <letz@grame.fr>
 
 	* Support for "-h" option in internal clients to print the parameters. 
+	* Support for BIG_ENDIAN machines in NetJack2 for MIDI ports.
 
 2009-01-28 Stephane Letz  <letz@grame.fr>
 
diff --git a/common/JackNetTool.cpp b/common/JackNetTool.cpp
index e731b252..737f02af 100644
--- a/common/JackNetTool.cpp
+++ b/common/JackNetTool.cpp
@@ -76,12 +76,17 @@ namespace Jack
         size_t copy_size;
         for ( int port_index = 0; port_index < fNPorts; port_index++ )
         {
+            char* write_pos = fBuffer + pos;
+            
             copy_size = sizeof ( JackMidiBuffer ) + fPortBuffer[port_index]->event_count * sizeof ( JackMidiEvent );
             memcpy ( fBuffer + pos, fPortBuffer[port_index], copy_size );
             pos += copy_size;
             memcpy ( fBuffer + pos, fPortBuffer[port_index] + ( fPortBuffer[port_index]->buffer_size - fPortBuffer[port_index]->write_pos ),
                      fPortBuffer[port_index]->write_pos );
             pos += fPortBuffer[port_index]->write_pos;
+            
+            JackMidiBuffer* midi_buffer = reinterpret_cast<JackMidiBuffer*>(write_pos);
+            MidiBufferHToN(midi_buffer, midi_buffer);
         }
         return pos;
     }
@@ -92,6 +97,9 @@ namespace Jack
         int copy_size;
         for ( int port_index = 0; port_index < fNPorts; port_index++ )
         {
+            JackMidiBuffer* midi_buffer = reinterpret_cast<JackMidiBuffer*>(fBuffer + pos);
+            MidiBufferNToH(midi_buffer, midi_buffer);
+            
             copy_size = sizeof ( JackMidiBuffer ) + reinterpret_cast<JackMidiBuffer*> ( fBuffer + pos )->event_count * sizeof ( JackMidiEvent );
             memcpy ( fPortBuffer[port_index], fBuffer + pos, copy_size );
             pos += copy_size;
@@ -101,7 +109,7 @@ namespace Jack
         }
         return pos;
     }
-
+    
     int NetMidiBuffer::RenderFromNetwork ( int subcycle, size_t copy_size )
     {
         memcpy ( fBuffer + subcycle * fMaxPcktSize, fNetBuffer, copy_size );
@@ -116,6 +124,7 @@ namespace Jack
         return copy_size;
     }
 
+
 // net audio buffer *********************************************************************************
 
     NetAudioBuffer::NetAudioBuffer ( session_params_t* params, uint32_t nports, char* net_buffer )
@@ -150,7 +159,7 @@ namespace Jack
         return fPortBuffer[index];
     }
 
-#ifdef BIG_ENDIAN
+#ifdef __BIG_ENDIAN__
 
     static inline float SwapFloat(float f)
     {
@@ -367,6 +376,28 @@ namespace Jack
         jack_info ( "Bitdepth : %s", bitdepth );
         jack_info ( "**********************************************" );
     }
+    
+    SERVER_EXPORT void MidiBufferHToN ( JackMidiBuffer* src_buffer, JackMidiBuffer* dst_buffer )
+    {
+        dst_buffer->magic = htonl(src_buffer->magic);
+        dst_buffer->buffer_size = htonl(src_buffer->buffer_size);
+        dst_buffer->nframes = htonl(src_buffer->nframes);
+        dst_buffer->write_pos = htonl(src_buffer->write_pos);
+        dst_buffer->event_count = htonl(src_buffer->event_count);
+        dst_buffer->lost_events = htonl(src_buffer->lost_events);
+        dst_buffer->mix_index = htonl(src_buffer->mix_index);
+    }
+    
+    SERVER_EXPORT void MidiBufferNToH ( JackMidiBuffer* src_buffer, JackMidiBuffer* dst_buffer )
+    {
+        dst_buffer->magic = ntohl(src_buffer->magic);
+        dst_buffer->buffer_size = ntohl(src_buffer->buffer_size);
+        dst_buffer->nframes = ntohl(src_buffer->nframes);
+        dst_buffer->write_pos = ntohl(src_buffer->write_pos);
+        dst_buffer->event_count = ntohl(src_buffer->event_count);
+        dst_buffer->lost_events = ntohl(src_buffer->lost_events);
+        dst_buffer->mix_index = ntohl(src_buffer->mix_index);
+    }
 
 // Utility *******************************************************************************************************
 
diff --git a/common/JackNetTool.h b/common/JackNetTool.h
index cc978036..a55e3c3b 100644
--- a/common/JackNetTool.h
+++ b/common/JackNetTool.h
@@ -276,6 +276,8 @@ namespace Jack
     SERVER_EXPORT void SessionParamsNToH ( session_params_t* src_params, session_params_t* dst_params );
     SERVER_EXPORT void PacketHeaderHToN ( packet_header_t* src_header, packet_header_t* dst_header );
     SERVER_EXPORT void PacketHeaderNToH ( packet_header_t* src_header, packet_header_t* dst_header );
+    SERVER_EXPORT void MidiBufferHToN ( JackMidiBuffer* src_buffer, JackMidiBuffer* dst_buffer );
+    SERVER_EXPORT void MidiBufferNToH ( JackMidiBuffer* src_buffer, JackMidiBuffer* dst_buffer );
     //display session parameters
     SERVER_EXPORT void SessionParamsDisplay ( session_params_t* params );
     //display packet header