From bbb664dd6b60db00f1c555f986c3538a1b7df603 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 16 Jul 2008 14:00:01 +0000 Subject: [PATCH] Recognizing "b" as speed factor for BD media --- libisoburn/trunk/xorriso/xorriso.1 | 8 +++++--- libisoburn/trunk/xorriso/xorriso.c | 13 ++++++++++--- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/libisoburn/trunk/xorriso/xorriso.1 b/libisoburn/trunk/xorriso/xorriso.1 index f85b3963..e9fcd0e2 100644 --- a/libisoburn/trunk/xorriso/xorriso.1 +++ b/libisoburn/trunk/xorriso/xorriso.1 @@ -2,7 +2,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH XORRISO 1 "Jul, 15, 2008" +.TH XORRISO 1 "Jul, 16, 2008" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -1228,12 +1228,14 @@ User id to be used for all files when the new ISO tree gets written to media. \fB\-gid\fR gid Group id to be used for all files when the new ISO tree gets written to media. .TP -\fB\-speed\fR number[k|m|c|d] +\fB\-speed\fR number[k|m|c|d|b] Set the burn speed. Default is 0 = maximum speed. Speed can be given in media dependent numbers or as a desired throughput per second in MMC compliant kB (= 1000) or MB (= 1000 kB). Media x-speed factor can be set explicity -by "c" for CD and "d" for DVD. Example speeds: +by "c" for CD, "d" for DVD, "b" for BD, "x" is optional. +.br +Example speeds: .br 706k = 706kB/s = 4c = 4xCD .br diff --git a/libisoburn/trunk/xorriso/xorriso.c b/libisoburn/trunk/xorriso/xorriso.c index 79e9ddc3..48bbe5b7 100644 --- a/libisoburn/trunk/xorriso/xorriso.c +++ b/libisoburn/trunk/xorriso/xorriso.c @@ -10112,7 +10112,7 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag) " Append extra bytes to image stream. (Default is 300k)", " -dummy \"on\"|\"off\"", " If \"on\" simulate burning. Refuse if media cannot simulate.", -" -speed number[\"k\"|\"m\"|\"[x]CD\"|\"[x]DVD\"]", +" -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\"", " Try to circumvent slow checkread on DVD-RAM and BD-RE.", @@ -11782,17 +11782,24 @@ int Xorriso_option_speed(struct XorrisO *xorriso, char *speed, int flag) } else if(*cpt=='x' || *cpt=='X') cpt++; - if(*cpt=='c' || *cpt=='C') { + if (unit_found) { + ; + } else if(*cpt=='c' || *cpt=='C') { cd_speed:; num*= 176.4; } else if(*cpt=='d' || *cpt=='D') { dvd_speed:; num*= 1385; - } else if (!unit_found) { + } else if(*cpt=='b' || *cpt=='B') { +bd_speed:; + num*= 4495.625; + } else { ret= Xorriso_get_profile(xorriso, &profile_number, profile_name, 2); is_cd= (ret==2); if(is_cd) goto cd_speed; + else if (profile_name[0]=='B' && profile_name[1]=='D') + goto bd_speed; else goto dvd_speed; } diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 7d3e2759..71368558 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2008.07.16.131110" +#define Xorriso_timestamP "2008.07.16.140043"