diff --git a/src/server/slave.c b/src/server/slave.c --- a/src/server/slave.c +++ b/src/server/slave.c @@ -38,6 +38,10 @@ int slavestatus = 0; // Ugh global vars int main(int argc, char *argv[]) { +int jobnum; +char *jobname; +int framenum; + /* Parses arguments, skips if there are no args */ if(argc>1 && (strcmp("-c", argv[1]) == 0)) @@ -95,10 +99,10 @@ options_init(argc,argv,&my_cfg, myopts, if('slave recieves "start frame#, job#"'){ - fprintf(stderr, "Got frame %d in job %d, preparing to render...",frame,job); + fprintf(stderr, "Got frame %d in job %d, preparing to render...",framenum,jobnum); get('http://distren.protofusion.org/srv/job#.tgz'); exec('tar -xvf job#.tgz /tmp/distren/job#'); // somehow - exec_blender(jobname.blendfile, jobnum.framenum.JPG, jobnum); // (check the args, we'll need to adjust for different output formats, include this in the blendjob struct later) + exec_blender("jobname.blendfile, jobnum.framenum.JPG, jobnum"); // (check the args, we'll need to adjust for different output formats, include this in the blendjob struct later) while('blender is running'){ slavestatus=1; // really quite pointless now, but why not. Could be nice for logging. tell_the_server(DISTREN_REQUEST_PROGRESS); diff --git a/src/server/slavefuncs.c b/src/server/slavefuncs.c --- a/src/server/slavefuncs.c +++ b/src/server/slavefuncs.c @@ -113,7 +113,7 @@ void exec_blender(struct blendjob* blend int ret; char *cmd[] = { "blender", "-b", "-o", output, input, "-f", frame_str, (char *)0 }; ret = execv("/usr/bin/blender", cmd); // This path will be absolute for testing, should be relative to install on production - finish_frame(blendjob, frame); + finish_frame(blendjob, frame); // Is this going to be client-side or server-side? } /* Update me when the time comes: