diff --git a/Makefile.am b/Makefile.am
index f62f0cc..63886a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -103,7 +103,7 @@ test_structest_SOURCES = test/structest.c
## cdrskin construction site - ts A60816
cdrskin_cdrskin_CPPFLAGS = -Ilibburn
-cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_2_3
+cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_2_6
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 755d326..41d6665 100644
--- a/cdrskin/README
+++ b/cdrskin/README
@@ -26,12 +26,12 @@ following possible.
cdrskin. By Thomas Schmitt
Integrated sub project of libburn.pykix.org but also published via:
http://scdbackup.sourceforge.net/cdrskin_eng.html
-http://scdbackup.sourceforge.net/cdrskin-0.2.5.tar.gz
+http://scdbackup.sourceforge.net/cdrskin-0.2.6.pl01.tar.gz
Copyright (C) 2006 Thomas Schmitt
------------------------------------------------------------------------------
-On top of libburn there is implemented cdrskin 0.2.5, a limited cdrecord
+On top of libburn there is implemented cdrskin 0.2.6, 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.5.tar.gz , take it to a directory of your choice and do:
+Obtain cdrskin-0.2.6.pl01.tar.gz, take it to a directory of your choice and do:
- tar xzf cdrskin-0.2.5.tar.gz
- cd cdrskin-0.2.5
+ tar xzf cdrskin-0.2.6.pl01.tar.gz
+ cd cdrskin-0.2.6
Or obtain a libburn.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.5 or libburn then execute:
+Within that toplevel directory of either cdrskin-0.2.6 or libburn then execute:
./configure
make
diff --git a/cdrskin/add_ts_changes_to_libburn_0_2_4 b/cdrskin/add_ts_changes_to_libburn_0_2_6
similarity index 97%
rename from cdrskin/add_ts_changes_to_libburn_0_2_4
rename to cdrskin/add_ts_changes_to_libburn_0_2_6
index 975c565..bf09dd8 100755
--- a/cdrskin/add_ts_changes_to_libburn_0_2_4
+++ b/cdrskin/add_ts_changes_to_libburn_0_2_6
@@ -36,10 +36,13 @@ intermediate="./libburn_pykix"
# My changes are in libburn-0.2.3.ts.develop , mainly in ./cdrskin
changes="./libburn-0.2.3.ts.develop"
-skin_rev="0.2.4"
+skin_release="0.2.6"
+patch_level=".pl01"
+skin_rev="$skin_release""$patch_level"
+
# The result directory and the name of the result tarballs
-target="./cdrskin-${skin_rev}"
+target="./cdrskin-${skin_release}"
cdrskin_tarball="./cdrskin-${skin_rev}.tar.gz"
cdrskin_tarball_svn="./cdrskin-${skin_rev}.svn.tar.gz"
diff --git a/cdrskin/add_ts_changes_to_libburn_0_2_5 b/cdrskin/add_ts_changes_to_libburn_0_2_7
similarity index 99%
rename from cdrskin/add_ts_changes_to_libburn_0_2_5
rename to cdrskin/add_ts_changes_to_libburn_0_2_7
index 437f1e5..2d88495 100755
--- a/cdrskin/add_ts_changes_to_libburn_0_2_5
+++ b/cdrskin/add_ts_changes_to_libburn_0_2_7
@@ -36,7 +36,7 @@ intermediate="./libburn_pykix"
# My changes are in libburn-0.2.3.ts.develop , mainly in ./cdrskin
changes="./libburn-0.2.3.ts.develop"
-skin_rev="0.2.5"
+skin_rev="0.2.7"
# The result directory and the name of the result tarballs
target="./cdrskin-${skin_rev}"
diff --git a/cdrskin/cdrskin.c b/cdrskin/cdrskin.c
index 710f9f6..0472b91 100644
--- a/cdrskin/cdrskin.c
+++ b/cdrskin/cdrskin.c
@@ -123,7 +123,7 @@ or
/** The official program version */
#ifndef Cdrskin_prog_versioN
-#define Cdrskin_prog_versioN "0.2.5"
+#define Cdrskin_prog_versioN "0.2.6"
#endif
/** The source code release timestamp */
@@ -156,14 +156,25 @@ or
#endif /* Cdrskin_libburn_cvs_A60220_tS */
-#ifdef Cdrskin_libburn_0_2_2
-#define Cdrskin_libburn_versioN "0.2.2"
+#ifdef Cdrskin_libburn_0_2_6
+#define Cdrskin_libburn_versioN "0.2.6"
+#define Cdrskin_libburn_from_pykix_svN 1
+#endif /* Cdrskin_libburn_0_2_6 */
+
+#ifndef Cdrskin_libburn_versioN
+#define Cdrskin_libburn_versioN "0.2.6"
#define Cdrskin_libburn_from_pykix_svN 1
#endif
-#ifdef Cdrskin_libburn_0_2_3
-#define Cdrskin_libburn_versioN "0.2.3"
-#define Cdrskin_libburn_from_pykix_svN 1
+#ifdef Cdrskin_libburn_from_pykix_svN
+#ifndef Cdrskin_oldfashioned_api_usE
+
+#define Cdrskin_libburn_does_ejecT 1
+#define Cdrskin_libburn_has_drive_get_adR 1
+#define Cdrskin_progress_track_does_worK 1
+#define Cdrskin_is_erasable_on_load_does_worK 1
+#define Cdrskin_grab_abort_does_worK 1
+#define Cdrskin_allow_libburn_taO 1
#define Cdrskin_libburn_has_is_enumerablE 1
#define Cdrskin_libburn_has_convert_fs_adR 1
#define Cdrskin_libburn_has_convert_scsi_adR 1
@@ -178,21 +189,6 @@ or
#define Cdrskin_libburn_has_pretend_fulL 1
#define Cdrskin_libburn_has_multI 1
#define Cdrskin_libburn_has_buffer_min_filL 1
-#endif
-
-#ifndef Cdrskin_libburn_versioN
-#define Cdrskin_libburn_versioN "0.2.2"
-#define Cdrskin_libburn_from_pykix_svN 1
-#endif
-
-#ifdef Cdrskin_libburn_from_pykix_svN
-
-#define Cdrskin_libburn_does_ejecT 1
-#define Cdrskin_libburn_has_drive_get_adR 1
-#define Cdrskin_progress_track_does_worK 1
-#define Cdrskin_is_erasable_on_load_does_worK 1
-#define Cdrskin_grab_abort_does_worK 1
-#define Cdrskin_allow_libburn_taO 1
#ifdef Cdrskin_new_api_tesT
@@ -204,14 +200,10 @@ or
#define Cdrskin_atip_speed_is_oK 1
#endif
-#endif
+#endif /* Cdrskin_new_api_tesT */
-#ifdef Cdrskin_oldfashioned_api_usE
-
-/* switch back to pre-0.2.2 libburn usage */;
-
-#endif
+#endif /* ! Cdrskin_oldfashioned_api_usE */
#endif /* Cdrskin_libburn_from_pykix_svN */
diff --git a/cdrskin/cdrskin_eng.html b/cdrskin/cdrskin_eng.html
index 2ceb877..f88fa6b 100644
--- a/cdrskin/cdrskin_eng.html
+++ b/cdrskin/cdrskin_eng.html
@@ -51,7 +51,7 @@ A CD recorder suitable for
GPL software included:
-- libburn-0.2.3 stabilized SVN snapshot
+- libburn-0.2.6
- (by Derek Foreman, Ben Jansens, and team of libburn.pykix.org)
- transfers data to CD
@@ -99,9 +99,7 @@ wishes as well as on the development of libburn.
$ cdrskin -v dev=/dev/dvd blank=fast -eject
Write ISO-9660 filesystem image:
$ cdrskin -v dev=/dev/hdc speed=12 fs=8m driveropts=burnfree -sao -eject padsize=300k my_image.iso
-Write compressed afio archive on-the-fly via cdrskin-0.2.4 :
-$ find . | afio -oZ - | cdrskin -v dev=0,1,0 fs=32m speed=8 driveropts=burnfree padsize=300k -sao tsize=650m -
-Write compressed afio archive on-the-fly via cdrskin-0.2.5 :
+Write compressed afio archive on-the-fly :
$ find . | afio -oZ - | cdrskin -v dev=0,1,0 fs=32m speed=8 driveropts=burnfree padsize=300k -tao -
Write audio tracks:
$ cdrskin -v dev=ATA:1,0,0 speed=48 driveropts=burnfree -sao track1.wav track2.au -audio -swab track3.raw
@@ -125,13 +123,7 @@ wishes as well as on the development of libburn.
-
-Burns only a single closed session. No -multi option yet.
-Note: Development version 0.2.5 offers multi-session now. See below.
-
--
-No TAO mode in cdrskin-0.2.4 and therefore no writing on-the-fly without
-a predefined source size.
-Note: Development version 0.2.5 offers TAO now. See below.
+Appending sessions to unclosed media is restricted to write mode TAO.
-
cdrskin -scanbus or --devices hangs for quite a while if there is
@@ -153,7 +145,7 @@ rw-permissions and retry the bus scan as non-superuser.
- Download as source code (see README):
-- cdrskin-0.2.4.pl01.tar.gz
+
- cdrskin-0.2.6.pl01.tar.gz
(510 KB).
-
@@ -164,14 +156,14 @@ cdrskin is part of libburn - full libburn is provided with cdrskin releases.
-
- Download as single x86 binaries (untar and move to /usr/bin/cdrskin):
--
-cdrskin_0.2.4.pl01-x86-suse9_0.tar.gz, (60 KB),
+
-
+cdrskin_0.2.6.pl01-x86-suse9_0.tar.gz, (60 KB),
- runs on SuSE 9.0 (2.4.21) , RIP-14.4 (2.6.14) ,
Gentoo (2.6.15 x86_64 Athlon).
--
-cdrskin_0.2.4.pl01-x86-suse9_0-static.tar.gz, (260 KB), -static compiled,
+
-
+cdrskin_0.2.6.pl01-x86-suse9_0-static.tar.gz, (260 KB), -static compiled,
- runs on SuSE 7.2 (2.4.4), and on the systems above.
@@ -195,22 +187,23 @@ cdrskin_0.2.4.pl01-x86-suse9_0-static.tar.gz, (260 KB), -static compiled,
-Enhancements towards previous stable version cdrskin-0.2.2:
+Enhancements towards previous stable version cdrskin-0.2.4:
-- cdrecord compatibility with drive addresses of form [ATA:]Bus,Target,Lun.
-
(use option --old_pseudo_scsi_adr to get back the incompatible
- Bus,Traget,Lun addressing of version 0.2.2)
+ - Option -tao is fully enabled.
+ SAO is still the preferred default but TAO is default if a track of
+ unpredicted size is present (stdin, named pipe, ...) or if a follow-up
+ session is written to an appendable CD.
+ (This is an intentional deviation from cdrecord defaults which themselves
+ have changed with the newest cdrecord versions.)
-- Drives adressable via links and device siblings (/dev/cdrom , /dev/scd0).
-
-- Automatic -audio extraction with .wav files and .au files.
-
-- Bug fix about failure to eject.
-- Comments and empty lines allowed in startup files.
-- Options -scanbus and --devices print SORRY messages about busy drives.
-
-- Drive buffer fill indicator reports realistic percentage numbers.
-- Option -toc is supported, drive firmware revision gets displayed.
+- Status report during blank, preparation and finalization improved.
+- Bug fixed: Trailing trash appended to .wav files caused error message
+ and, if exceeding fifo size, could even stall a burn.
+ (Workaround: disable fifo by fs=0)
+- Bug fixed: False speed with first pacifier cycle. Potential program
+ abort by floating point exception (NaN).
+- multi-session CDs: -multi, -msinfo,
+ writing to appendable CDs (for now restricted to write mode TAO).
@@ -218,30 +211,14 @@ Enhancements towards previous stable version cdrskin-0.2.2:
-Development snapshot, version 0.2.5 :
-- Enhancements towards stable version 0.2.4:
-
- - Option -tao is fully enabled.
- SAO is still the preferred default but TAO is default if a track of
- unpredicted size is present (stdin, named pipe, ...) or if a follow-up
- session is written to an appendable CD.
- (This is an intentional deviation from cdrecord defaults which themselves
- have changed with the newest cdrecord versions.)
-
- - Status report during blank, preparation and finalization improved.
- - Bug fixed: Trailing trash appended to .wav files caused error message
- and, if exceeding fifo size, could even stall a burn.
- (Workaround: disable fifo by fs=0)
- - Bug fixed: False speed with first pacifier cycle. Potential program
- abort by floating point exception (NaN).
- - multi-session CDs: -multi, -msinfo,
- writing to appendable CDs (for now restricted to write mode TAO).
-
+ Development snapshot, version 0.2.7 :
+- Enhancements towards stable version 0.2.6:
+(none yet)
-
-- README 0.2.5
-
- cdrskin_0.2.5 --help
-- cdrskin_0.2.5 -help
+- README 0.2.7
+
- cdrskin_0.2.7 --help
+- cdrskin_0.2.7 -help
-
- Maintainers of cdrskin unstable packages please use SVN of
libburn.pykix.org
@@ -261,15 +238,15 @@ admins with full system souvereignty.
upcoming README ):
-
-cdrskin-0.2.5.tar.gz
+cdrskin-0.2.7.tar.gz
(500 KB).
- Binary (untar and move to /usr/bin/cdrskin):
--
-cdrskin_0.2.5-x86-suse9_0.tar.gz, (60 KB).
+
-
+cdrskin_0.2.7-x86-suse9_0.tar.gz, (60 KB).
--
-cdrskin_0.2.5-x86-suse9_0-static.tar.gz, (260 KB)
+
-
+cdrskin_0.2.7-x86-suse9_0-static.tar.gz, (260 KB)
@@ -322,14 +299,6 @@ is a GUI frontend which uses cdrecord for CD burning.)
Example for a test session with a cdrecord based scdbackup installation:
$ cdrskin -scanbus
...
-
-If your system is stricken with some ill CD device then this can stall
-and you will have to press Ctrl+C to abort.
-In this case, you may execute
-export SCDBACKUP_NO_SCANBUS=1
-and try again.
-
-
- 2,0,0 0) 'TEAC' 'CD-ROM CD-532S' '?' Removable CD-ROM
- $ cdrskin -scanbus dev=ATA
- ...
@@ -344,8 +313,15 @@ and try again.
- $ export SCDBACKUP_USE_CDRSKIN=1
- $ ./CONFIGURE_CD
- ...
-- cdrskin 0.2.4 : limited cdrecord compatibility wrapper for libburn
-- ...
+- cdrskin 0.2.6 : limited cdrecord compatibility wrapper for libburn
+
+If your system is stricken with some ill CD device then this can stall
+and you will have to press Ctrl+C to abort.
+In this case, you may execute
+export SCDBACKUP_NO_SCANBUS=1
+and try again.
+
+
- ------------------- SCSI devices. To be used like 0,0,0
- 2,0,0 0) 'TEAC' 'CD-ROM CD-532S' '?' Removable CD-ROM
- ------------------- end of SCSI device list
diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h
index a22bda4..7d0b5f4 100644
--- a/cdrskin/cdrskin_timestamp.h
+++ b/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2006.11.22.122228"
+#define Cdrskin_timestamP "2006.11.23.102340"
diff --git a/cdrskin/compile_cdrskin.sh b/cdrskin/compile_cdrskin.sh
index 2cb6b20..2881787 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_3"
+libvers="-DCdrskin_libburn_0_2_6"
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_2"
+ elif test "$i" = "-libburn_0_2_6"
then
- libvers="-DCdrskin_libburn_0_2_2"
- 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_3"
+ libvers="-DCdrskin_libburn_0_2_6"
+ 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_3"
+ libvers="-DCdrskin_libburn_0_2_6"
libdax_audioxtr_o="libburn/libdax_audioxtr.o"
libdax_msgs_o="libburn/libdax_msgs.o"
cleanup_src_or_obj="libburn/cleanup.o"
@@ -79,8 +79,8 @@ 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_2 set macro to match libburn-0.2.2."
- echo " -libburn_0_2_3 set macro to match current libburn-SVN."
+ echo " -libburn_0_2_6 set macro to match libburn-0.2.6."
+ 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."
echo " -experimental use newly introduced libburn features."
diff --git a/cdrskin/wiki_plain.txt b/cdrskin/wiki_plain.txt
index 03c42bc..5d97508 100644
--- a/cdrskin/wiki_plain.txt
+++ b/cdrskin/wiki_plain.txt
@@ -2,7 +2,7 @@
cdrskin Wiki - plain text copy
--------------------------------------------------------------------------
-cdrskin-0.2.5 is the cdrecord compatibility middleware of libburn.
+cdrskin is the cdrecord compatibility middleware of libburn.
Its paragon, cdrecord, is a powerful GPL'ed burn program included in Joerg
Schilling's cdrtools. cdrskin strives to be a second source for the services
@@ -19,10 +19,9 @@ About libburn API for burning CD: http://libburn-api.pykix.org
--------------------------------------------------------------------------
-Convenient TAO burn mode is provided in development version 0.2.5 but not in
-current "stable" release 0.2.4. The same is true for multi-session, where
-follow-up sessions must be done in TAO mode. (Users who have a burner which
-succeeds with a follow-up session via cdrecord -sao : please contact us.)
+Appending sessions to an unclosed CD is restricted to write mode TAO.
+(Users who have a burner which succeeds with a follow-up session via
+ cdrecord -sao : please contact us.)
cdrskin does not provide DVD burning yet. See advise to use dvd+rw-tools
at the end of this text.
@@ -135,8 +134,8 @@ tao_to_sao_tsize= allows the - actually unsupported - cdrecord option
-tao and defines a default track size to be used if - as custom with -tao -
no option tsize=# is given.
-Since -tao is supported in cdrskin-0.2.5 the TAO-to-SAO workaround on its way
-to obsolescence. Nevertheless, tao_to_sao_tsize= allows to preset a default
+Since -tao is supported in cdrskin-0.2.6 the TAO-to-SAO workaround has become
+quite obsolete. Nevertheless, tao_to_sao_tsize= allows to preset a default
size for SAO mode which is in effect only if no track size is available.
As in general with cdrskin tsize=# the data source does not have to provide