From 4c10e60dae7825842d5fccc6ac352790877f0ef2 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Thu, 6 Oct 2011 10:43:26 +0000 Subject: [PATCH] Now unconditional: Cdrskin_libburn_has_audioxtR --- cdrskin/cdrskin.c | 12 +----------- cdrskin/cdrskin_timestamp.h | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/cdrskin/cdrskin.c b/cdrskin/cdrskin.c index f7ff7d8..93abfcd 100644 --- a/cdrskin/cdrskin.c +++ b/cdrskin/cdrskin.c @@ -187,7 +187,7 @@ or #define Cdrskin_libburn_has_burn_msgS 1 #define Cdrskin_libburn_has_burn_aborT 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_burn_disc_unsuitablE */ /* 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 l, ok= 0; -#ifdef Cdrskin_libburn_has_audioxtR struct libdax_audioxtr *xtr= NULL; char *fmt,*fmt_info; int num_channels,sample_rate,bits_per_sample,msb_first,ret; -#endif *fd= -1; @@ -1250,8 +1248,6 @@ int Cdrtrack_extract_audio(struct CdrtracK *track, int *fd, off_t *xtr_size, track->source_path); } -#ifdef Cdrskin_libburn_has_audioxtR - ret= libdax_audioxtr_new(&xtr,track->source_path,0); if(ret<=0) return(ret); @@ -1277,12 +1273,6 @@ int Cdrtrack_extract_audio(struct CdrtracK *track, int *fd, off_t *xtr_size, ex: libdax_audioxtr_destroy(&xtr,0); return(ret); - -#else /* Cdrskin_libburn_has_audioxtR */ - - return(0); - -#endif } diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h index ec33b21..e4c58c7 100644 --- a/cdrskin/cdrskin_timestamp.h +++ b/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2011.10.06.104012" +#define Cdrskin_timestamP "2011.10.06.104233"