diff --git a/src/server/slavefuncs.h b/src/server/slavefuncs.h --- a/src/server/slavefuncs.h +++ b/src/server/slavefuncs.h @@ -30,6 +30,7 @@ struct msg; +void stringToUpper(char *string); int sendSignal(struct remoteio *rem, char signal); int sendExtSignal(struct remoteio *rem, char signal, char *data); xmlNodePtr xml_quickxpath(xmlXPathContextPtr xpathctxt, xmlChar *path); @@ -42,7 +43,7 @@ int ssh_keygen(); int register_user(char *username, char *email); int login_user(char *username); int conf_replace(char *conffile, char *wordtoreplace, char *replacewith); -int exec_blender(char *input, char *output, int frame); +int exec_blender(char *input, char *output, char *outputExt, int xres, int yres, int frame); void xmlinit(); void xmlcleanup(); int distren_mkdir_recurse(const char *dirname); @@ -72,7 +73,7 @@ struct _web_memorystruct _web_getrequest void _web_finishframe(int slavekey, char *slavepass, int jobnum, int framenum); void _web_startframe(int slavekey, char *slavepass, int jobnum, int framenum); void _web_resetframe(int slavekey, char *slavepass, int jobnum, int framenum); -int _web_getwork(int slavekey, char *slavepass, int *jobnum, int *framenum); +int _web_getwork(int slavekey, char *slavepass, int *jobnum, int *framenum, int *xres, int *yres, char *outputext); void _web_setrenderpower(int slavekey, char *slavepass, int renderpower); int slaveBenchmark(char *datadir, int *benchmarkTime, int *renderPower);