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

Fixed so window gets refreshed if a demo connects

Browse Source
This commit is contained in:
Daniel Collin 2012-10-29 19:52:52 +01:00
parent ae0d7af221
commit 19d5d04b5f
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ogl_editor/src/Editor.c
View File

@ -293,11 +293,12 @@ bool Editor_keyDown(int key, int modifiers)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
static void processCommands() static int processCommands()
{ {
//SyncDocument *doc = trackView->getDocument(); //SyncDocument *doc = trackView->getDocument();
int strLen, newRow, serverIndex; int strLen, newRow, serverIndex;
unsigned char cmd = 0; unsigned char cmd = 0;
int ret = 0;
if (RemoteConnection_recv((char*)&cmd, 1, 0)) if (RemoteConnection_recv((char*)&cmd, 1, 0))
{ {
@ -313,10 +314,10 @@ static void processCommands()
strLen = ntohl(strLen); strLen = ntohl(strLen);
if (!RemoteConnection_connected()) if (!RemoteConnection_connected())
return; return 0;
if (!RemoteConnection_recv(trackName, strLen, 0)) if (!RemoteConnection_recv(trackName, strLen, 0))
return; return 0;
rlog(R_INFO, "Got trackname %s (%d) from demo\n", trackName, strLen); rlog(R_INFO, "Got trackname %s (%d) from demo\n", trackName, strLen);
@ -327,6 +328,7 @@ static void processCommands()
// setup remap and send the keyframes to the demo // setup remap and send the keyframes to the demo
RemoteConnection_mapTrackName(trackName); RemoteConnection_mapTrackName(trackName);
RemoteConnection_sendKeyFrames(trackName, s_editorData.trackData.syncData.tracks[serverIndex]); RemoteConnection_sendKeyFrames(trackName, s_editorData.trackData.syncData.tracks[serverIndex]);
ret = 1;
break; break;
} }
@ -335,22 +337,27 @@ static void processCommands()
{ {
RemoteConnection_recv((char*)&newRow, sizeof(int), 0); RemoteConnection_recv((char*)&newRow, sizeof(int), 0);
s_editorData.trackViewInfo.rowPos = htonl(newRow); s_editorData.trackViewInfo.rowPos = htonl(newRow);
ret = 1;
break; break;
} }
} }
} }
return ret;
} }
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void Editor_timedUpdate() void Editor_timedUpdate()
{ {
int processed_commands = 0;
RemoteConnection_updateListner(); RemoteConnection_updateListner();
while (RemoteConnection_pollRead()) while (RemoteConnection_pollRead())
processCommands(); processed_commands |= processCommands();
if (!RemoteConnection_isPaused()) if (!RemoteConnection_isPaused() || processed_commands)
{ {
Editor_update(); Editor_update();
} }