diff --git a/src/server/distrend.c b/src/server/distrend.c --- a/src/server/distrend.c +++ b/src/server/distrend.c @@ -52,6 +52,8 @@ #include "execio.h" #include "options.h" +#include "blendjob.h" + #include #include #include @@ -62,7 +64,6 @@ -typedef unsigned int jobnum_t; /* ******************* Structs ************************ */ @@ -96,34 +97,6 @@ struct general_info { unsigned int total_frames_rendered; // } general_info; -// Stores Blender Job Info -struct blendjob { - struct blendjob *next; /* next will be NULL unless if there is another blendjob */ - char *name; - char *submitter; - char *email; - jobnum_t jobnum; - int priority; // 1 is lowest, 10 is highest, 0 means the job is done - int percent_done; - int completed_frames; // number of completed frames for stats/etc - int assigned_frames; // number of assigned frames (that are not yet completed) for stats/etc - int total_frames; // how many frames are in the animation for stats/etc (unassigned frames) - int avg_render_time; // average seconds it took to render a frame - unsigned int time_remaining; // estimated seconds remaining till render is complete (up to 49, 710 days) - // we can have the client computer convert it into days, hours, etc if they wish to view it - struct frameset *frameset; -}; - - -// Frameset Structure -struct frameset { - int num; // frame number to render - char slave_name; // user that frame is assigned to - int status; // status of frame, 0= unassigned, 1= taken, 2= done - clock_t start_time; // time the frame was started - int time_to_render; // the total seconds it took to render the frame -}; // Frameset array is generated by status_report_generator function - // Using this method to save memory, because if animation starts on a high frame number, it would waste a lot of RAM on empty structures /*