Replaced several occurences of the word "media" by "medium"
This commit is contained in:
parent
dd453ce26b
commit
fb08d390c4
@ -101,13 +101,13 @@ struct CheckmediajoB {
|
||||
int min_block_size; /* granularity desired by user
|
||||
*/
|
||||
int mode; /* 0= track by track
|
||||
1= single sweep over libisoburn media capacity
|
||||
2= single sweep over libburn media capacity
|
||||
1= single sweep over libisoburn medium capacity
|
||||
2= single sweep over libburn medium capacity
|
||||
*/
|
||||
time_t start_time;
|
||||
int time_limit; /* Number of seconds after which to abort */
|
||||
|
||||
int item_limit; /* Maximum number of media check list items as result */
|
||||
int item_limit; /* Maximum number of medium check list items as result */
|
||||
|
||||
char abort_file_path[SfileadrL];
|
||||
|
||||
|
@ -628,7 +628,7 @@ int Xorriso_give_up_drive(struct XorrisO *xorriso, int flag)
|
||||
do_eject= !!(flag&4);
|
||||
if((flag & 4) && !xorriso->indev_is_exclusive) {
|
||||
sprintf(xorriso->info_text,
|
||||
"Will not eject media in non-exclusively aquired input drive.");
|
||||
"Will not eject medium in non-exclusively aquired input drive.");
|
||||
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
|
||||
do_eject= 0;
|
||||
}
|
||||
@ -660,7 +660,7 @@ int Xorriso_give_up_drive(struct XorrisO *xorriso, int flag)
|
||||
do_eject= !!(flag&4);
|
||||
if((flag & 4) && !xorriso->outdev_is_exclusive) {
|
||||
sprintf(xorriso->info_text,
|
||||
"Will not eject media in non-exclusively aquired drive.");
|
||||
"Will not eject medium in non-exclusively aquired drive.");
|
||||
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
|
||||
do_eject= 0;
|
||||
}
|
||||
@ -1246,7 +1246,7 @@ int Xorriso_toc(struct XorrisO *xorriso, int flag)
|
||||
}
|
||||
if(profile_no == 0x41 && num_sessions >= 300) {
|
||||
sprintf(xorriso->info_text,
|
||||
"Sequential BD-R media now contains %d sessions. It is likely to soon fail writing.",
|
||||
"Sequential BD-R medi/m now contains %d sessions. It is likely to soon fail writing.",
|
||||
num_sessions);
|
||||
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
|
||||
}
|
||||
@ -1906,7 +1906,7 @@ int Xorriso_msinfo(struct XorrisO *xorriso, int *msc1, int *msc2, int flag)
|
||||
Xorriso_process_msg_queues(xorriso,0);
|
||||
if(!(flag & 4)) {
|
||||
sprintf(xorriso->info_text,
|
||||
"%s media is not appendable. Cannot obtain -msinfo.",
|
||||
"%s medium is not appendable. Cannot obtain -msinfo.",
|
||||
(flag&2) ? "Output" : "Input");
|
||||
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
|
||||
}
|
||||
@ -2486,7 +2486,7 @@ int Xorriso_check_media(struct XorrisO *xorriso, struct SpotlisT **spotlist,
|
||||
if(ret<=0)
|
||||
goto ex;
|
||||
|
||||
/* >>> determine media type dependent blocking factor:
|
||||
/* >>> determine medium type dependent blocking factor:
|
||||
32 kB for CD (with 2kB retry) and DVD, 64 kB for BD
|
||||
eventually adjust read_chunk
|
||||
*/;
|
||||
@ -2627,7 +2627,7 @@ int Xorriso_check_media(struct XorrisO *xorriso, struct SpotlisT **spotlist,
|
||||
goto ex;
|
||||
} else if(mode == 2) {
|
||||
libburn_whole_disc:;
|
||||
/* single sweep over libburn media capacity */
|
||||
/* single sweep over libburn medium capacity */
|
||||
ret= burn_get_read_capacity(drive, &blocks, 0);
|
||||
if(ret <= 0) {
|
||||
Xorriso_process_msg_queues(xorriso,0);
|
||||
|
@ -154,7 +154,7 @@ static char blank_help[][80]= {
|
||||
"\tdisk\t\tblank the entire disk",
|
||||
"\tfast\t\tminimally blank the entire disk",
|
||||
"\tminimal\t\tminimally blank the entire disk",
|
||||
"\tas_needed\tblank or format media to make it ready for (re-)use",
|
||||
"\tas_needed\tblank or format medium to make it ready for (re-)use",
|
||||
"\tdeformat\t\tblank a formatted DVD-RW",
|
||||
"\tdeformat_quickest\tminimally blank a formatted DVD-RW to DAO only",
|
||||
"\tformat_overwrite\tformat a DVD-RW to \"Restricted Overwrite\"",
|
||||
|
@ -1807,7 +1807,7 @@ int Xorriso_option_commit(struct XorrisO *xorriso, int flag)
|
||||
}
|
||||
if(!(flag&2)) {
|
||||
ret= Xorriso_reassure(xorriso, "-commit",
|
||||
"write the pending image changes to media", 0);
|
||||
"write the pending image changes to the medium", 0);
|
||||
if(ret<=0)
|
||||
{ret= 2; goto ex;}
|
||||
}
|
||||
|
@ -1485,9 +1485,9 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
|
||||
" -early_stdio_test \"on\"|\"appendable_wo\"|\"off\"",
|
||||
" Classify stdio drives by effective access permissions.",
|
||||
" -blank \"fast\"|\"all\"|\"deformat\"|\"deformat_quickest\"",
|
||||
" Blank media resp. invalidate ISO image on media.",
|
||||
" Blank medium resp. invalidate ISO image on medium.",
|
||||
" -close_damaged \"as_needed\"|\"force\"",
|
||||
" Close track and session of damaged media.",
|
||||
" Close track and session of damaged medium.",
|
||||
" -format \"as_needed\"|\"full\"|\"fast\"|\"by_index_#\"|\"by_size_#\"",
|
||||
" Format BD-RE, BD-R, DVD-RAM, DVD-RW, DVD+RW.",
|
||||
" -volid volume_id",
|
||||
@ -1569,7 +1569,7 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
|
||||
" -print_size Print the foreseeable consumption by next -commit.",
|
||||
"",
|
||||
" -tell_media_space",
|
||||
" Print foreseeable available space on output media",
|
||||
" Print foreseeable available space on output medium",
|
||||
" -pvd_info Print various id strings of the loaded ISO image."
|
||||
"",
|
||||
"Options with variable length path list [...] need the list delimiter text",
|
||||
@ -1765,11 +1765,11 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
|
||||
" Like -commit but rather eject than load image from outdrive.",
|
||||
" Give up any unejected drive afterwards.",
|
||||
" -close \"on\"|\"off\"",
|
||||
" If \"on\" then mark the written media as not appendable.",
|
||||
" If \"on\" then mark the written medium as not appendable.",
|
||||
" -padding number[\"k\"|\"m\"]|\"included\"|\"appended\"",
|
||||
" Append extra bytes to image stream. (Default is 300k)",
|
||||
" -dummy \"on\"|\"off\"",
|
||||
" If \"on\" simulate burning. Refuse if media cannot simulate.",
|
||||
" If \"on\" simulate burning. Refuse if medium cannot simulate.",
|
||||
" -speed number[\"k/s\"|\"m/s\"|\"[x]CD\"|\"[x]DVD\"|\"[x]BD\"]",
|
||||
" Set the burn speed. Default is 0 = maximum speed.",
|
||||
" -stream_recording \"on\"|\"off\"",
|
||||
@ -1782,7 +1782,7 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
|
||||
" -fs number[\"k\"|\"m\"]",
|
||||
" Set the size of the fifo buffer. (Default is 4m)",
|
||||
" -eject \"in\"|\"out\"|\"all\"",
|
||||
" Immediately eject the media in -indev, resp. -outdev,",
|
||||
" Immediately eject the medium in -indev, resp. -outdev,",
|
||||
" resp. both.",
|
||||
"",
|
||||
"Navigation options:",
|
||||
@ -1889,7 +1889,7 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
|
||||
"",
|
||||
"Evaluation of readability:",
|
||||
" -check_media [options] --",
|
||||
" Try to read data blocks from media and report about the",
|
||||
" Try to read data blocks from the medium and report about the",
|
||||
" outcome. Several options modify the behavior:",
|
||||
" use=indev|outdev , what=track|session ,",
|
||||
" min_lba=blockadr , max_lba=blockadr ,",
|
||||
|
@ -1429,7 +1429,7 @@ int Xorriso_option_tell_media_space(struct XorrisO *xorriso, int flag)
|
||||
}
|
||||
if(free_space<0) {
|
||||
sprintf(xorriso->info_text,
|
||||
"Pending image size larger than free space on media");
|
||||
"Pending image size larger than free space on medium");
|
||||
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
|
||||
}
|
||||
sprintf(xorriso->result_line, "Media space : %ds\n", media_space);
|
||||
|
@ -283,7 +283,7 @@ int Xorriso_auto_format(struct XorrisO *xorriso, int flag)
|
||||
ret= burn_disc_get_formats(drive, &status, &size, &dummy, &num_formats);
|
||||
if(ret>0 && status==BURN_FORMAT_IS_UNFORMATTED) {
|
||||
sprintf(xorriso->info_text,
|
||||
"Unformatted %s media detected. Trying -format fast.",
|
||||
"Unformatted %s medium detected. Trying -format fast.",
|
||||
profile_name);
|
||||
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0);
|
||||
ret= Xorriso_format_media(xorriso, (off_t) 0, 1 | 4);
|
||||
@ -1029,7 +1029,7 @@ fprintf(stderr, "XORRISO_DEBUG: isoburn_igopt_set_tail_blocks(%d)\n",
|
||||
burn_track_get_counters(tracks[0],&readcounter,&writecounter);
|
||||
xorriso->session_blocks= (int) (writecounter/ (off_t) 2048);
|
||||
sprintf(xorriso->info_text,
|
||||
"ISO image produced: %d sectors\nWritten to media : %d sectors at LBA %d\n",
|
||||
"ISO image produced: %d sectors\nWritten to medium : %d sectors at LBA %d\n",
|
||||
(int) (readcounter/ (off_t) 2048),
|
||||
xorriso->session_blocks, xorriso->session_lba);
|
||||
Xorriso_info(xorriso, 0);
|
||||
@ -1320,8 +1320,8 @@ int Xorriso_pacifier_loop(struct XorrisO *xorriso, struct burn_drive *drive,
|
||||
/* @param flag bit0= fast
|
||||
bit1= deformat
|
||||
bit2= do not re-aquire drive
|
||||
@return 0=failure, did not touch media , -1=failure, altered media
|
||||
1=success, altered media , 2=success, did not touch media
|
||||
@return 0=failure, did not touch medium , -1=failure, altered medium
|
||||
1=success, altered medium , 2=success, did not touch medium
|
||||
*/
|
||||
int Xorriso_blank_media(struct XorrisO *xorriso, int flag)
|
||||
{
|
||||
@ -1366,7 +1366,7 @@ int Xorriso_blank_media(struct XorrisO *xorriso, int flag)
|
||||
if(disc_state == BURN_DISC_BLANK) {
|
||||
if(!do_deformat) {
|
||||
sprintf(xorriso->info_text,
|
||||
"Blank media detected. Will leave it untouched");
|
||||
"Blank medium detected. Will leave it untouched");
|
||||
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0);
|
||||
return 2;
|
||||
}
|
||||
@ -1388,12 +1388,12 @@ int Xorriso_blank_media(struct XorrisO *xorriso, int flag)
|
||||
}
|
||||
if(xorriso->do_dummy) {
|
||||
sprintf(xorriso->info_text,
|
||||
"-dummy mode prevents blanking of media in mode '%s'.",
|
||||
"-dummy mode prevents blanking of medium in mode '%s'.",
|
||||
mode_names[flag&3]);
|
||||
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0);
|
||||
return(1);
|
||||
}
|
||||
sprintf(xorriso->info_text, "Beginning to blank media in mode '%s'.\n",
|
||||
sprintf(xorriso->info_text, "Beginning to blank medium in mode '%s'.\n",
|
||||
mode_names[flag&3]);
|
||||
Xorriso_info(xorriso,0);
|
||||
|
||||
@ -1445,8 +1445,8 @@ int Xorriso_blank_media(struct XorrisO *xorriso, int flag)
|
||||
bit2= do not re-aquire drive
|
||||
bit7= by_index mode:
|
||||
bit8 to bit15 contain the index of the format to use.
|
||||
@return 0=failure, did not touch media , -1=failure, altered media
|
||||
1=success, altered media , 2=success, did not touch media
|
||||
@return 0=failure, did not touch medium , -1=failure, altered medium
|
||||
1=success, altered medium , 2=success, did not touch medium
|
||||
*/
|
||||
int Xorriso_format_media(struct XorrisO *xorriso, off_t in_size, int flag)
|
||||
{
|
||||
@ -1551,11 +1551,11 @@ int Xorriso_format_media(struct XorrisO *xorriso, off_t in_size, int flag)
|
||||
mode_flag|= 16; /* enable re-formatting */
|
||||
|
||||
if(xorriso->do_dummy) {
|
||||
sprintf(xorriso->info_text, "-dummy mode prevents formatting of media.");
|
||||
sprintf(xorriso->info_text, "-dummy mode prevents formatting of medium.");
|
||||
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0);
|
||||
return(1);
|
||||
}
|
||||
sprintf(xorriso->info_text, "Beginning to format media.\n");
|
||||
sprintf(xorriso->info_text, "Beginning to format medium.\n");
|
||||
Xorriso_info(xorriso, 0);
|
||||
if(flag & 2)
|
||||
size= in_size;
|
||||
@ -1613,8 +1613,8 @@ int Xorriso_format_media(struct XorrisO *xorriso, off_t in_size, int flag)
|
||||
|
||||
|
||||
/* @param flag bit2= formatting rather than blanking
|
||||
@return 0=failure, did not touch media , -1=failure, altered media
|
||||
1=success, altered media , 2=success, did not touch media
|
||||
@return 0=failure, did not touch medium , -1=failure, altered medium
|
||||
1=success, altered medium , 2=success, did not touch medium
|
||||
*/
|
||||
int Xorriso_blank_as_needed(struct XorrisO *xorriso, int flag)
|
||||
{
|
||||
@ -1832,7 +1832,7 @@ 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*/
|
||||
/* read isosize from head_buffer, not from medium */
|
||||
ret= isoburn_read_iso_head(drive, 0, &isosize, head_buffer, (1<<13));
|
||||
if(ret<=0) {
|
||||
Xorriso_process_msg_queues(xorriso,0);
|
||||
|
@ -1 +1 @@
|
||||
#define Xorriso_timestamP "2011.11.02.140829"
|
||||
#define Xorriso_timestamP "2011.11.02.142105"
|
||||
|
@ -76,8 +76,8 @@ int Xorriso_tell_media_space(struct XorrisO *xorriso,
|
||||
int *media_space, int *free_space, int flag);
|
||||
|
||||
/* @param flag bit0=fast , bit1=deformat
|
||||
@return 0=failure, did not touch media , -1=failure, altered media
|
||||
1=success, altered media , 2=success, did not touch media
|
||||
@return 0=failure, did not touch medium , -1=failure, altered medium
|
||||
1=success, altered medium , 2=success, did not touch medium
|
||||
*/
|
||||
int Xorriso_blank_media(struct XorrisO *xorriso, int flag);
|
||||
|
||||
@ -86,8 +86,8 @@ int Xorriso_blank_media(struct XorrisO *xorriso, int flag);
|
||||
bit2= do not re-aquire drive
|
||||
bit7= by_index mode:
|
||||
bit8 to bit15 contain the index of the format to use.
|
||||
@return 0=failure, did not touch media , -1=failure, altered media
|
||||
1=success, altered media , 2=success, did not touch media
|
||||
@return 0=failure, did not touch medium , -1=failure, altered medium
|
||||
1=success, altered medium , 2=success, did not touch medium
|
||||
*/
|
||||
int Xorriso_format_media(struct XorrisO *xorriso, off_t size, int flag);
|
||||
|
||||
@ -105,8 +105,8 @@ int Xorriso_list_speeds(struct XorrisO *xorriso, int flag);
|
||||
int Xorriso_list_profiles(struct XorrisO *xorriso, int flag);
|
||||
|
||||
/* @param flag bit2= formatting rather than blanking
|
||||
@return 0=failure, did not touch media , -1=failure, altered media
|
||||
1=success, altered media , 2=success, did not touch media
|
||||
@return 0=failure, did not touch medium , -1=failure, altered medium
|
||||
1=success, altered medium , 2=success, did not touch medium
|
||||
*/
|
||||
int Xorriso_blank_as_needed(struct XorrisO *xorriso, int flag);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user