libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed new API call burn_get_media_product_id() to burn_disc_get_media_id()

Browse Source
This commit is contained in:
Thomas Schmitt 2009-09-06 09:25:52 +00:00
parent 6e7bb73d03
commit 84ccf158e7
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libburn/trunk/cdrskin/cdrskin.c
View File

@ -5030,7 +5030,7 @@ int Cdrskin_atip(struct CdrskiN *skin, int flag)
#ifdef Cdrskin_libburn_has_product_iD #ifdef Cdrskin_libburn_has_product_iD
ret= burn_get_media_product_id(drive, &product_id, &media_code1, &media_code2, ret= burn_disc_get_media_id(drive, &product_id, &media_code1, &media_code2,
&book_type, 0); &book_type, 0);
if(ret > 0 && (!current_is_cd) && if(ret > 0 && (!current_is_cd) &&
manuf == NULL && media_code1 != NULL && media_code2 != 0) { manuf == NULL && media_code1 != NULL && media_code2 != 0) {
@ -5057,7 +5057,7 @@ int Cdrskin_atip(struct CdrskiN *skin, int flag)
product_id= media_code1= media_code2= book_type= NULL; product_id= media_code1= media_code2= book_type= NULL;
#ifdef Cdrskin_libburn_has_product_iD #ifdef Cdrskin_libburn_has_product_iD
ret= burn_get_media_product_id(drive, &product_id, &media_code1, ret= burn_disc_get_media_id(drive, &product_id, &media_code1,
&media_code2, &book_type, 1); &media_code2, &book_type, 1);
#else #else
ret= 0; ret= 0;

2
libburn/trunk/cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2009.09.06.092330" #define Cdrskin_timestamP "2009.09.06.092654"

5
libburn/trunk/libburn/drive.c
View File

@ -2627,7 +2627,7 @@ int burn_get_read_capacity(struct burn_drive *d, int *capacity, int flag)
/* ts A90903 : API */ /* ts A90903 : API */
int burn_get_media_product_id(struct burn_drive *d, int burn_disc_get_media_id(struct burn_drive *d,
char **product_id, char **media_code1, char **media_code2, char **product_id, char **media_code1, char **media_code2,
char **book_type, int flag) char **book_type, int flag)
{ {
@ -2637,7 +2637,8 @@ int burn_get_media_product_id(struct burn_drive *d,
if (burn_drive_get_drive_role(d) != 1) if (burn_drive_get_drive_role(d) != 1)
return 0; return 0;
ret = mmc_get_media_product_id(d, ret = mmc_get_media_product_id(d,
product_id, media_code1, media_code2, book_type, 0); product_id, media_code1, media_code2, book_type,
flag & 1);
return ret; return ret;
} }

9
libburn/trunk/libburn/libburn.h
View File

@ -1258,12 +1258,15 @@ int burn_disc_get_profile(struct burn_drive *d, int *pno, char name[80]);
text "XXmYYsZZf" from CD ATIP lead-out. text "XXmYYsZZf" from CD ATIP lead-out.
@param book_type Book type text for DVD and BD. @param book_type Book type text for DVD and BD.
Caution: is NULL with CD, even if return value says ok. Caution: is NULL with CD, even if return value says ok.
@param flag Bitfield for control purposes, submit 0 @param flag Bitfield for control purposes
bit0= do not escape " _/" (not suitable for
burn_guess_manufacturer())
@return 1= ok, product_id and media codes are valid, @return 1= ok, product_id and media codes are valid,
0= no product id_available, reply parameters are NULL 0= no product id_available, reply parameters are NULL
<0= error <0= error
@since 0.7.2
*/ */
int burn_get_media_product_id(struct burn_drive *d, int burn_disc_get_media_id(struct burn_drive *d,
char **product_id, char **media_code1, char **media_code2, char **product_id, char **media_code1, char **media_code2,
char **book_type, int flag); char **book_type, int flag);
@ -1278,6 +1281,8 @@ int burn_get_media_product_id(struct burn_drive *d,
@param media_code Media ID code from media (e.g. "W11") @param media_code Media ID code from media (e.g. "W11")
@param flag Bitfield for control purposes, submit 0 @param flag Bitfield for control purposes, submit 0
@return Printable text or NULL on memory shortage. @return Printable text or NULL on memory shortage.
If the text begins with "Unknown " then no item of the
manufacturer list matched the codes.
Dispose by free() when no longer needed. Dispose by free() when no longer needed.
@since 0.7.2 @since 0.7.2
*/ */