diff --git a/Makefile.am b/Makefile.am index dfde768..e2255bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -101,9 +101,9 @@ test_structest_CPPFLAGS = -Ilibburn test_structest_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS) test_structest_SOURCES = test/structest.c -## cdrskin construction site - ts A60816 +## cdrskin construction site - ts A60816 - A70116 cdrskin_cdrskin_CPPFLAGS = -Ilibburn -cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_2_7 +cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_3_1 cdrskin_cdrskin_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS) cdrskin_cdrskin_SOURCES = cdrskin/cdrskin.c cdrskin/cdrfifo.c cdrskin/cdrfifo.h cdrskin/cdrskin_timestamp.h ## diff --git a/cdrskin/README b/cdrskin/README index 2ef0f12..56c2fe1 100644 --- a/cdrskin/README +++ b/cdrskin/README @@ -26,12 +26,12 @@ following possible. cdrskin. By Thomas Schmitt Integrated sub project of libburnia.pykix.org but also published via: http://scdbackup.sourceforge.net/cdrskin_eng.html -http://scdbackup.sourceforge.net/cdrskin-0.2.7.tar.gz +http://scdbackup.sourceforge.net/cdrskin-0.3.1.tar.gz Copyright (C) 2006-2007 Thomas Schmitt ------------------------------------------------------------------------------ -On top of libburn there is implemented cdrskin 0.2.7, a limited cdrecord +On top of libburn there is implemented cdrskin 0.3.1, a limited cdrecord compatibility wrapper which allows to use some libburn features from the command line. Interested users of cdrecord are invited to participate in the development @@ -59,16 +59,16 @@ systems, including 64 bit systems. (Further reports are welcome.) Compilation, First Glimpse, Installation -Obtain cdrskin-0.2.7.tar.gz, take it to a directory of your choice and do: +Obtain cdrskin-0.3.1.tar.gz, take it to a directory of your choice and do: - tar xzf cdrskin-0.2.7.tar.gz - cd cdrskin-0.2.7 + tar xzf cdrskin-0.3.1.tar.gz + cd cdrskin-0.3.1 Or obtain a libburnia.pykix.org SVN snapshot, go into the toplevel directory of the snapshot (e.g. cd libburn_pykix ), and execute the autotools script ./bootstrap . Use autools version >= 1.7 . -Within that toplevel directory of either cdrskin-0.2.7 or libburn then execute: +Within that toplevel directory of either cdrskin-0.3.1 or libburn then execute: ./configure make @@ -161,14 +161,17 @@ Obtain some info about the drive and the inserted media Thoroughly blank a CD-RW cdrskin -v dev=0,1,0 blank=all -eject +Format DVD-RW before first use with cdrskin + cdrskin -v dev=0,1,0 blank=format_overwrite + Blank CD-RW sufficiently for making it ready for overwrite cdrskin -v dev=0,1,0 blank=fast -eject -Burn image file my_image.iso to CD or DVD+-RW +Burn image file my_image.iso to CD-R, CD-RW, DVD+RW, DVD-RAM, DVD-RW cdrskin -v dev=0,1,0 speed=12 fs=8m driveropts=burnfree padsize=300k \ -eject my_image.iso -Burn a compressed afio archive to CD or DVD+-RW on-the-fly +Burn a compressed afio archive to any of the above media types on-the-fly find . | afio -oZ - | cdrskin -v dev=0,1,0 fs=32m speed=8 -tao \ driveropts=burnfree padsize=300k - @@ -208,11 +211,12 @@ Run a backup : Restrictions The major restrictions are lifted now: audio, TAO, multi-session do work. -Many cdrecord options are still unsupported, though. +Many cdrecord options are still unsupported, though. If you have use cases for them, please report your wishes and expectations. -DVD support is still immature and restricted to DVD+-RW for now. +DVD support is restricted to single layer overwriteable DVD (-RAM, +RW, -RW) +for now. @@ -232,6 +236,10 @@ Actually i, Thomas Schmitt, am a devoted user of cdrecord via my project scdbackup which still runs a bit better with cdrecord than with cdrskin. TAO. I have the hope that Joerg feels more flattered than annoyed by cdrskin. +Many thanks to Andy Polyakov for his dvd+rw-tools + http://fy.chalmers.se/~appro/linux/DVD+RW/tools +which provide me with examples and pointers into MMC specs for DVD writing. + Drive Addressing diff --git a/cdrskin/cdrskin.c b/cdrskin/cdrskin.c index bd58e6f..88301a8 100644 --- a/cdrskin/cdrskin.c +++ b/cdrskin/cdrskin.c @@ -124,7 +124,7 @@ or /** The official program version */ #ifndef Cdrskin_prog_versioN -#define Cdrskin_prog_versioN "0.2.7" +#define Cdrskin_prog_versioN "0.3.1" #endif /** The source code release timestamp */ @@ -157,25 +157,18 @@ or #endif /* Cdrskin_libburn_cvs_A60220_tS */ -#ifdef Cdrskin_libburn_0_2_6 -#define Cdrskin_libburn_versioN "0.2.6" +#ifdef Cdrskin_libburn_0_3_0 +#define Cdrskin_libburn_versioN "0.3.0" #define Cdrskin_libburn_from_pykix_svN 1 -#endif /* Cdrskin_libburn_0_2_6 */ +#endif /* Cdrskin_libburn_0_3_0 */ -#ifdef Cdrskin_libburn_0_2_7 -#define Cdrskin_libburn_versioN "0.2.7" +#ifdef Cdrskin_libburn_0_3_1 +#define Cdrskin_libburn_versioN "0.3.1" #define Cdrskin_libburn_from_pykix_svN 1 -#define Cdrskin_atip_speed_is_oK 1 -#define Cdrskin_no_aftergrab_loopS 1 -#define Cdrskin_libburn_has_get_profilE 1 -#define Cdrskin_libburn_has_set_start_bytE 1 -#define Cdrskin_libburn_has_wrote_welL 1 -#define Cdrskin_libburn_has_bd_formattinG 1 -#define Cdrskin_libburn_has_burn_disc_formaT 1 -#endif /* Cdrskin_libburn_0_2_7 */ +#endif /* Cdrskin_libburn_0_3_1 */ #ifndef Cdrskin_libburn_versioN -#define Cdrskin_libburn_versioN "0.2.6" +#define Cdrskin_libburn_versioN "0.3.0" #define Cdrskin_libburn_from_pykix_svN 1 #endif @@ -202,6 +195,15 @@ or #define Cdrskin_libburn_has_pretend_fulL 1 #define Cdrskin_libburn_has_multI 1 #define Cdrskin_libburn_has_buffer_min_filL 1 +#define Cdrskin_atip_speed_is_oK 1 +#define Cdrskin_libburn_has_get_profilE 1 +#define Cdrskin_libburn_has_set_start_bytE 1 +#define Cdrskin_libburn_has_wrote_welL 1 +#define Cdrskin_libburn_has_bd_formattinG 1 +#define Cdrskin_libburn_has_burn_disc_formaT 1 + +/* <<< to be removed together with said loops */ +#define Cdrskin_no_aftergrab_loopS 1 #ifdef Cdrskin_new_api_tesT @@ -4338,16 +4340,16 @@ thank_you_for_patience:; Cdrfifo_get_counters(skin->fifo,&curr_fifo_in,&curr_fifo_out,0); Cdrfifo_get_sizes(skin->fifo,&bs,&fs,0); } - } - if(skin->fifo_size>0) { - sprintf(fifo_text,"(fifo %3d%%) ",fifo_percent); - if(skin->verbosity>=Cdrskin_verbose_debug_fifO) { - fprintf(stderr, - "\ncdrskin_debug: fifo >= %9d / %d : %8.f in, %8.f out\n", - fill,(int) buffer_size, - curr_fifo_in-last_fifo_in,curr_fifo_out-last_fifo_out); - last_fifo_in= curr_fifo_in; - last_fifo_out= curr_fifo_out; + if(skin->fifo_size>0) { + sprintf(fifo_text,"(fifo %3d%%) ",fifo_percent); + if(skin->verbosity>=Cdrskin_verbose_debug_fifO) { + fprintf(stderr, + "\ncdrskin_debug: fifo >= %9d / %d : %8.f in, %8.f out\n", + fill,(int) buffer_size, + curr_fifo_in-last_fifo_in,curr_fifo_out-last_fifo_out); + last_fifo_in= curr_fifo_in; + last_fifo_out= curr_fifo_out; + } } } if(skin->supposed_track_idx >= 0 && diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h index d3a4980..c2b53fb 100644 --- a/cdrskin/cdrskin_timestamp.h +++ b/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2007.01.14.133951" +#define Cdrskin_timestamP "2007.01.16.151041" diff --git a/cdrskin/compile_cdrskin.sh b/cdrskin/compile_cdrskin.sh index fa4dc35..d6b45f0 100755 --- a/cdrskin/compile_cdrskin.sh +++ b/cdrskin/compile_cdrskin.sh @@ -7,7 +7,7 @@ debug_opts= def_opts= largefile_opts="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1" -libvers="-DCdrskin_libburn_0_2_7" +libvers="-DCdrskin_libburn_0_3_1" cleanup_src_or_obj="libburn/cleanup.o" libdax_msgs_o="libburn/libdax_msgs.o" libdax_audioxtr_o="libburn/libdax_audioxtr.o" @@ -33,15 +33,15 @@ do libdax_audioxtr_o= libdax_msgs_o="libburn/message.o" cleanup_src_or_obj="-DCleanup_has_no_libburn_os_H cdrskin/cleanup.c" - elif test "$i" = "-libburn_0_2_6" + elif test "$i" = "-libburn_0_3_0" then - libvers="-DCdrskin_libburn_0_2_6" + libvers="-DCdrskin_libburn_0_3_0" libdax_audioxtr_o="libburn/libdax_audioxtr.o" libdax_msgs_o="libburn/libdax_msgs.o" cleanup_src_or_obj="libburn/cleanup.o" elif test "$i" = "-libburn_svn" then - libvers="-DCdrskin_libburn_0_2_7" + libvers="-DCdrskin_libburn_0_3_1" libdax_audioxtr_o="libburn/libdax_audioxtr.o" libdax_msgs_o="libburn/libdax_msgs.o" cleanup_src_or_obj="libburn/cleanup.o" @@ -79,7 +79,7 @@ do 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_6 set macro to match libburn-0.2.6." + echo " -libburn_0_3_0 set macro to match libburn-0.3.0." echo " -libburn_svn set macro to match current libburn-SVN." echo " -no_largefile do not use 64 bit off_t (must match libburn)." echo " -do_not_compile_cdrskin omit compilation of cdrskin/cdrskin." diff --git a/configure.ac b/configure.ac index 98c9bd5..7e62155 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([libburn], [0.2.7], [http://libburnia.pykix.org]) +AC_INIT([libburn], [0.3.1], [http://libburnia.pykix.org]) AC_PREREQ([2.50]) dnl AC_CONFIG_HEADER([config.h]) @@ -24,8 +24,8 @@ dnl dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match dnl BURN_MAJOR_VERSION=0 -BURN_MINOR_VERSION=2 -BURN_MICRO_VERSION=7 +BURN_MINOR_VERSION=3 +BURN_MICRO_VERSION=1 BURN_INTERFACE_AGE=0 BURN_BINARY_AGE=0 BURN_VERSION=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION