Removed MULTI construction site remarks

libisoburn/trunk/libisoburn/burn_wrap.c

@@ -1076,8 +1076,7 @@ int isoburn_emulate_toc(struct burn_drive *d, int flag)
      read_flag|= (1<<15)|((session_count>0)<<14);
    else {
 
-     /* MULTI :
+     /* growisofs aligns to 16 rather than 32. Overwriteable TOC emulation
-        growisofs aligns to 16 rather than 32. Overwriteable TOC emulation
         relies on not accidentially seeing inter-session trash data.
         But one can safely access 16 blocks earlier because a xorriso header
         would have overwritten with the unused 16 blocks at its start.
@@ -1129,8 +1128,7 @@ int isoburn_emulate_toc(struct burn_drive *d, int flag)
    item->track_blocks= track_blocks;
    lba+= track_blocks;
 
-   /* MULTI : growisofs aligns to 16 rather than 32 */;
+   /* growisofs aligns to 16 rather than 32 */
-
    growisofs_nwa= lba;
    if(growisofs_nwa % 16)
      growisofs_nwa+= 16 - (growisofs_nwa % 16);
@@ -1525,9 +1523,7 @@ not_found:;
  } else if(adr_mode==3) {
    o->fabricated_msc1= adr_num;
    if((flag & 1) && o->fabricated_msc1 >= 16) {
-
+     /* adr_num is possibly 16 blocks too high */
-     /* MULTI : adr_num is possibly 16 blocks too high */;
-
      ret= isoburn_read_iso_head(d, o->fabricated_msc1, &size,volid, 1|(1<<14));
      if(ret==2)
        o->fabricated_msc1-= 16;

libisoburn/trunk/xorriso/xorriso.c

@@ -7284,16 +7284,6 @@ no_volunteer:;
      if(ret<=0)
        goto ex;
    } else if(strcmp(argv[i], "--grow_overwriteable_iso")==0) {
-  
-/* MULTI : allow --grow_overwriteable_iso */
-/*
-     sprintf(xorriso->info_text,
-             "-as %s: Option --grow_overwriteable_iso not supported.",
-             whom);
-     Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
-     ret= 0; goto ex;
-*/
-
      do_grow= 1;
    } else if(strcmp(argv[i], "-help")==0) {
      do_help= 1;
@@ -7302,23 +7292,8 @@ no_volunteer:;
    } else if(strcmp(argv[i], "-inq")==0) {
      do_checkdrive= 2;
    } else if(strcmp(argv[i], "-msinfo")==0) {
-
-/* MULTI : allow -msinfo */
-/*
-     sprintf(xorriso->info_text, "-as %s: Option -msinfo not supported.",whom);
-     Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
-     ret= 0; goto ex;
-*/
      do_msinfo= 1;
    } else if(strcmp(argv[i], "-multi")==0) {
-
-/* MULTI : allow -multi */
-/*
-     sprintf(xorriso->info_text, "-as %s: Option -multi not supported.", whom);
-     Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
-     ret= 0; goto ex;
-*/
-
      do_multi= 1;
    } else if(strcmp(argv[i], "-nopad")==0) {
      xorriso->padding= 0;
@@ -7346,9 +7321,6 @@ no_volunteer:;
      do_toc= 1;
    } else if(strncmp(argv[i], "-tsize=", 7)==0 ||
              strncmp(argv[i], "tsize=", 6)==0) {
-
-/* MULTI : tsize= */
-
      cpt= strchr(argv[i], '=')+1;
      tsize= Scanf_io_size(cpt, 1);
      if(tsize > 1024.0*1024.0*1024.0*1024.0*1024.0) {
@@ -7367,9 +7339,6 @@ no_volunteer:;
    } else if(strcmp(argv[i], "-waiti")==0) {
      do_waiti= 1;
    } else if(strncmp(argv[i], "write_start_address=", 20)==0) {
-
-/* MULTI : allow write_start_address= */
-
      write_start_address= Scanf_io_size(argv[i]+20,0);
    } else if(argv[i][0]=='-' && argv[i][1]!=0) {
      sprintf(xorriso->info_text, "-as %s: Unknown option %s",
@@ -7414,11 +7383,6 @@ no_volunteer:;
    sprintf(xorriso->info_text, "xorriso: Option -waiti pausing is done.\n");
  }
  if(dev_adr[0]) {
-
-   /* MULTI :
-      if grow_overwriteable_iso :
-        consider overwriteables with ISO as appendable */
-
    hflag= 2|32;
    if(!do_grow)
      hflag|= 8; /* consider overwriteables as blank */
@@ -7459,8 +7423,6 @@ no_volunteer:;
    ret= 0; goto ex;
  }
 
- /* MULTI : perform -msinfo */
-
  if(do_msinfo) {
    ret= Xorriso_msinfo(xorriso, &msc1, &msc2, 2 | !!do_grow);
    if(ret<=0)
@@ -7510,9 +7472,6 @@ no_volunteer:;
      goto ex;
  }
  if(track_source[0]) {
-
-/* MULTI : do not close if -multi */
-
    xorriso->do_close= !do_multi;
    ret= Xorriso_burn_track(xorriso, (off_t) write_start_address,
                            track_source, (off_t) tsize,
@@ -7675,8 +7634,6 @@ int Xorriso_genisofs(struct XorrisO *xorriso, char *whom,
      return(ret);
  }
 
-/* MULTI : */
-
  if(msc[0]) {
    cpt= strchr(msc, ',');
    if(cpt==NULL) {

libisoburn/trunk/xorriso/xorriso_timestamp.h

@@ -1 +1 @@
-#define Xorriso_timestamP "2008.07.17.183024"
+#define Xorriso_timestamP "2008.07.17.184520"

libisoburn/trunk/xorriso/xorrisoburn.c

@@ -6040,34 +6040,17 @@ int Xorriso_burn_track(struct XorrisO *xorriso, off_t write_start_address,
  burn_session_add_track(session, track, BURN_POS_END);
  burn_source_free(data_src);
 
- /* MULTI :
-        if grow_overwriteable_iso:
-          consider overwriteables with ISO as appendable
- */
  if(flag&1)
-   disc_state = isoburn_disc_get_status(drive);
+   /* consider overwriteables with ISO as appendable */
+   disc_state= isoburn_disc_get_status(drive);
  else
-   disc_state = burn_disc_get_status(drive);
+   /* handle overwriteables as always blank */
- if(disc_state == BURN_DISC_BLANK) {
+   disc_state= burn_disc_get_status(drive);
-   /* ok */;
- } else if(disc_state == BURN_DISC_APPENDABLE) {
- 
-/* MULTI : allow appendable media */
-   /* ok */;
-/* 
-   if(!isoburn_needs_emulation(drive)) {
-     sprintf(xorriso->info_text,
-             "Appendable media with data detected. Need blank media.");
-     Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
-     ret= 0; goto ex;
-   }
-*/
 
+ if(disc_state == BURN_DISC_BLANK || disc_state == BURN_DISC_APPENDABLE) {
+   /* ok */;
  } else {
    if(disc_state == BURN_DISC_FULL) {
- 
-/* MULTI */
-   
      sprintf(xorriso->info_text,
           "Closed media with data detected. Need blank or appendable media.");
      Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
@@ -6088,14 +6071,10 @@ int Xorriso_burn_track(struct XorrisO *xorriso, off_t write_start_address,
  if(isoburn_needs_emulation(drive))
    burn_write_opts_set_multi(burn_options, 0);
 
- /* MULTI : tsize */
  if(tsize > 0) {
    fixed_size= tsize;
    burn_track_set_size(track, fixed_size);
  }
-
- /* MULTI : if -isosize :
- */
  if(do_isosize) {
    ret= burn_fifo_peek_data(xorriso->pacifier_fifo, head_buffer, 64*1024, 0);
    if(ret<=0) {
@@ -6105,7 +6084,6 @@ int Xorriso_burn_track(struct XorrisO *xorriso, off_t write_start_address,
      Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
      ret= 0; goto ex;
    }
-
    /* read isosize from head_buffer, not from media*/
    ret= isoburn_read_iso_head(drive, 0, &isosize, head_buffer, (1<<13));
    if(ret<=0) {
@@ -6124,9 +6102,6 @@ int Xorriso_burn_track(struct XorrisO *xorriso, off_t write_start_address,
  ret= Xorriso_get_profile(xorriso, &profile_number, profile_name, 2);
  is_cd= (ret==2);
 
- /* MULTI :
-    consider overwriteables as blank if not grow_overwriteable_iso */
-
  if(isoburn_needs_emulation(drive)) {
    if(flag&1) {
      ret= isoburn_disc_track_lba_nwa(drive, burn_options, 0, &dummy, &nwa);
@@ -6146,7 +6121,6 @@ int Xorriso_burn_track(struct XorrisO *xorriso, off_t write_start_address,
    }
  }
 
- /* MULTI : */
  if(write_start_address>=0) {
    nwa= write_start_address / (off_t) 2048;
    if(((off_t) nwa) * (off_t) 2048 < write_start_address )
@@ -6182,8 +6156,7 @@ int Xorriso_burn_track(struct XorrisO *xorriso, off_t write_start_address,
    ret= 0; goto ex;
  }
 
- /*  MULTI : */
+ /* Update ISO header at lba 0 */
- /* update ISO header at lba 0 */
  if((flag&1) && nwa >= 32) {
    if(!do_isosize) {
      /* head_buffer was not filled yet. Read it from output media. */
@@ -6523,7 +6496,6 @@ int Xorriso_libburn_adr(struct XorrisO *xorriso, char *path, char adr[],
 }
 
 
-/* MULTI : */
 /* @param flag bit0= grow_overwriteable_iso
                bit1= obtain info from outdev
 */
@@ -6538,10 +6510,7 @@ int Xorriso_msinfo(struct XorrisO *xorriso, int *msc1, int *msc2, int flag)
                                 "on attempt to obtain msinfo", flag&2);
  if(ret<=0)
    return(ret);
- /* MULTI: 
+
-        if grow_overwriteable_iso :
-          inquire by isoburn_disc_get_status()
- */;
  if(flag&1)
    disc_state= isoburn_disc_get_status(drive);
  else