diff --git a/src/server/slavefuncs.c b/src/server/slavefuncs.c --- a/src/server/slavefuncs.c +++ b/src/server/slavefuncs.c @@ -896,7 +896,7 @@ int sendExtSignal(struct remoteio *rem, void finishframe(struct remoteio *rem, int jobnum, int framenum){ char* data; _distren_asprintf(&data, "%d%d", jobnum, framenum); - sendExtSignal(rem, DISTREN_REQUEST_DONEFRAME, data); + sendExtSignal(rem, DISTREN_REQUEST_STATUS, data); } /** resets frame to unassigned on server */ @@ -904,7 +904,7 @@ void resetframe(struct remoteio *rem, in fprintf(stderr,"Resetting frame %d in job %d on server... ",framenum,jobnum); char* data; _distren_asprintf(&data, "%d%d", jobnum, framenum); - sendExtSignal(rem, DISTREN_REQUEST_RESETFRAME, data); + sendExtSignal(rem, DISTREN_REQUEST_STATUS, data); } @@ -914,7 +914,7 @@ void startframe(struct remoteio *rem, in fprintf(stderr,"Marking frame %d started on server... ",framenum); char* data; _distren_asprintf(&data, "%d%d", jobnum, framenum); - sendExtSignal(rem, DISTREN_REQUEST_RENDERFRAME, data); + sendExtSignal(rem, DISTREN_REQUEST_STATUS, data); } @@ -950,27 +950,30 @@ int getwork(struct remoteio *rem, int *j //distren_request_new(&req, - sendExtSignal(rem, DISTREN_REQUEST_GETWORK, data); + sendExtSignal(rem, DISTREN_REQUEST_STATUS, data); return 0; } /** sets render power of slave on server */ -void setrenderpower(struct remoteio *rem, int renderpower){ +void setrenderpower(struct remoteio *rem, int renderpower) +{ fprintf(stderr,"Setting render power on server... "); char* data; _distren_asprintf(&data, "%d", renderpower); - sendExtSignal(rem,DISTREN_REQUEST_SETRENDERPOWER, data); + /* sendExtSignal(rem,DISTREN_REQUEST_SETRENDERPOWER, data); */ } /** retrieves render power of slave from server */ -int getrenderpower(struct remoteio *rem){ - sendSignal(rem, DISTREN_REQUEST_GETRENDERPOWER); +int getrenderpower(struct remoteio *rem) +{ + /* sendSignal(rem, DISTREN_REQUEST_GETRENDERPOWER);*/ return 0; } /** compares slave software version with server software version */ -int checkslaveversion(struct remoteio *rem){ - sendSignal(rem, DISTREN_REQUEST_GETVERSION); +int checkslaveversion(struct remoteio *rem) +{ + sendSignal(rem, DISTREN_REQUEST_VERSION); char* serverVersionFromRemotio = "9000"; if(!strcmp(PACKAGE_VERSION, serverVersionFromRemotio)) // compare versions return 1;