Fixed AppleMIDI interaction with remote connection

ravelox · May 18, 2019 · af84b1f · af84b1f
1 parent 644766a
commit af84b1f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/raveloxmidi/include/net_response.h b/raveloxmidi/include/net_response.h
@@ -30,6 +30,6 @@ net_response_t * net_response_create( void );
 void net_response_destroy( net_response_t **response );
 
 net_response_t *net_response_inv( uint32_t ssrc, uint32_t initiator, char *name);
-net_response_t *net_response_sync( uint32_t send_ssrc );
+net_response_t *net_response_sync( uint32_t send_ssrc , long start_time);
 
 #endif
diff --git a/raveloxmidi/src/applemidi_ok.c b/raveloxmidi/src/applemidi_ok.c
@@ -78,7 +78,7 @@ net_response_t * applemidi_ok_responder( char *ip_address, uint16_t port, void *
 			ctx->status = NET_CTX_STATUS_SECOND_INV;
 			break;
 		case NET_CTX_STATUS_SECOND_INV:
-			response = net_response_sync( ctx->send_ssrc );
+			response = net_response_sync( ctx->send_ssrc , ctx->start );
 			net_ctx_send( ctx, response->buffer, response->len, USE_CONTROL_PORT );
 			hex_dump( response->buffer, response->len );
 			net_response_destroy( &response );

diff --git a/raveloxmidi/src/net_applemidi.c b/raveloxmidi/src/net_applemidi.c
@@ -152,7 +152,7 @@ net_applemidi_sync * net_applemidi_sync_create( void )
 
 	if( sync )
 	{
-		memset( sync, 0 , sizeof( net_applemidi_sync ) );
+		memset( sync, 0, sizeof( net_applemidi_sync ) );
 	}
 
 	return sync;

diff --git a/raveloxmidi/src/net_response.c b/raveloxmidi/src/net_response.c
@@ -124,7 +124,7 @@ net_response_t *net_response_inv( uint32_t ssrc, uint32_t initiator, char *name
 	return NULL;
 }
 
-net_response_t *net_response_sync( uint32_t send_ssrc )
+net_response_t *net_response_sync( uint32_t send_ssrc , long start_time )
 {
 	net_applemidi_sync *sync = NULL;
 	net_response_t *response = NULL;
@@ -140,9 +140,9 @@ net_response_t *net_response_sync( uint32_t send_ssrc )
 
 	sync->ssrc = send_ssrc;
 	sync->count = 0;
-	sync->timestamp1 = time(NULL);
-	sync->timestamp2 = 0;
-	sync->timestamp3 = 0;
+	sync->timestamp1 = time_in_microseconds() - start_time;
+	sync->timestamp2 = random_number();
+	sync->timestamp3 = random_number();
 
 	cmd = net_applemidi_cmd_create( NET_APPLEMIDI_CMD_SYNC );
 

diff --git a/raveloxmidi/src/remote_connection.c b/raveloxmidi/src/remote_connection.c
@@ -232,7 +232,7 @@ static void *remote_connect_sync_thread( void *data )
 			logging_printf(LOGGING_DEBUG, "remote_connect_sync_thread: shutdown received during poll\n");
 			break;
 		}
-		response = net_response_sync( ctx->send_ssrc );
+		response = net_response_sync( ctx->send_ssrc , ctx->start );
 		net_ctx_send( ctx, response->buffer, response->len, USE_CONTROL_PORT );
 		hex_dump( response->buffer, response->len );
 		net_response_destroy( &response );