diff --git a/cdrskin/cdrskin.c b/cdrskin/cdrskin.c index 3da7fc3..2933677 100644 --- a/cdrskin/cdrskin.c +++ b/cdrskin/cdrskin.c @@ -277,7 +277,9 @@ or /* #include */ #include "../libburn/libburn.h" +#ifdef Cdrskin_libburn_has_audioxtR #include "../libburn/libdax_audioxtr.h" +#endif #ifdef Cdrskin_libburn_has_cleanup_handleR #define Cleanup_set_handlers burn_set_signal_handling @@ -916,11 +918,11 @@ int Cdrtrack_get_fifo(struct CdrtracK *track, struct CdrfifO **fifo, int flag) int Cdrtrack_extract_audio(struct CdrtracK *track, int *fd, off_t *xtr_size, int flag) { - int l,ret; + int l; #ifdef Cdrskin_libburn_has_audioxtR struct libdax_audioxtr *xtr= NULL; char *fmt,*fmt_info; - int num_channels,sample_rate,bits_per_sample; + int num_channels,sample_rate,bits_per_sample,ret; #endif *fd= -1; diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h index 389aab8..07f15bb 100644 --- a/cdrskin/cdrskin_timestamp.h +++ b/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2006.10.18.174334" +#define Cdrskin_timestamP "2006.10.19.094543" diff --git a/cdrskin/compile_cdrskin.sh b/cdrskin/compile_cdrskin.sh index 8ebd6ef..adae1fb 100755 --- a/cdrskin/compile_cdrskin.sh +++ b/cdrskin/compile_cdrskin.sh @@ -7,7 +7,7 @@ debug_opts= def_opts= libvers="-DCdrskin_libburn_0_2_3" -cleanup_src_or_obj="cdrskin/cleanup.c" +cleanup_src_or_obj="libburn/cleanup.o" libdax_msgs_o="libburn/libdax_msgs.o" libdax_audioxtr_o="libburn/libdax_audioxtr.o" do_strip=0 @@ -43,14 +43,13 @@ do libvers="-DCdrskin_libburn_0_2_3" libdax_audioxtr_o="libburn/libdax_audioxtr.o" libdax_msgs_o="libburn/libdax_msgs.o" + cleanup_src_or_obj="libburn/cleanup.o" elif test "$i" = "-newapi" -o "$i" = "-experimental" then def_opts="$def_opts -DCdrskin_new_api_tesT" - cleanup_src_or_obj="libburn/cleanup.o" elif test "$i" = "-oldfashioned" then def_opts="$def_opts -DCdrskin_oldfashioned_api_usE" - cleanup_src_or_obj="cdrskin/cleanup.c" elif test "$i" = "-do_not_compile_cdrskin" then compile_cdrskin=0 @@ -70,12 +69,12 @@ do debug_opts="$debug_opts -O2" elif test "$i" = "-help" -o "$i" = "--help" -o "$i" = "-h" then - echo "cdrskin/compile_cdrskin.sh : to be executed within ./cdrskin-0.1.3.0.2.ts" + echo "cdrskin/compile_cdrskin.sh : to be executed within top level directory" echo "Options:" echo " -compile_cdrfifo compile program cdrskin/cdrfifo." echo " -compile_dewav compile program test/dewav without libburn." echo " -cvs_A60220 set macro to match libburn-CVS of 20 Feb 2006." - echo " -libburn_0_2_2 set macro to match libburn-0.2.2" + echo " -libburn_0_2_2 set macro to match libburn-0.2.2." echo " -libburn_0_2_3 set macro to match current libburn-SVN." echo " -do_not_compile_cdrskin omit compilation of cdrskin/cdrskin." echo " -experimental use newly introduced libburn features."