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

Now unconditional: Cdrskin_libburn_has_audioxtR

Browse Source
This commit is contained in:
Thomas Schmitt 2011-10-06 10:43:26 +00:00
parent d90b47fc59
commit bafa02ef96
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,7 +187,7 @@ or
#define Cdrskin_libburn_has_burn_msgS 1 #define Cdrskin_libburn_has_burn_msgS 1
#define Cdrskin_libburn_has_burn_aborT 1 #define Cdrskin_libburn_has_burn_aborT 1
#define Cdrskin_libburn_has_cleanup_handleR 1 #define Cdrskin_libburn_has_cleanup_handleR 1
#define Cdrskin_libburn_has_audioxtR 1 /* Cdrskin_libburn_has_audioxtR */
/* Cdrskin_libburn_has_get_start_end_lbA */ /* Cdrskin_libburn_has_get_start_end_lbA */
/* Cdrskin_libburn_has_burn_disc_unsuitablE */ /* Cdrskin_libburn_has_burn_disc_unsuitablE */
/* Cdrskin_libburn_has_read_atiP */ /* Cdrskin_libburn_has_read_atiP */
@ -1223,11 +1223,9 @@ int Cdrtrack_extract_audio(struct CdrtracK *track, int *fd, off_t *xtr_size,
int flag) int flag)
{ {
int l, ok= 0; int l, ok= 0;
#ifdef Cdrskin_libburn_has_audioxtR
struct libdax_audioxtr *xtr= NULL; struct libdax_audioxtr *xtr= NULL;
char *fmt,*fmt_info; char *fmt,*fmt_info;
int num_channels,sample_rate,bits_per_sample,msb_first,ret; int num_channels,sample_rate,bits_per_sample,msb_first,ret;
#endif
*fd= -1; *fd= -1;
@ -1250,8 +1248,6 @@ int Cdrtrack_extract_audio(struct CdrtracK *track, int *fd, off_t *xtr_size,
track->source_path); track->source_path);
} }
#ifdef Cdrskin_libburn_has_audioxtR
ret= libdax_audioxtr_new(&xtr,track->source_path,0); ret= libdax_audioxtr_new(&xtr,track->source_path,0);
if(ret<=0) if(ret<=0)
return(ret); return(ret);
@ -1277,12 +1273,6 @@ int Cdrtrack_extract_audio(struct CdrtracK *track, int *fd, off_t *xtr_size,
ex: ex:
libdax_audioxtr_destroy(&xtr,0); libdax_audioxtr_destroy(&xtr,0);
return(ret); return(ret);
#else /* Cdrskin_libburn_has_audioxtR */
return(0);
#endif
} }

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

@ -1 +1 @@
#define Cdrskin_timestamP "2011.10.06.104012" #define Cdrskin_timestamP "2011.10.06.104233"