vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sending data loaded from the XML over to the demo now works

Browse Source
This commit is contained in:
Daniel Collin 2012-10-28 17:10:22 +01:00
parent 275dbf68ec
commit b936ced270
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ogl_editor/src/RemoteConnection.c
View File

@ -98,7 +98,7 @@ void RemoteConnection_mapTrackName(const char* name)
{ {
int count = s_nameLookup.count; int count = s_nameLookup.count;
if (findTrack(name)) if (findTrack(name) != -1)
return; return;
s_nameLookup.hashes[count] = quickHash(name); s_nameLookup.hashes[count] = quickHash(name);
@ -204,8 +204,6 @@ void RemoteConnection_updateListner()
if (RemoteConnection_connected()) if (RemoteConnection_connected())
return; return;
rlog(R_INFO, "%d\n", s_socket);
FD_ZERO(&fds); FD_ZERO(&fds);
FD_SET(s_serverSocket, &fds); FD_SET(s_serverSocket, &fds);
@ -303,14 +301,13 @@ static void sendSetKeyCommandIndex(uint32_t index, const struct track_key* key)
{ {
uint32_t track, row; uint32_t track, row;
uint8_t cmd = SET_KEY; uint8_t cmd = SET_KEY;
int track_id;
union { union {
float f; float f;
uint32_t i; uint32_t i;
} v; } v;
track = htonl(track_id); track = htonl(index);
row = htonl(key->row); row = htonl(key->row);
v.f = key->value; v.f = key->value;