diff --git a/src/server/distrenjob.h b/src/server/distrenjob.h --- a/src/server/distrenjob.h +++ b/src/server/distrenjob.h @@ -45,6 +45,7 @@ struct distrenjob { int total_frames; // how many frames are in the animation for stats/etc (unassigned frames) time_t avg_render_time; // average seconds it took to render a frame time_t time_remaining; /*< estimated seconds remaining till render is complete (up to 49, 710 days) */ + char *output_format; /*< currently is the file extention of the request output format. @todo make this mime-type based/not a string */ struct frameset *frameset; }; diff --git a/src/server/slave.c b/src/server/slave.c --- a/src/server/slave.c +++ b/src/server/slave.c @@ -23,6 +23,7 @@ #include "options.h" // Confuse, etc. #include "slavefuncs.h" // Slave functions #include "asprintf.h" +#include "remoteio.h" #include #include @@ -192,11 +193,11 @@ if(gotframe ==1) } /* Variable-fillers which require XML */ - outputExt = myjob.outputFormat; /* @TODO: FIXME! */ + outputExt = myjob->output_format; /* @TODO: FIXME! */ _distren_asprintf(&pathtoOutput, "%s/job%d/output/frame%d.%s", datadir, jobnum, framenum, outputExt ); // Prepares the path to the jobfile - exec_blender(&myjob, pathtoJobfile, pathtoOutput, framenum); // @TODO: This warning should be fixed :D + exec_blender(myjob, pathtoJobfile, pathtoOutput, framenum); // @TODO: This warning should be fixed :D // Consider placing the following in the exec_blender() function while(busy == 1){