diff --git a/src/server/distrend.c b/src/server/distrend.c --- a/src/server/distrend.c +++ b/src/server/distrend.c @@ -117,9 +117,9 @@ struct blendjob { // Frameset Structure struct frameset { - int frame_num; // frame number to render + int num; // frame number to render char slave_name; // user that frame is assigned to - int frame_status; // status of frame, 0= unassigned, 1= taken, 2= done + 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 @@ -155,7 +155,7 @@ void start_data(){ // **** Finish-Setter: Sets a frame to the "completed" status. void finish_frame(struct blendjob *blendjob, int frame){ - blendjob->frameset[frame].frame_status = 2; + blendjob->frameset[frame].status = 2; blendjob->frameset[frame].time_to_render = (clock() - blendjob[jobnum].frameset[frame].start_time); // Consider changin time-to-render to time-for-frame or something? general_info.total_frames_rendered++; // Increase total frames var for stats @@ -217,14 +217,14 @@ void status_report_generator(struct blen while(framecounter < blendjob_ptr->total_frames) /* scans through frames, based on their status it runs a statement(s) */ { - if(blendjob_ptr->frameset[framecounter].frame_status == 2) + if(blendjob_ptr->frameset[framecounter].status == 2) /* If the frame is done */ { finished_frames ++; total_time += blendjob_ptr->frameset[framecounter].time_to_render; } - if(blendjob_ptr->frameset[framecounter].frame_status == 1) + if(blendjob_ptr->frameset[framecounter].status == 1) /* If the frame is assigned */ { pending_frames ++; @@ -286,8 +286,8 @@ void frame_num_struct_builder(struct ble job->jobnum = jobnum_new; for(counter = 0; counter < numframes; counter ++) - /* This builds the array, with the array starting at zero and the frame_num starting at sframe */ - job->frameset[counter].frame_num = counter + startframe; + /* This builds the array, with the array starting at zero and the frameset.num starting at sframe */ + job->frameset[counter].num = counter + startframe; highest_jobnum++; // After it has created the job, it adds one to the highest_jobnum interger } @@ -336,7 +336,7 @@ int frame_finder(struct blendjob *head, for(your_frame = 0; your_frame < blendjob_ptr->total_frames; your_frame ++) - if(blendjob_ptr->frameset[your_frame].frame_status == 0) + if(blendjob_ptr->frameset[your_frame].status == 0) found = 1; if(!found) @@ -354,7 +354,7 @@ int frame_finder(struct blendjob *head, fprintf(stderr, "Missing apostrophe !!!!!!!!!!!!!!\n"); abort(); /* sets the value of the frame to 1, which means its taken !!!!!! MISSSING APOSTROPHE!!!!!!! */ - blendjob_ptr->frameset[your_frame].frame_status++; + blendjob_ptr->frameset[your_frame].status++; blendjob_ptr->frameset[your_frame].start_time = clock(); @@ -384,7 +384,7 @@ void blend_frame_watchdog(struct blendjo If frame is not completed within the number of hours specified by watchdog_forgiveness Then change the frame status to unassigned */ - blendjob_ptr->frameset[counter].frame_status = 0; + blendjob_ptr->frameset[counter].status = 0; } }