Changeset - 90fbdc8cb5f5
[Not reviewed]
default
0 1 0
LordOfWar - 16 years ago 2009-10-25 15:40:25

added new frame finder to user interface
1 file changed with 17 insertions and 1 deletions:
0 comments (0 inline, 0 general)
src/server/distrend.c
Show inline comments
 
@@ -872,18 +872,23 @@ int updateJobListXML(struct distrenjob *
 
  // create root element job_list
 
  xmlTextWriterStartElement(writer, (xmlChar*)"job_list");
 

	
 
  _distren_asprintf(&tmp, "%d", general_info.timestamp);
 
  xmlTextWriterWriteAttribute(writer, (xmlChar*)"timestamp", (xmlChar*)tmp);
 

	
 
  general_info.total_priority_pieces = 0;
 
  counter = 0;
 
  for(job = head->next; job; job = job->next)
 
    {
 
      _distren_asprintf(&tmp, "jobnum%d", counter);
 
      _distren_asprintf(&tmp2, "%d", job->jobnum);
 
      xmlTextWriterWriteElement(writer, (xmlChar*)tmp, (xmlChar*)tmp2);
 

	
 
      // this is needed for the new frame finder to work
 
      general_info.total_priority_pieces = general_info.total_priority_pieces + (11 - job->priority);
 

	
 
      counter++;
 
    }
 

	
 
  // close elements and end document
 
  xmlTextWriterEndDocument(writer);
 

	
 
@@ -1122,12 +1127,13 @@ int main(int argc, char *argv[])
 
  distrend_do_config(argc, argv, &config);
 

	
 
  //start_data(&head); // Starts fresh or loads data from xml dump. Should we grab the return?
 

	
 
  // pre-loaded jobs for testing
 
  prepare_distrenjob(&head, 1, "awesome", "LordOfWar", "onlylordofwar@gmail.com", 4, 1, 100, 640, 480);
 
  prepare_distrenjob(&head, 1, "hamburger", "Ohnobinki", "ohnobinki@ohnopublishing.net", 3, 1, 50, 1280, 720);
 

	
 
  while(test == 1)
 
  {
 
    fprintf(stderr, "Welcome to DistRen Alpha Interactive Test Mode\n\n");
 
    fprintf(stderr, "\t1 \tPrint all frames in a job\n");
 
    fprintf(stderr, "\t2 \tExamine certain job\n");
 
@@ -1149,13 +1155,23 @@ int main(int argc, char *argv[])
 
    case 2:
 
      fprintf(stderr, "Job number: ");
 
      scanf("%d", &jobnum);
 
      printJobInfo(distrenjob_get(&head, jobnum));
 
      break;
 
    case 3:
 
      if(!find_jobframe(&head, &tmp_job, &tmp_frame))
 
      fprintf(stderr, "\nPut the number of a non existing job to get a new frame\nJob number: ");
 
      scanf("%d", &jobnum);
 
      fprintf(stderr, "\nRender Power: ");
 
      scanf("%d", &priority);
 
      fprintf(stderr, "\n1->new user (Render Power has not been added to general_info)\n2->returning user\ninput:");
 
      scanf("%d", &start_frame);
 

	
 
      if(start_frame == 1)
 
    	  general_info.total_render_power = general_info.total_render_power + priority;
 

	
 
      if(!find_jobframe_again(&head, jobnum, priority, &tmp_job, &tmp_frame))
 
      {
 
    	  fprintf(stderr, "frame was found, details below\n");
 
          fprintf(stderr, "Job#:%d\n", tmp_job->jobnum);
 
          fprintf(stderr, "Frame#:%d\n", tmp_frame->num);
 
      }
 

	
0 comments (0 inline, 0 general)