Updated changelog before release

COPYRIGHT

@@ -1,12 +1,13 @@
 Derek Foreman <derek@signalmarketing.com> and Ben Jansens <xor@orodu.net>
 Copyright (C) 2002-2006  Derek Foreman and Ben Jansens
 Mario Danic <mario.danic@gmail.com>, Thomas Schmitt <scdbackup@gmx.net>
-Copyright (C) 2006-2008 Mario Danic, Thomas Schmitt
+Copyright (C) 2006-2007 Mario Danic, Thomas Schmitt
 
 
     This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License version 2 as
+    it under the terms of the GNU General Public License as published by
-    published by the Free Software Foundation.
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

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 - A80517
+##  cdrskin construction site - ts A60816 - A71025
 cdrskin_cdrskin_CPPFLAGS = -Ilibburn
-cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_4_8
+cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_4_2
 
 # cdrskin_cdrskin_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
 # ts A80123, change proposed by Simon Huggins to cause dynamic libburn linking

README

@@ -19,7 +19,7 @@ commitment as written at the end of this text.
 The rights and merits of the Libburn-copyright holders Derek Foreman and
 Ben Jansens will be duely respected. 
 
-This libburnia-project.org toplevel README (C) 2006-2008 Thomas Schmitt 
+This libburnia-project.org toplevel README (C) 2006-2007 Thomas Schmitt 
 ------------------------------------------------------------------------------
 
                            Build and Installation
@@ -39,23 +39,13 @@ into its toplevel directory (here: "libburn") and execute
    ./configure --prefix=/usr
    make
 
-To make libburn accessible for running resp. application development,
+To make the libraries accessible for running resp. developing applications 
-and to install the cdrecord compatibility binary cdrskin, do:
    make install
 
 
-Above procedure installs cdrskin depending on libburn.so.4 .
+The other half of the project, libisofs, is hosted in the libburnia SVN, too:
-For a standalone cdrskin binary, see cdrskin/README.
+   svn co http://svn.libburnia-project.org/libisofs/trunk libisofs
-
+See README file there.
-
-An important part of the project, libisofs, is hosted in a bzr repository at
-launchpad.net :
-   bzr branch lp:libisofs
-
-Another part the project, libisoburn, is hosted in the libburnia SVN, too:
-   svn co http://svn.libburnia-project.org/libisoburn/trunk libisoburn
-
-See README files there.
 
 
 ------------------------------------------------------------------------------
@@ -77,39 +67,29 @@ we would need : login on a development machine resp. a live OS on CD or DVD,
 advise from a system person about the equivalent of Linux sg or FreeBSD CAM,
 volunteers for testing of realistic use cases.
 
-We have a well tested code base for burning data and audio CDs and many DVD
+We have a workable code base for burning CD and most single layer DVD.
-types. The burn API is quite comprehensively documented and can be used to
+The burn API is quite comprehensively documented and can be used to build a
-build a presentable application.
+presentable application.
-We have a functional binary which emulates the core use cases of cdrecord in
+We have a functional binary which emulates parts of cdrecord in order to
-order to prove that usability, and in order to allow you to explore libburn's
+prove that usability, and in order to allow you to explore libburnia's scope
-scope by help of existing cdrecord frontends.
+by help of existing cdrecord frontends.
-
-ISO 9660 filesystems with Rock Ridge and Joliet extensions can be created
-and manipulated quite freely. This capability together with our burn capability
-makes possible a single binary application which covers all steps of image
-composition, updating and writing. Quite unique in the Linux world.
 
 The project components (list subject to growth, hopefully):
 
 - libburn  is the library by which preformatted data get onto optical media.
            It uses either /dev/sgN (e.g. on kernel 2.4 with ide-scsi) or
-           /dev/srM or /dev/hdX (e.g. on kernel 2.6).
+           /dev/hdX (e.g. on kernel 2.6).
            libburn is the foundation of our cdrecord emulation. Its code is
            independent of cdrecord. Its DVD capabilities are learned from
            studying the code of dvd+rw-tools and MMC-5 specs. No code but only
            the pure SCSI knowledge has been taken from dvd+rw-tools, though.
 
 - libisofs is the library to pack up hard disk files and directories into a
-           ISO 9660 disk image. This may then be brought to CD via libburn.
+           ISO 9660 disk image. This may then be brought to media via libburn.
            libisofs is to be the foundation of our upcoming mkisofs emulation.
 
-- libisoburn is an add-on to libburn and libisofs which coordinates both and
-           also allows to grow ISO-9660 filesystem images on multi-session
-           media as well as on overwriteable media via the same API.
-           All media peculiarities are handled automatically.
-
 - cdrskin  is a limited cdrecord compatibility wrapper for libburn.
-           cdrecord is a powerful GPL'ed burn program included in Joerg
+           Cdrecord is a powerful GPL'ed burn program included in Joerg
            Schilling's cdrtools. cdrskin strives to be a second source for
            the services traditionally provided by cdrecord. Additionally it
            provides libburn's DVD capabilities, where only -sao is compatible
@@ -117,34 +97,14 @@ The project components (list subject to growth, hopefully):
            cdrskin does not contain any bytes copied from cdrecord's sources.
            Many bytes have been copied from the message output of cdrecord
            runs, though.
-           See cdrskin/README for more.
+           See cdrskin/README and man cdrskin/cdrskin.1 for more.
 
-- xorriso  is an application of all three libraries which creates, loads,
+- test     is a collection of application gestures and examples given by the
-           manipulates and writes ISO 9660 filesystem images with
+           authors of the library features. The main API example for libburn
-           Rock Ridge extensions. Manipulation is not only adding or
+           is test/libburner.c .
-           overwriting of files but also deletion, renaming, and attribute
-           changing.
-           See xorriso/README for more.
-
-- "test"   is a collection of application gestures and examples given by the
-           authors of the library features. The burn API example of libburn
-           is named test/libburner.c . The API for media information inquiry is
-           demonstrated in test/telltoc.c .
            Explore these examples if you look for inspiration.
 
-We strive to be a responsive upstream.
+We plan to be a responsive upstream. Bear with us. We are still practicing.
-
-Our libraries are committed to maintain older feature sets in newer versions.
-This applies to source code headers (API) as well as to linkable objects (ABI).
-The only exception from this rule is about non-release versions x.y.*[13579]
-which are allowed to introduce new features, change those new features in
-any way and even may revoke such new features before the next release of
-x.y.*[02468]. As soon as it is released, a feature is promised to persist.
-
-SONAMES:
-libburn.so.4 (since 0.3.4, March 2007),
-libisofs.so.6 (since 0.6.2, February 2008),
-libisoburn.so.1 (since 0.1.0, February 2008).
 
 
 ------------------------------------------------------------------------------
@@ -255,39 +215,6 @@ Project history as far as known to me:
   cdrskin now is by default linked dynamically and does a runtime check
   to ensure not to be started with a libburn which is older than itself.
 
-- 3rd Feb 2008 libisofs-0.2.x (.so.5) has been deprecated.
-
-- 14th Feb 2008 libisofs-0.6.2 permanently replaces the old libisofs-0.2.x. 
-  It is the first release of new libisofs.so.6 which will guarantee future
-  API/ABI compatibility for its whole feature set.
-
-- 15th Feb 2008 libisoburn-0.1.0 (.so.1) coordinates libisofs and libburn for
-  the purpose of ISO image reading and writing. It emulates multi-session on
-  overwriteable media. Application xorriso makes use of all three libraries.
-
-- 8th Apr 2008 libburn-0.4.4 has proven to be capable of burning to DVD+R/DL
-  and read performance on disk file pseudo-drives has been improved.
-
-- 27th Apr 2008 libisofs-0.6.4 can now read data file content from images
-  and can map pieces of disk files onto image files. Image directory iteration
-  has been enhanced. Input data streams and extended information have been
-  exposed in the API to allow future development.
-
-- 29th Apr 2008 libisoburn-0.1.4 was made more efficient with reading of
-  image tree nodes. It now depends on libisofs-0.6.4 and libburn-0.4.4.
-  xorriso makes use of new libisofs features by performing incremental
-  updates of directory trees and by cutting oversized data files into
-  pieces. A primitive single session emulation of cdrcord and mkisofs is
-  provided.
-
-- 10th May 2008 libburn-0.4.6 supports formatting and writing of BD-RE,
-  full nominal speed for DVD-RAM and BD-RE. cdrskin has a unified blank
-  type with automatic media state recognition.
-
-- 17th May 2008 an old bug with DVD-RAM and now with BD-RE is fixed by
-  libburn-0.4.8 to allow libisoburn emulation of multisession on those media.
-
-
 
 ------------------------------------------------------------------------------
 

cdrskin/README

@@ -4,7 +4,7 @@
 cdrskin. By Thomas Schmitt <scdbackup@gmx.net>
 Integrated sub project of libburnia-project.org but also published via:
 http://scdbackup.sourceforge.net/cdrskin_eng.html
-http://scdbackup.sourceforge.net/cdrskin-0.4.8.pl00.tar.gz
+http://scdbackup.sourceforge.net/cdrskin-0.4.2.tar.gz
 Copyright (C) 2006-2008 Thomas Schmitt, provided under GPL version 2.
 ------------------------------------------------------------------------------
 
@@ -20,10 +20,10 @@ By using this software you agree to the disclaimer at the end of this text
 
                    Compilation, First Glimpse, Installation
 
-Obtain cdrskin-0.4.8.pl00.tar.gz, take it to a directory of your choice and do:
+Obtain cdrskin-0.4.2.tar.gz, take it to a directory of your choice and do:
 
-    tar xzf cdrskin-0.4.8.pl00.tar.gz
+    tar xzf cdrskin-0.4.2.tar.gz
-    cd cdrskin-0.4.8
+    cd cdrskin-0.4.2
 
 Within that directory execute:
 
@@ -48,14 +48,10 @@ Version identification and help texts available afterwards:
 Install (eventually as superuser) cdrskin to a directory where it can be found:
 The command for global installation of both, libburn and cdrskin is
     make install
-If the library libburn.so.4 is not found with a test run of cdrskin, then
-try whether command
-    ldconfig
-makes it accessible. With the statically linked binary this should not matter.
 
-With that static binary you may as well do the few necessary actions manually.
+But you may as well do the few necessary actions manually. If cdrskin was
-If cdrskin was already installed by a previous version, or by "make install"
+already installed by a previous version, or by "make install" in the course
-in the course of this installation, then find out where:
+of this installation, then find out where:
     which cdrskin 
 Copy your standalone binary to exactly the address which you get as reply.
 E.g.:
@@ -139,8 +135,8 @@ Obtain some info about the drive
 Obtain some info about the drive and the inserted media
     cdrskin dev=0,1,0 -atip -v
 
-Prepare CD-RW or DVD-RW for re-use, DVD-RAM or BD-RE for first use
+Make used CD-RW or used unformatted DVD-RW writeable again
-    cdrskin -v dev=/dev/sg1 blank=as_needed -eject
+    cdrskin -v dev=0,1,0 blank=fast -eject 
 
 Format DVD-RW to avoid need for blanking before re-use
     cdrskin -v dev=0,1,0 blank=format_overwrite
@@ -152,18 +148,18 @@ Burn image file  my_image.iso  to media
     cdrskin -v dev=0,1,0 speed=12 fs=8m driveropts=burnfree padsize=300k \
             -eject  my_image.iso 
 
-Write multi-session to the same CD , DVD-R[W] or DVD+R[/DL]
+Write multi-session to the same CD , DVD-R[W] or DVD+R
     cdrskin dev=/dev/hdc padsize=300k -multi 1.iso
-    cdrskin dev=/dev/hdc padsize=300k -multi 2.iso
+    cdrskin dev=/dev/hdc padsize=300k -multi -tao 2.iso
-    cdrskin dev=/dev/hdc padsize=300k -multi 3.iso
+    cdrskin dev=/dev/hdc padsize=300k -multi -tao 3.iso
-    cdrskin dev=/dev/hdc padsize=300k 4.iso
+    cdrskin dev=/dev/hdc padsize=300k -tao 4.iso
 
 Get multi-session info for option -C of program mkisofs:
     c_values=$(cdrskin dev=/dev/hdc -msinfo 2>/dev/null)
     mkisofs ... -C "$c_values" ...
 
 Burn a compressed afio archive to media on-the-fly
-    find . | afio -oZ - | cdrskin -v dev=0,1,0 fs=32m speed=8 \
+    find . | afio -oZ - | cdrskin -v dev=0,1,0 fs=32m speed=8 -tao \
                                   driveropts=burnfree padsize=300k - 
 
 Burn 6 audio tracks from files with different formats to CD (not to any DVD).
@@ -186,6 +182,8 @@ See output of command
     cdrskin --list_ignored_options
 If you have use cases for them, please report your wishes and expectations.
 
+DVD support is restricted to single layer DVD for now. Double layer media
+are implemented but untested.
 On the other hand, the capability of multi-session and of writing streams
 of unpredicted lenght surpass the current DVD capabilities of cdrecord.
 
@@ -260,27 +258,17 @@ I myself am not into audio. So libburn-hackers@pykix.org might be the
 best address for suggestions, requests and bug reports.
 
 
-                          DVD+RW , DVD-RAM , BD-RE
+                             DVD+RW and DVD-RAM
 
-These random access media get treated as blank media regardless wether they
+DVD+RW and DVD-RAM media get treated as blank media regardless wether they
 hold data or not. Options -audio and -multi are not allowed. Only one track
 is allowed. -toc does not return information about the media content.
-Speed is counted in DVD units (i.e. 1x = 1,385,000 bytes/second) or BD units
+Speed is counted in DVD units (i.e. 1x = 1,385,000 bytes/second). Currently
-(1x = 4,495,625 bytes/second). Currently there is no difference between -sao
+there is no difference between -sao and -tao. If ever, then -tao will be the
-and -tao. If ever, then -tao will be the mode which preserves the current
+mode which preserves the current behavior.
-behavior.
-
-BD-RE media need formatting before first use. cdrskin option "blank=as_needed"
-recognizes unformatted BD-RE and applies a lengthy formatting run.
-
-During write operations DVD-RAM and BD-RE automatically apply defect
-management. This usually slows them down to half nominal speed. If drive
-and media produce flawless results anyway, then one can try to reach full
-nominal speed by option "stream_recording=on".
-In this case bad blocks are not detected during write and not even previously
-known bad blocks are avoided. So you have to make your own readability tests
-and go back to half speed as soon as the first read errors show up.
 
+Program growisofs can append to an ISO filesystem on DVD+RW by additionally
+manipulating the first session. Meanwhile cdrskin can do the same.
 Option --grow_overwriteable_iso allows -multi (although unneeded), enables
 -msinfo and -toc, and makes blank=fast an invalidator for ISO filesystems
 on overwriteable media.
@@ -349,13 +337,10 @@ Incremental Streaming afterwards. So blank=fast will do full blanking.
 blank=deformat_sequential_quickest   is faster but might yield DAO-only media.
 
 
-                             DVD+R and DVD+R DL 
+                                  DVD+R 
 
 From the view of cdrskin they behave much like DVD-R. Each track gets wrapped
 into an own session, though.
-DVD+R DL appear as extra large DVD+R. cdrskin does not allow to set the address
-of the layer break where a reading drive might show some delay while switching
-between both media layers.
 
 
                               Emulated Drives
@@ -405,9 +390,9 @@ Don't blame me or other authors of libburn if anything goes wrong.
 Actually, in case of severe trouble, nearly always the drive and the media
 are the cause. Any mistake of the burn program is supposed to be caught
 by the drive's firmware and to lead to mere misburns.
-The worst mishaps which hit the author imposed the need to reboot the
+The worst mishaps which hit the author implied the need to reboot the
 system because of drives gnawing endlessly on ill media. Permanent hardware
-damage did not occur in 2.5 years of development. But one never knows ...
+damage did not occur in 1.5 years of development.
 
 ------------------------------------------------------------------------------
 

cdrskin/add_ts_changes_to_libburn_0_4_2

@@ -38,7 +38,7 @@ original="./libburn_svn_release.tgz"
 # My changes are in $changes , mainly in $changes/cdrskin
 changes="./libburn-release"
 
-skin_release="0.4.8"
+skin_release="0.4.2"
 patch_level=".pl00"
 skin_rev="$skin_release""$patch_level"
 
@@ -104,9 +104,9 @@ cdrskin_target="$target"/cdrskin
 libburn_target="$target"/libburn
 
 # Create version timestamp
-# timestamp="$(date -u '+%Y.%m.%d.%H%M%S')"
+timestamp="$(date -u '+%Y.%m.%d.%H%M%S')"
-# echo "$timestamp"
+echo "$timestamp"
-# echo '#define Cdrskin_timestamP "'"$timestamp"'"' >"$cdrskin_dir"/cdrskin_timestamp.h
+echo '#define Cdrskin_timestamP "'"$timestamp"'"' >"$cdrskin_dir"/cdrskin_timestamp.h
 
 # Add the cdrskin files
 if test -e "$cdrskin_target"

cdrskin/add_ts_changes_to_libburn_0_4_3

@@ -38,7 +38,7 @@ original="./libburn_svn.tgz"
 # My changes are in $changes , mainly in $changes/cdrskin
 changes="./libburn-develop"
 
-skin_release="0.4.9"
+skin_release="0.4.3"
 patch_level=""
 skin_rev="$skin_release""$patch_level"
 

cdrskin/cdrskin.1

@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH CDRSKIN 1 "May 17, 2008"
+.TH CDRSKIN 1 "September 26, 2007"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -16,7 +16,8 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-cdrskin \- burns preformatted data to CD, DVD, and BD-RE via libburn.
+cdrskin \- burns preformatted data to CD-R[W], DVD-R[W], DVD+R[W], DVD-RAM
+via libburn.
 .SH SYNOPSIS
 .B cdrskin
 .RI [ options | track_source_addresses ]
@@ -28,15 +29,13 @@ cdrskin \- burns preformatted data to CD, DVD, and BD-RE via libburn.
 .\" respectively.
 .PP 
 \fBcdrskin\fP is a program that provides some of cdrecord's options
-in a compatible way for CD media. With DVD and BD-RE it has its own ways.
+in a compatible way for CD media. With DVD it has its own ways.
 You do not need to be superuser for its daily usage.
 .SS
 .B Overview of features:
 .br
 Blanking of CD-RW and DVD-RW.
 .br
-Formatting of DVD-RW, DVD+RW, DVD-RAM, BD-RE.
-.br
 Burning of data or audio tracks to CD,
 .br
 either in versatile Track at Once mode (TAO)
@@ -45,13 +44,13 @@ or in Session at Once mode for seamless tracks.
 .br
 Multi session on CD (follow-up sessions in TAO only)
 .br
-or on DVD-R[W] (in Incremental mode) or on DVD+R[/DL].
+or on DVD-R[W] (in Incremental mode) or on DVD+R.
 .br
 Single session on DVD-RW or DVD-R (Disk-at-once).
 .br
 Single session or emulated ISO-9660 multi-session 
 .br
-on overwriteable DVD+RW, DVD-RW, DVD-RAM, BD-RE
+on overwriteable DVD+RW, DVD-RW, DVD-RAM,
 .br
 or on data file or block device.
 .br
@@ -69,7 +68,7 @@ Recordable CD Media
 .br
 Sequentially Recordable DVD Media
 .br
-Overwriteable DVD or BD Media
+Overwriteable DVD Media
 .br
 Drive preparation and addressing
 .br
@@ -97,7 +96,7 @@ These informations are also used by the operating systems' CD-ROM read drivers.
 .PP
 In general there are two types of tracks: data and audio. They differ in
 sector size, throughput and readability via the systems' CD-ROM drivers
-resp. by music CD players. With DVD and BD there is only type data.
+resp. by music CD players. With DVD there is only type data.
 .br
 If not explicitely option -audio is given, then any track is burned as type
 data, unless the track source is a file with suffix ".wav" or ".au" and has a
@@ -164,10 +163,10 @@ Multiple cycles of blanking and overwriting with random numbers might be.
 .SS
 .B Sequentially Recordable DVD Media:
 .br
-Currently DVD-RW, DVD-R and DVD+R[/DL] can be used for the Sequential recording
+Currently DVD-RW, DVD-R and DVD+R can be used for the Sequential recording
 model.
 .br
-This applies to DVD-RW only if they are in state "Sequential Recording".
+DVD-RW must be in state "Sequential Recording".
 The media must be either blank or appendable.
 Newly purchased DVD-RW and DVD-R media are in this state.
 Used DVD-RW get into blank sequential state by option
@@ -199,9 +198,9 @@ unpredicted length and to keep media appendable by option
 The only restriction towards CD-R[W] is the lack of support for -audio tracks.
 Multiple tracks per session are permissible.
 .br
-The write modes for DVD+R[/DL] resemble those with DVD-R except that with +R
+The write modes for DVD+R resemble those with DVD-R except that with DVD+R
 each track gets wrapped in an own session. There is no -dummy writing with
-DVD+R[/DL].
+DVD+R.
 .br
 Quite deliberately write mode -sao insists in the tradition of a predicted
 track size and blank media, whereas -tao writes the tracks open ended and
@@ -212,10 +211,12 @@ Option -multi might make DVD media unreadable in some DVD-ROM drives.
 Best reader compatibility is achieved without it
 (i.e. by single session media).
 .SS
-.B Overwriteable DVD or BD Media:
+.B Overwriteable DVD Media:
 .br
-Currently types DVD+RW, DVD-RW, DVD-RAM and BD-RE can be overwritten via
+Currently types DVD+RW, DVD-RW and DVD-RAM can be overwritten via cdrskin.
-cdrskin.
+.br
+DVD+RW and DVD-RAM media need no special initial formatting. They offer a
+single continuous data area for blockwise random access.
 .br
 Option -audio is not allowed. Only one track is allowed.
 Option -multi cannot mark a recognizeable end of overwriteable media.
@@ -228,12 +229,6 @@ media get treated as blank regardless wether they hold data or not.
 .br
 Currently there is no difference between -sao and -tao. If ever, then -tao
 will be the mode which preserves the current behavior.
-.PP
-DVD+RW and DVD-RAM media need no special initial formatting. They offer a
-single continuous data area for blockwise random access. BD-RE need
-explicit formatting before use. See
-.B blank=as_needed
-or blank=format_defectmgt .
 .br
 DVD-RW are sold in state "Sequential Recording". To become suitable for the
 Overwriteable DVD recording model they need to get formatted to state
@@ -336,8 +331,7 @@ original cdrecord by Joerg Schilling:
 .TP
 .BI \-atip
 Retrieve some info about media state. With CD-RW print "Is erasable".
-With DVD media print "book type:" and a media type text. With BD media
+With DVD media print "book type:" and a media type text.
-print "Mounted Media:" and media type text.
 .TP 
 .BI \-audio
 Announces that the subsequent tracks are to be burned as audio.
@@ -348,26 +342,16 @@ stereo. For little-endian byte order (which is usual on PCs) use option
 those parameters and eventually raw audio data get extracted and burned as
 audio track. Same is done for suffix ".au" and SUN Audio.
 .br
-Option -audio may be used only with CD media and not with DVD or BD.
+Option -audio may be used only with CD media and not with DVD.
 .TP 
 .BI blank= type
-Blank a CD-RW, DVD-RW, or format a DVD-RW, DVD+RW, DVD-RAM, BD-RE.
+Blank a CD-RW, a DVD-RW, or format a DVD+/-RW.
 This is combinable with burning in the same run of cdrskin.
 The type given with blank= selects the particular behavior:
 .RS
 .TP
-as_needed
+help
-Try to make the media ready for writing from scratch. If it needs formatting,
+Print this list of blanking types.
-then format it. If it is not blank, then try to apply blank=fast.
-It is a reason to abort if the media cannot assume thoroughly writeable state,
-e.g. if it is non-blank write-once.
-.br
-This leaves unformatted DVD-RW in unformatted blank state. To format DVD-RW use
-blank=format_overwriteable.
-.br
-(Note: blank=as_needed is not an original cdrecord option.)
-.TP
-The following blank types are specific to particular media familes. Use them if special features are desired.
 .TP
 all
 Blank an entire CD-RW or an unformatted DVD-RW.
@@ -377,35 +361,10 @@ fast
 Minimally blank an entire CD-RW or blank an unformatted DVD-RW.
 (See also --prodvd_cli_compatible, --grow_overwriteable_iso)
 .TP
-deformat_sequential
-Like blank=all but with the additional ability to blank overwriteable DVD-RW.
-This will destroy their formatting and make them sequentially recordable. 
-Another peculiarity is the ability to blank media which appear already blank.
-This is similar to option -force but does not try to blank media other than
-recognizable CD-RW and DVD-RW.
-.br
-(Note: blank=deformat_* are not original cdrecord options.)
-.TP
-deformat_sequential_quickest
-Like blank=deformat_sequential but blanking DVD-RW only minimally.
-This is faster than full blanking but may yield media incapable of
-Incremental Streaming (-tao).
-.TP
-format_if_needed
-Format a media if it is not overwriteably formatted yet, 
-and if cdrskin supports formatting for the media type,
-and if formatting will not happen automatically during write.
-This currently applies to unformatted DVD-RW, DVD-RAM and BD-RE.
-Eventually the appropriate default formatting is chosen.
-If other media or states are encountered then nothing happens.
-.br
-The following formatting types are more specialized to particular
-media families.
-.TP
 format_overwrite
 Format a DVD-RW to "Restricted Overwrite". The user should bring some patience.
 .br
-(Note: blank=format_* are not original cdrecord options.)
+(Note: blank=format_overwrite* are not original cdrecord options.)
 .TP
 format_overwrite_quickest
 Like format_overwrite without creating a 128 MiB trailblazer session.
@@ -424,59 +383,19 @@ This option treats already formatted media even if not option -force is given.
 For DVD+RW this is the only supported explicit formatting type. It provides
 complete "de-icing" so no reader slips on unwritten data areas.
 .TP
-format_defectmgt
+deformat_sequential
-Format DVD-RAM or BD-RE to reserve the default amount of spare blocks for
+Like blank=all but with the additional ability to blank overwriteable DVD-RW.
-defect management.
+This will destroy their formatting and make them sequentially recordable. 
+Another peculiarity is the ability to blank media which appear already blank.
+This is similar to option -force but does not try to blank media other than
+recognizable CD-RW and DVD-RW.
 .br
-The following format_defectmgt_* allow to submit user wishes which
+(Note: blank=deformat_sequential* are not original cdrecord options.)
-nevertheless have to match one of the available formats. These formats are
-offered by the drive after examining the media.
 .TP
-format_defectmgt_cert_off
+deformat_sequential_quickest
-Disable the usual media quality certification in order to save time and
+Like blank=deformat_sequential but blanking DVD-RW only minimally.
-format to default size.
+This is faster than full blanking but may yield media incapable of
-The certification setting persists even if subsequent blank= options override
+Incremental Streaming (-tao).
-the size of the format selection.
-.br
-Whether formatting without certification works properly depends much on the
-drive. One should check the "Format status:" from --list_formats afterwards.
-.TP
-format_defectmgt_cert_on
-Re-enable the usual media quality certification and format to default size.
-The certification setting persists like with format_defectmgt_cert_off.
-.br
-Whether there happens certification at all depends much on the media state
-and the actually selected format descriptor.
-.TP
-format_defectmgt_max
-Format DVD-RAM or BD-RE to reserve a maximum number of spare blocks.
-.TP
-format_defectmgt_min
-Format DVD-RAM or BD-RE to reserve a minimum number of spare blocks.
-It might be necessary to format format_defectmgt_none first in order to get
-offered the most minmal spare blocks sizes for format_defectmgt_min.
-.TP
-format_defectmgt_none
-Format DVD-RAM or BD-RE to the largest available payload in the hope to disable
-defect management at all. This seems not to have a speed increasing effect,
-though.
-.TP
-format_defectmgt_payload_<size>
-Format DVD-RAM or BD-RE. The text after "format_defectmgt_payload_" gives a
-number of bytes, eventually with suffixes "s", "k", "m". The largest number
-of spare blocks will be chosen which allows at least the given payload size.
-.TP
-format_by_index_<number>
-Format DVD-RW, DVD+RW, DVD-RAM or BD-RE.
-The number after "format_by_index_" is used as index to the list of available
-format descriptors. This list can be obtained by option --list_formats.
-The numbers after text "Format idx" are the ones to be used with
-format_by_index_. Format descriptor lists are volatile. Do neither eject
-nor write the media between the run of --list_formats and the run of
-blank=format_by_index_ or else you may get a different format than desired.
-.TP
-help
-Print this list of blanking types.
 .RE
 .TP
 .BI \-checkdrive
@@ -648,7 +567,7 @@ To retrieve an archive file which was written as follow-up session,
 you may use option -toc to learn about the "lba" of the desired track number.
 This lba is the address of the 2048 byte block where the archive begins.
 .br
-With overwriteable DVD or BD media, -multi cannot mark the end of the session.
+With overwriteable DVD media, -multi cannot mark the end of the session.
 So when adding a new session this end has to be determined from the payload.
 Currently only ISO-9660 filesystems can be used that way. See option
 .B \--grow_overwriteable_iso
@@ -679,7 +598,7 @@ One should use it only if inavoidable.
 .TP
 .BI \-sao
 Write CD in Session At Once mode, a sequential DVD-R[W] in Disc-at-once
-(DAO) mode, or a DVD+R[/DL].
+(DAO) mode, or a DVD+R.
 .br
 With CD this mode is able to put several audio tracks on media without
 producing audible gaps between them.
@@ -687,8 +606,8 @@ producing audible gaps between them.
 With DVD-R[W] this mode can only write a single track.
 No -multi is allowed with DVD-R[W] -sao.
 .br
--sao is permissible with overwriteable DVD, BD or DVD+R[/DL] but actually
+-sao is permissible with overwriteable DVD and with DVD+R but actually only
-only imposes restrictions without providing known advantages. 
+imposes restrictions without providing known advantages. 
 .br
 -sao can only be used for tracks of fixely predicted size. This implies that
 track arguments which depict stdin or named pipes need to be preceeded by
@@ -712,7 +631,6 @@ Bus,Target,Lun Number) 'Vendor' 'Mode' 'Revision'
 .BI speed= number
 Set speed of drive. With data CD, 1x speed corresponds to a throughput of
 150,000 bytes/second. With DVD, 1x = 1,385,000 bytes/second.
-With BD 1x = 4,495,625 bytes/second.
 It is not an error to set a speed higher than is suitable for drive
 and media. One should stay within a realistic speed range, though.
 Special speed settings are:
@@ -729,8 +647,8 @@ suffix ".wav".
 .TP
 .BI \-tao
 Write CD in Track At Once (TAO) mode, sequential DVD-R[W] in Incremental
-Streaming mode, or DVD+R[/DL] without traditional -sao restrictions.
+Streaming mode, or DVD+R without traditional -sao restrictions.
-This mode also applies pro-forma to overwriteable media
+This mode also applies pro-forma to overwriteable DVD media.
 .br
 Mode -tao can be used with track sources of unpredictable size, like standard
 input or named pipes. It is also the only mode that can be used for writing
@@ -860,9 +778,8 @@ be the only finalization. It is advised to eject the media afterwards because
 the write operations circumvent the usual system i/o with its caches and
 buffers. By ejecting, those invalid memory copies get surely discarded.
 .br
-Only few media can be written this way: DVD-RAM, BD-RE, RVD+RW and
+Only few media can be written this way: DVD-RAM, RVD+RW and overwriteable
-overwriteable DVD-RW. Writing is restricted to the already formatted
+DVD-RW. Writing is restricted to the already formatted area of the media.
-area of the media.
 .br
 Writing starts at byte 0 of the media or at the address given by option
 .B write_start_address= .
@@ -877,7 +794,7 @@ padded up to the necessary size by zeros. Size -1 revokes direct writing
 and switches back to normal session oriented writing.
 .br
 Both, write_start_address and direct_write_amount size must be aligned to a
-media dependend transaction size. With DVD-RAM, BD-RE, DVD+RW this is 2k, with
+media dependend transaction size. With DVD-RAM and DVD+RW this is 2k, with
 overwriteable DVD-RW it is 32k.
 .TP
 .BI fallback_program= command
@@ -957,16 +874,6 @@ With multi-session DVD, blank=fast will act like dvd+rw-format -blank=full .
 .br
 growisofs -dvd-compat is roughly equivalent to cdrskin without option -multi.
 .TP
-.BI \--list_formats
-List the available format descriptors as reported by the drive for the
-loaded media. Each descriptor line begins with "Format idx" and the
-descriptor's list index, followed by a ":", the format type, the number
-of payload blocks and that same number converted to MiB.
-.br
-The meaning of the format types is defined by the MMC standard
-with command FORMAT UNIT. A user will more be interested in the
-sizes than in the types.
-.TP
 .BI \--list_ignored_options
 List all ignored cdrecord options. The "-" options cannot be used as addresses
 of track sources. No track source address may begin with a text equal to an
@@ -1023,8 +930,8 @@ This option redirects to stderr all message output except its own result
 string and eventual output of -msinfo.
 .TP 
 .BI write_start_address= byte_offset
-Set the address on media where to start writing the track. With DVD+RW, DVD-RAM 
+Set the address on media where to start writing the track. With DVD+RW or
-or BD-RE byte_offset must be aligned to 2 kiB blocks, but better is 32 kiB.
+DVD-RAM byte_offset must be aligned to 2 kiB blocks, but better is 32 kiB.
 With DVD-RW 32 kiB alignment is mandatory.
 .br
 Other media are not suitable for this option yet.
@@ -1044,6 +951,8 @@ tested. Currently this applies to :
 .br
 Profile 0015h , DVD-R/DL Sequential (will not allow -multi).
 .br
+Profile 002Bh , DVD+R/DL.
+.br
 If you really test such media, then please report the outcome on
 libburn-hackers@pykix.org 
 .TP
@@ -1175,13 +1084,6 @@ Linux specific:
 Use and report literal Bus,Target,Lun addresses rather than real SCSI and
 pseudo ATA addresses. This method is outdated and was never compatible with
 original cdrecord.
-.TP
-.BI stream_recording="on"|"off"
-By setting "on" request that compliance to the desired speed setting is
-preferred over management of write errors. With DVD-RAM and BD-RE this can
-bring effective write speed near to the nominal write speed of the media.
-But it will also disable the automatic use of replacement blocks
-if write errors occur. It might as well be disliked or ignored by the drive.
 .br
 .SH EXAMPLES
 .SS
@@ -1201,9 +1103,11 @@ cdrskin dev=ATA:1,0,0 -v -atip
 .br
 cdrskin dev=/dev/hdc -toc
 .SS
-.B Prepare CD-RW or DVD-RW for re-use, DVD-RAM or BD-RE for first use:
+.B Make used CD-RW or used unformatted DVD-RW writable again:
 .br
-cdrskin -v dev=/dev/sg1 blank=as_needed -eject
+cdrskin -v dev=/dev/sg1 blank=fast -eject
+.br
+cdrskin -v dev=/dev/dvd blank=all -eject
 .SS
 .B Format DVD-RW to avoid need for blanking before re-use:
 .br
@@ -1217,7 +1121,7 @@ cdrskin -v dev=/dev/sr0 blank=deformat_sequential
 .br
 cdrskin -v dev=/dev/hdc speed=12 fs=8m \\
 .br
-blank=as_needed -eject padsize=300k my_image.iso
+-sao -eject padsize=300k my_image.iso
 .SS
 .B Write compressed afio archive on-the-fly (not possible with minimally blanked DVD-RW):
 .br
@@ -1225,17 +1129,17 @@ find . | afio -oZ - | \\
 .br
 cdrskin -v dev=0,1,0 fs=32m speed=8 \\
 .br
-blank=as_needed padsize=300k -
+-tao padsize=300k -
 .SS
-.B Write multi-session to the same CD, DVD-R[W] or DVD+R[/DL]:
+.B Write multi-session to the same CD, DVD-R[W] or DVD+R:
 .br
-cdrskin dev=/dev/hdc -v padsize=300k -multi 1.iso
+cdrskin dev=/dev/hdc -v padsize=300k -multi -tao 1.iso
 .br
-cdrskin dev=/dev/hdc -v padsize=300k -multi 2.iso
+cdrskin dev=/dev/hdc -v padsize=300k -multi -tao 2.iso
 .br
-cdrskin dev=/dev/hdc -v padsize=300k -multi 3.iso
+cdrskin dev=/dev/hdc -v padsize=300k -multi -tao 3.iso
 .br
-cdrskin dev=/dev/hdc -v padsize=300k 4.iso
+cdrskin dev=/dev/hdc -v padsize=300k -tao 4.iso
 .SS
 .B Get multi-session info for option -C of program mkisofs:
 .br
@@ -1243,9 +1147,9 @@ c_values=$(cdrskin dev=/dev/hdc -msinfo 2>/dev/null)
 .br
 mkisofs ... -C "$c_values" ...
 .SS
-.B Inquire free space on media for a -multi run:
+.B Inquire free space on media for a -tao -multi run:
 .br
-x=$(cdrskin dev=/dev/sr0 -multi \\
+x=$(cdrskin dev=/dev/sr0 -tao -multi \\
 .br
 --tell_media_space 2>/dev/null)
 .br
@@ -1310,25 +1214,23 @@ Formatting data track sources for cdrskin:
 .br
 .BR mkisofs (8),
 .BR genisoimage (8),
-.BR xorriso (1),
 .BR afio (1),
 .BR star (1)
 .br
 .TP
-Other CD/DVD/BD burn programs:
+Other CD/DVD burn programs:
 .br
 .BR cdrecord (1),
-.BR wodim (1),
+.BR wodim (1)
-.BR xorriso (1)
 .br
 .TP
-For DVD/BD burning (also tutor of libburn's DVD/BD capabilities):
+For DVD burning (also tutor of libburn's DVD capabilities):
 .br
 .BR growisofs (1)
 .br
 .SH AUTHOR
 cdrskin was written by Thomas Schmitt <scdbackup@gmx.net>.
 .PP
-This manual page was started by George Danchev <danchev@spnet.net> and
+This manual page was written by George Danchev <danchev@spnet.net> and
-is now maintained by Thomas Schmitt.
+Thomas Schmitt, for the Debian project and for all others.
 

cdrskin/cdrskin.c

@@ -7,7 +7,7 @@ A cdrecord compatible command line interface for libburn.
 
 This project is neither directed against original cdrecord nor does it exploit
 any source code of said program. It rather tries to be an alternative method
-to burn CD, DVD, or BD, which is not based on the same code as cdrecord.
+to burn CD or DVD, which is not based on the same code as cdrecord.
 See also :  http://scdbackup.sourceforge.net/cdrskin_eng.html
 
 Interested users of cdrecord are encouraged to contribute further option
@@ -88,7 +88,7 @@ or
 
 /** The official program version */
 #ifndef Cdrskin_prog_versioN
-#define Cdrskin_prog_versioN "0.4.8"
+#define Cdrskin_prog_versioN "0.4.2"
 #endif
 
 /** The official libburn interface revision to use.
@@ -101,7 +101,7 @@ or
 #define Cdrskin_libburn_minoR 4
 #endif
 #ifndef Cdrskin_libburn_micrO
-#define Cdrskin_libburn_micrO 8
+#define Cdrskin_libburn_micrO 2
 #endif
 
 
@@ -135,44 +135,44 @@ or
 #endif /* Cdrskin_libburn_cvs_A60220_tS */
 
 
-#ifdef Cdrskin_libburn_0_4_8
+#ifdef Cdrskin_libburn_0_4_2
-#define Cdrskin_libburn_versioN "0.4.8"
+#define Cdrskin_libburn_versioN "0.4.2"
 #define Cdrskin_libburn_from_pykix_svN 1
-#endif /* Cdrskin_libburn_0_4_8 */
+#endif /* Cdrskin_libburn_0_4_2 */
 
-#ifdef Cdrskin_libburn_0_4_9
+#ifdef Cdrskin_libburn_0_4_3
-#define Cdrskin_libburn_versioN "0.4.9"
+#define Cdrskin_libburn_versioN "0.4.3"
 #define Cdrskin_libburn_from_pykix_svN 1
 
 /* Place novelty switch macros here. 
    Move them down to Cdrskin_libburn_from_pykix_svN on version leap
 */
 
-/* there are no libburn novelties in 0.4.9 yet */
+/* there are no novelties in 0.4.3 yet */
 
-#endif /* Cdrskin_libburn_0_4_9 */
+#endif /* Cdrskin_libburn_0_4_3 */
 
 #ifndef Cdrskin_libburn_versioN
-#define Cdrskin_libburn_0_4_8
+#define Cdrskin_libburn_0_4_2
-#define Cdrskin_libburn_versioN "0.4.8"
+#define Cdrskin_libburn_versioN "0.4.2"
 #define Cdrskin_libburn_from_pykix_svN 1
 #endif
 
-#ifdef Cdrskin_libburn_0_4_8
+#ifdef Cdrskin_libburn_0_4_2
 #undef Cdrskin_libburn_majoR
 #undef Cdrskin_libburn_minoR
 #undef Cdrskin_libburn_micrO
 #define Cdrskin_libburn_majoR 0
 #define Cdrskin_libburn_minoR 4
-#define Cdrskin_libburn_micrO 6
+#define Cdrskin_libburn_micrO 2
 #endif
-#ifdef Cdrskin_libburn_0_4_9
+#ifdef Cdrskin_libburn_0_4_3
 #undef Cdrskin_libburn_majoR
 #undef Cdrskin_libburn_minoR
 #undef Cdrskin_libburn_micrO
 #define Cdrskin_libburn_majoR 0
 #define Cdrskin_libburn_minoR 4
-#define Cdrskin_libburn_micrO 7
+#define Cdrskin_libburn_micrO 3
 #endif
 
 
@@ -240,16 +240,8 @@ or
 #define Cdrskin_libburn_has_drive_equals_adR 1
 
 /* 0.4.2 */
-/* no novel libburn features but rather organizational changes */
+/* no novel features but rather organizational changes */
 
-/* 0.4.4 */
-/* novel libburn features are transparent to cdrskin */
-
-/* 0.4.6 */
-#define Cdrskin_libburn_has_stream_recordinG 1
-
-/* 0.4.8 */
-/* Bug fix release for  write_start_address=... on DVD-RAM and BD-RE */
 
 #ifdef Cdrskin_new_api_tesT
 
@@ -1917,53 +1909,19 @@ int Cdrpreskin_initialize_lib(struct CdrpreskiN *preskin, int flag)
 {
  int ret, major, minor, micro;
 
-/* This is the minimum requirement of cdrskin towards the libburn header
-   at compile time.
-   It gets compared against the version macros in libburn/libburn.h :
-     burn_header_version_major
-     burn_header_version_minor
-     burn_header_version_micro
-   If the header is too old then the following code shall cause failure of
-   cdrskin compilation rather than to allow production of a program with
-   unpredictable bugs or memory corruption.
-   The compiler message supposed to appear in this case is:
-      error: 'LIBBURN_MISCONFIGURATION' undeclared (first use in this function)
-      error: 'INTENTIONAL_ABORT_OF_COMPILATION__HEADERFILE_libburn_dot_h_TOO_OLD__SEE_cdrskin_dot_c' undeclared (first use in this function)
-      error: 'LIBBURN_MISCONFIGURATION_' undeclared (first use in this function)
-*/
-
-/* The indendation is an advise of man gcc to help old compilers ignoring */
- #if Cdrskin_libburn_majoR > burn_header_version_major
- #define Cdrskin_libburn_dot_h_too_olD 1
- #endif
- #if Cdrskin_libburn_majoR == burn_header_version_major && Cdrskin_libburn_minoR > burn_header_version_minor
- #define Cdrskin_libburn_dot_h_too_olD 1
- #endif
- #if Cdrskin_libburn_minoR == burn_header_version_minor && Cdrskin_libburn_micrO > burn_header_version_micro
- #define Cdrskin_libburn_dot_h_too_olD 1
- #endif
-
-#ifdef Cdrskin_libburn_dot_h_too_olD
-LIBBURN_MISCONFIGURATION = 0;
-INTENTIONAL_ABORT_OF_COMPILATION__HEADERFILE_libburn_dot_h_TOO_OLD__SEE_cdrskin_dot_c = 0;
-LIBBURN_MISCONFIGURATION_ = 0;
-#endif
-
  ret= burn_initialize();
  if(ret==0) {
    fprintf(stderr,"cdrskin: FATAL : Initialization of libburn failed\n");
    return(0);
  }
-
- /* This is the runtime check towards eventual dynamically linked libburn.
-    cdrskin deliberately does not to allow the library to be older than
-    the header file which was seen at compile time. More liberal would be
-    to use here Cdrskin_libburn_* instead of burn_header_version_* .
- */
  burn_version(&major, &minor, &micro);
- if(major<burn_header_version_major || 
+
-    (major==burn_header_version_major && (minor<burn_header_version_minor ||
+ /* <<< for testing only */
-     (minor==burn_header_version_minor && micro<burn_header_version_micro)))) {
+ /* major= 0; minor= 3; micro= 6; */
+
+ if(major<Cdrskin_libburn_majoR || 
+    (major==Cdrskin_libburn_majoR && (minor<Cdrskin_libburn_minoR ||
+     (minor==Cdrskin_libburn_minoR && micro<Cdrskin_libburn_micrO)))) {
    fprintf(stderr,"cdrskin: FATAL : libburn version too old: %d.%d.%d . Need at least: %d.%d.%d .\n",
           major, minor, micro,
           Cdrskin_libburn_majoR, Cdrskin_libburn_minoR, Cdrskin_libburn_micrO);
@@ -2396,27 +2354,15 @@ return:
      fprintf(stderr,"\tfast\t\tminimally blank the entire disk\n");
      fprintf(stderr,"\tminimal\t\tminimally blank the entire disk\n");
      fprintf(stderr,
-         "\tas_needed\tblank or format media to make it ready for (re-)use\n");
+          "\tformat_overwrite\tformat a DVD-RW to \"Restricted Overwrite\"\n");
-     fprintf(stderr,
-          "\tdeformat_sequential\t\tfully blank, even formatted DVD-RW\n");
-     fprintf(stderr,
-          "\tdeformat_sequential_quickest\tminimally blank, even DVD-RW\n");
-     fprintf(stderr,
-          "\tformat_if_needed\t\tmake overwriteable if needed and possible\n");
-     fprintf(stderr,
-        "\tformat_overwrite\t\tformat a DVD-RW to \"Restricted Overwrite\"\n");
      fprintf(stderr,
     "\tformat_overwrite_quickest\tto \"Restricted Overwrite intermediate\"\n");
      fprintf(stderr,
-          "\tformat_overwrite_full\t\tfull-size format a DVD-RW or DVD+RW\n");
+          "\tformat_overwrite_full\tfull-size format a DVD-RW or DVD+RW\n");
      fprintf(stderr,
-          "\tformat_defectmgt[_max|_min|_none]\tformat DVD-RAM or BD-RE\n");
+          "\tdeformat_sequential\tfully blank, even formatted DVD-RW\n");
      fprintf(stderr,
-         "\tformat_defectmgt[_cert_on|_cert_off]\tcertification slow|quick\n");
+          "\tdeformat_sequential_quickest\tminimally blank, even DVD-RW\n");
-     fprintf(stderr,
-          "\tformat_defectmgt_payload_<size>\tformat DVD-RAM or BD-RE\n");
-     fprintf(stderr,
-        "\tformat_by_index_<number>\t\tformat by index from --list_formats\n");
 
 #else /* ! Cdrskin_extra_leaN */
 
@@ -2606,7 +2552,7 @@ set_dev:;
 
      printf("\n");
      printf("Usage: %s [options|source_addresses]\n", argv[0]);
-     printf("Burns preformatted data to CD or DVD via libburn.\n");
+     printf("Burns preformatted data to CD-R, CD-RW or DVD+RW via libburn.\n");
      printf("For the cdrecord compatible options which control the work of\n");
      printf(
       "blanking and burning see output of option -help rather than --help.\n");
@@ -2670,7 +2616,6 @@ set_dev:;
     " --grow_overwriteable_iso  emulate multi-session on media like DVD+RW\n");
      printf(
        " --ignore_signals   try to ignore any signals rather than to abort\n");
-     printf(" --list_formats     list format descriptors for loaded media.\n");
      printf(" --list_ignored_options list all ignored cdrecord options.\n");
 #ifdef Cdrskin_libburn_has_set_waitinG
      printf(" modesty_on_drive=<options> no writing into full drive buffer\n");
@@ -2687,13 +2632,6 @@ set_dev:;
      printf(
           " --single_track     accept only last argument as source_address\n");
 
-#ifdef Cdrskin_libburn_has_stream_recordinG
-     printf(
-        " stream_recording=\"on\"|\"off\"  \"on\" requests to prefer speed\n");
-     printf(
-        "                                  over write error management.\n");
-#endif
-
 #ifdef Cdrskin_allow_libburn_taO
      printf(
           " tao_to_sao_tsize=<num>  use num as fixed track size if in a\n");
@@ -2889,9 +2827,7 @@ set_severities:;
 
      printf(
 "Cdrecord 2.01-Emulation Copyright (C) 2006-2008, see libburnia-project.org\n");
-     printf("libburn interface :  %d.%d.%d\n",
+     printf("libburn interface :  %s\n",Cdrskin_libburn_versioN);
-            burn_header_version_major, burn_header_version_minor,
-            burn_header_version_micro);
      burn_version(&major, &minor, &micro);
      printf("libburn in use    :  %d.%d.%d\n", major, minor, micro);
 
@@ -3078,8 +3014,6 @@ ex:;
 static double Cdrskin_cd_speed_factoR= 150.0*1024.0;
 /** The DVD payload speed factor for reporting progress: 1x */
 static double Cdrskin_dvd_speed_factoR= 1385000;
-/** The BD payload speed factor for reporting progress: 1x */
-static double Cdrskin_bd_speed_factoR= 4495625;
 
 /** The effective payload speed factor for reporting progress */
 static double Cdrskin_speed_factoR= 150.0*1024.0;
@@ -3089,7 +3023,6 @@ static double Cdrskin_speed_factoR= 150.0*1024.0;
 */
 static double Cdrskin_libburn_cd_speed_factoR= 176.4;
 static double Cdrskin_libburn_dvd_speed_factoR= 1385.0;
-static double Cdrskin_libburn_bd_speed_factoR= 4495.625;
 
 /* The effective speed conversion factor for burn_drive_set_speed() */
 static double Cdrskin_libburn_speed_factoR= 176.4;
@@ -3099,7 +3032,6 @@ static double Cdrskin_libburn_speed_factoR= 176.4;
 */
 static double Cdrskin_libburn_cd_speed_addoN= 40.0;
 static double Cdrskin_libburn_dvd_speed_addoN= 1.0; /*poor accuracy with 2.4x*/
-static double Cdrskin_libburn_bd_speed_addoN= 1.0;
 static double Cdrskin_libburn_speed_addoN = 40.0;
 
 
@@ -3116,7 +3048,6 @@ struct CdrskiN {
  int gracetime;
  int dummy_mode;
  int force_is_set;
- int stream_recording_is_set;
  int single_track;
  int prodvd_cli_compatible;
 
@@ -3132,60 +3063,21 @@ struct CdrskiN {
  char msifile[Cdrskin_strleN];
 
  int do_atip;
- int do_list_formats;
 
  int do_blank;
  int blank_fast;
  int no_blank_appendable;
- int blank_format_type; /* bit0-7: job type
+ int blank_format_type; /* 0=blank
-                           0=blank
+                           bit0-7:
-                           1=format_overwrite for DVD+RW, DVD-RW
+                           1=format_overwrite
                              bit8-15: bit0-7 of burn_disc_format(flag)
                                bit8 = write zeros after formatting
                                bit9 = insist in size 0
                                bit10= format to maximum available size
-                               bit11= - reserved -
-                               bit12= - reserved -
-                               bit13= - reserved -
-                               bit14= - reserved -
-                               bit15= format by index
                            2=deformat_sequential (blank_fast might matter)
                            3=format (= format_overwrite restricted to DVD+RW)
-                           4=format_defectmgt for DVD-RAM, BD-RE
-                             bit8-15: bit0-7 of burn_disc_format(flag)
-                               bit8 = write zeros after formatting
-                               bit9+10: size mode
-                               0 = use parameter size as far as it makes sense
-                               1 = (identical to size mode 0)
-                               2 = without bit7: format to maximum size
-                                   with bit7   : take size from indexed format
-                                                 descriptor
-                               3 = without bit7: format to default size
-                                   with bit7   : take size from indexed format
-                                                 descriptor
-                               bit11= - reserved -
-                               bit12= - reserved -
-                               bit13= try to disable defect management
-                               bit14= - reserved -
-                               bit15= format by index
-                           5=format_by_index
-                             gets mapped to 4 with DVD-RAM and BD-RE else to 1,
-                             bit15 should be set and bit16-23 should contain
-                             a usable index number
-                           6=format_if_needed
-                             gets mapped to default variants of specialized
-                             formats if the media state requires formatting
-                             before writing
-                           7=if_needed
-                             gets mapped to 6 for DVD-RAM and BD-RE,
-                             to 0 with all other non-blanks
-
-                           bit8-15: bit0-7 of burn_disc_format(flag)
-                                    depending on job type
                         */
- int blank_format_index;   /* bit8-15 of burn_disc_format(flag) */
  double blank_format_size; /* to be used with burn_disc_format() */
- int blank_format_no_certify;
 
  int do_direct_write;
  int do_burn;
@@ -3331,7 +3223,6 @@ int Cdrskin_new(struct CdrskiN **skin, struct CdrpreskiN *preskin, int flag)
  o->gracetime= 0;
  o->dummy_mode= 0;
  o->force_is_set= 0;
- o->stream_recording_is_set= 0;
  o->single_track= 0;
  o->prodvd_cli_compatible= 0;
  o->do_devices= 0;
@@ -3341,14 +3232,11 @@ int Cdrskin_new(struct CdrskiN **skin, struct CdrpreskiN *preskin, int flag)
  o->do_msinfo= 0;
  o->msifile[0]= 0;
  o->do_atip= 0;
- o->do_list_formats= 0;
  o->do_blank= 0;
  o->blank_fast= 0;
  o->no_blank_appendable= 0;
  o->blank_format_type= 0;
- o->blank_format_index= -1;
  o->blank_format_size= 0.0;
- o->blank_format_no_certify= 0;
  o->do_direct_write= 0;
  o->do_burn= 0;
  o->tell_media_space= 0;
@@ -3778,10 +3666,6 @@ int Cdrskin_grab_drive(struct CdrskiN *skin, int flag)
      Cdrskin_speed_factoR= Cdrskin_dvd_speed_factoR;
      Cdrskin_libburn_speed_factoR= Cdrskin_libburn_dvd_speed_factoR;
      Cdrskin_libburn_speed_addoN= Cdrskin_libburn_dvd_speed_addoN;
-   } else if(strstr(profile_name,"BD")==profile_name) {
-     Cdrskin_speed_factoR= Cdrskin_bd_speed_factoR;
-     Cdrskin_libburn_speed_factoR= Cdrskin_libburn_bd_speed_factoR;
-     Cdrskin_libburn_speed_addoN= Cdrskin_libburn_bd_speed_addoN;
    }
  }
 #endif /* Cdrskin_libburn_has_get_profilE */
@@ -4312,13 +4196,11 @@ int Cdrskin_invalidate_iso_head(struct CdrskiN *skin, int flag)
     @param flag Bitfield for control purposes: 
                 bit0= permission to check for overwriteable ISO image
                 bit1= do not report media profile
-                bit2= do not report but only check for pseudo appendable
-    @return 1=ok, 2=ok, is pseudo appendable, <=0 error
 */
 int Cdrskin_report_disc_status(struct CdrskiN *skin, enum burn_disc_status s,
                                int flag)
 {
- int ret, iso_size, pseudo_appendable= 0;
+ int ret, iso_size;
 
  if(flag&1) {
    if(skin->media_is_overwriteable && skin->grow_overwriteable_iso>0) {
@@ -4326,14 +4208,10 @@ int Cdrskin_report_disc_status(struct CdrskiN *skin, enum burn_disc_status s,
        ret= 1;
      else
        ret= Cdrskin_overwriteable_iso_size(skin,&iso_size,0);
-     if(ret>0) {
+     if(ret>0)
        s= BURN_DISC_APPENDABLE;
-       pseudo_appendable= 1;
-     }
    }
  } 
- if(flag&4)
-   return(1+pseudo_appendable);
 
  printf("cdrskin: status %d ",s);
  if(s==BURN_DISC_FULL) {
@@ -4361,7 +4239,7 @@ int Cdrskin_report_disc_status(struct CdrskiN *skin, enum burn_disc_status s,
    printf("-unknown status code-\n");
 
  if(flag&2)
-   return(1+pseudo_appendable);
+   return(1);
 
 #ifdef Cdrskin_libburn_has_get_profilE
  if((s==BURN_DISC_FULL || s==BURN_DISC_APPENDABLE || s==BURN_DISC_BLANK ||
@@ -4383,7 +4261,7 @@ int Cdrskin_report_disc_status(struct CdrskiN *skin, enum burn_disc_status s,
  }
 #endif
 
- return(1+pseudo_appendable);
+ return(1);
 }
 
 
@@ -4557,8 +4435,7 @@ int Cdrskin_checkdrive(struct CdrskiN *skin, char *profile_name, int flag)
  if(drive_info->sao_block_types & BURN_BLOCK_SAO)
    printf(" SAO");
  if((drive_info->raw_block_types & BURN_BLOCK_RAW96R) &&
-    strstr(profile_name,"DVD")!=profile_name &&
+    strstr(profile_name,"DVD")!=profile_name)
-    strstr(profile_name,"BD")!=profile_name)
    printf(" RAW/RAW96R");
  printf("\n");
 
@@ -4870,8 +4747,6 @@ int Cdrskin_atip(struct CdrskiN *skin, int flag)
    printf("book type:       %s (emulated booktype)\n", profile_name);
    if(profile_number==0x13) /* DVD-RW */
      printf("cdrskin: message for sdvdbackup: \"(growisofs mode Restricted Overwrite)\"\n");
- } else if(strstr(profile_name,"BD")==profile_name) {
-   printf("Mounted Media:   %2.2Xh, %s\n", profile_number, profile_name);
  } else {
    printf("ATIP info from disk:\n");
    if(burn_disc_erasable(drive)) {
@@ -4915,83 +4790,6 @@ ex:;
 }
 
 
-/** Perform --list_formats
-    @param flag Bitfield for control purposes:
-    @return <=0 error, 1 success
-*/
-int Cdrskin_list_formats(struct CdrskiN *skin, int flag)
-{
- struct burn_drive *drive;
- int ret, i, status, num_formats, profile_no, type;
- off_t size;
- unsigned dummy;
- char status_text[80], profile_name[90];
-
-#ifdef Cdrskin_libburn_has_burn_disc_formaT
-
- ret= Cdrskin_grab_drive(skin,0);
- if(ret<=0)
-   return(ret);
- drive= skin->drives[skin->driveno].drive;
-
- ret = burn_disc_get_formats(drive, &status, &size, &dummy,
-                             &num_formats);
- if(ret <= 0) {
-   fprintf(stderr, "cdrskin: SORRY: Cannot obtain format list info\n");
-   ret= 0; goto ex;
- }
- ret= burn_disc_get_profile(drive, &profile_no, profile_name);
- printf("Media current: ");
- if(profile_no > 0 && ret > 0) {
-   if(profile_name[0])
-     printf("%s\n", profile_name);
-   else
-     printf("%4.4Xh\n", profile_no);
- } else
-   printf("is not recognizable\n");
-
- if(status == BURN_FORMAT_IS_UNFORMATTED)
-   sprintf(status_text, "unformatted, up to %.1f MiB",
-                        ((double) size) / 1024.0 / 1024.0);
- else if(status == BURN_FORMAT_IS_FORMATTED) {
-   if(profile_no==0x12 || profile_no==0x13 || profile_no==0x1a ||
-      profile_no==0x43)
-     sprintf(status_text, "formatted, with %.1f MiB",
-                         ((double) size) / 1024.0 / 1024.0);
-   else
-     sprintf(status_text, "written, with %.1f MiB",
-                         ((double) size) / 1024.0 / 1024.0);
- } else if(status == BURN_FORMAT_IS_UNKNOWN) {
-   if (profile_no > 0)
-     sprintf(status_text, "intermediate or unknown");
-   else
-     sprintf(status_text, "no media or unknown media");
- } else
-   sprintf(status_text, "illegal status according to MMC-5");
- printf("Format status: %s\n", status_text);
-
- for (i = 0; i < num_formats; i++) {
-   ret= burn_disc_get_format_descr(drive, i, &type, &size, &dummy);
-   if (ret <= 0)
- continue;
-   printf("Format idx %-2d: %2.2Xh , %.fs , %.1f MiB\n",
-          i, type, ((double) size) / 2048.0, ((double) size) / 1024.0/1024.0);
- }
- ret= 1;
-ex:;
- Cdrskin_release_drive(skin,0);
- return(ret);
-
-#else /* Cdrskin_libburn_has_burn_disc_formaT */
-
- fprintf(stderr,
-         "cdrskin: SORRY: libburn is too old to obtain format list info\n");
- return(0);
-
-#endif /* Cdrskin_libburn_has_burn_disc_formaT */
-}
-
-
 #ifndef Cdrskin_extra_leaN
 
 /* A70324: proposal by Eduard Bloch */
@@ -5086,17 +4884,13 @@ int Cdrskin_blank(struct CdrskiN *skin, int flag)
  struct burn_progress p;
  struct burn_drive *drive;
  int ret,loop_counter= 0,hint_force= 0,do_format= 0, profile_number= -1;
- int wrote_well= 1, format_flag= 0, status, num_formats;
+ int wrote_well= 1;
- off_t size;
- unsigned dummy;
  double start_time;
  char *verb= "blank", *presperf="blanking", *fmt_text= "...";
  char profile_name[80];
  static char fmtp[][40]= {
-                  "...", "format_overwrite", "deformat_sequential",
+                  "format_default", "format_overwrite", "deformat_sequential"};
-                  "(-format)", "format_defectmgt", "format_by_index",
+ static int fmtp_max= 2;
-                  "format_if_needed", "as_needed"};
- static int fmtp_max= 7;
 
  start_time= Sfile_microtime(0); /* will be refreshed later */
  ret= Cdrskin_grab_drive(skin,0);
@@ -5110,11 +4904,13 @@ int Cdrskin_blank(struct CdrskiN *skin, int flag)
    burn_disc_get_profile(skin->grabbed_drive,&profile_number,profile_name);
 #endif
 
- ret= Cdrskin_report_disc_status(skin,s,
+ if(skin->verbosity>=Cdrskin_verbose_progresS)
-                           1|(4*!(skin->verbosity>=Cdrskin_verbose_progresS)));
+   Cdrskin_report_disc_status(skin,s,1);
- if(ret==2)
-   s= BURN_DISC_APPENDABLE;
  do_format= skin->blank_format_type & 0xff;
+ if(do_format == 1 || do_format == 3) {
+   verb= "format";
+   presperf= "formatting";
+ }
 
 #ifdef Cdrskin_libburn_has_pretend_fulL
  if(s==BURN_DISC_UNSUITABLE) {
@@ -5130,47 +4926,7 @@ int Cdrskin_blank(struct CdrskiN *skin, int flag)
  if(do_format)
    if(do_format>=0 && do_format<=fmtp_max)
      fmt_text= fmtp[do_format];
- if(do_format==5) { /* format_by_index */
-   if(profile_number == 0x12 || profile_number == 0x43)
-     do_format= 4;
-   else
-     do_format= 1;
- } else if(do_format==6 || do_format==7) { /* format_if_needed , as_needed */
-   /* Find out whether format is needed at all.
-      Eventuelly set up a suitable formatting run
-   */
-   if(profile_number == 0x14 && do_format==6) { /* sequential DVD-RW */
-     do_format= 1;
-     skin->blank_format_type= 1|(1<<8);
-     skin->blank_format_size= 128*1024*1024;
-   } else if(profile_number == 0x12 ||
-             profile_number == 0x43) { /* DVD-RAM , BD-RE */;
-#ifdef Cdrskin_libburn_has_burn_disc_formaT
-     ret= burn_disc_get_formats(drive, &status, &size, &dummy, &num_formats);
-     if(ret>0 && status!=BURN_FORMAT_IS_FORMATTED) {
-       do_format= 4;
-       skin->blank_format_type= 4|(3<<9);  /* default payload size */
-       skin->blank_format_size= 0;
-     }
-#endif
-   } else if(do_format==7) { /* try to blank what is not blank yet */
-     if(s!=BURN_DISC_BLANK) {
-       do_format= 0;
-       skin->blank_fast= 1;
-     }
-   }
-   if(do_format==6 || do_format==7) {
-     if(skin->verbosity>=Cdrskin_verbose_cmD)
-       ClN(fprintf(stderr,
-        "cdrskin: NOTE : blank=%s : no need for action detected\n", fmt_text));
-     {ret= 2; goto ex;}
-   }
- }
 
- if(do_format == 1 || do_format == 3 || do_format == 4) {
-   verb= "format";
-   presperf= "formatting";
- }
  if(do_format==2) {
    /* Forceful blanking to Sequential Recording for DVD-R[W] and CD-RW */
 
@@ -5208,26 +4964,12 @@ int Cdrskin_blank(struct CdrskiN *skin, int flag)
        fprintf(stderr,
        "cdrskin: NOTE : blank=format_... : DVD+RW do not need this\n");
        fprintf(stderr,
-      "cdrskin: HINT : For de-icing use option blank=format_overwrite_full\n");
+       "cdrskin: HINT : For de-icing use option blank=format_overwrite_full");
        {ret= 2; goto ex;}
      }
    } else {
      fprintf(stderr,
-            "cdrskin: SORRY : blank=%s for now does DVD-RW and DVD+RW only\n",
+            "cdrskin: SORRY : blank=%s for now does DVD+/-RW only\n",fmt_text);
-            fmt_text);
-     {ret= 0; goto ex;}
-   }
-   if(s==BURN_DISC_UNSUITABLE)
-     fprintf(stderr,
-         "cdrskin: NOTE : blank=%s accepted not yet suitable media\n",
-         fmt_text);
-
- } else if(do_format==4) {
-   /* Formatting and influencing defect management of DVD-RAM , BD-RE */
-   if(!(profile_number == 0x12 || profile_number == 0x43)) {
-     fprintf(stderr,
-            "cdrskin: SORRY : blank=%s for now does DVD-RAM and BD-RE only\n",
-            fmt_text);
      {ret= 0; goto ex;}
    }
    if(s==BURN_DISC_UNSUITABLE)
@@ -5297,8 +5039,7 @@ unsupported_format_type:;
  Cdrskin_adjust_speed(skin,0);
 
 #ifndef Cdrskin_extra_leaN
- Cdrskin_wait_before_action(skin,
+ Cdrskin_wait_before_action(skin,1+(do_format==1 || do_format==3));
-                            1+(do_format==1 || do_format==3 || do_format==4));
 #endif /* ! Cdrskin_extra_leaN */
 
  skin->drive_is_busy= 1;
@@ -5306,15 +5047,9 @@ unsupported_format_type:;
    burn_disc_erase(drive,skin->blank_fast);
 
 #ifdef Cdrskin_libburn_has_burn_disc_formaT
- } else if(do_format==1 || do_format==3 || do_format==4) {
+ } else if(do_format==1 || do_format==3) {
-   format_flag= (skin->blank_format_type>>8)&(1|2|4|32|128);
+   burn_disc_format(drive,(off_t) skin->blank_format_size,
-   if(skin->force_is_set)
+            ((skin->blank_format_type>>8)&0xff) | ((!!skin->force_is_set)<<4));
-     format_flag|= 16;
-   if(format_flag&128)
-     format_flag|= (skin->blank_format_index&255)<<8;
-   if(skin->blank_format_no_certify)
-     format_flag|= 64;
-   burn_disc_format(drive,(off_t) skin->blank_format_size,format_flag);
 #endif
 
  } else {
@@ -5348,8 +5083,7 @@ blanking_done:;
            "\rcdrskin: %s done                                        \n",
            presperf);
    printf("%s time:   %.3fs\n",
-          (do_format==1 || do_format==3 || do_format==4 ?
+          (do_format==1 || do_format==3?"Formatting":"Blanking"),
-           "Formatting":"Blanking"),
           Sfile_microtime(0)-start_time);
  }
  fflush(stdout);
@@ -6456,9 +6190,6 @@ burn_failed:;
 #ifdef Cdrskin_libburn_has_set_forcE
  burn_write_opts_set_force(o, !!skin->force_is_set);
 #endif
-#ifdef Cdrskin_libburn_has_stream_recordinG
- burn_write_opts_set_stream_recording(o, !!skin->stream_recording_is_set);
-#endif
 
  if(skin->dummy_mode) {
    fprintf(stderr,
@@ -6978,7 +6709,7 @@ sorry_failed_to_eject:;
 */
 int Cdrskin_setup(struct CdrskiN *skin, int argc, char **argv, int flag)
 {
- int i,k,l,ret,source_has_size=0, idx= -1;
+ int i,k,l,ret,source_has_size=0;
  double value,grab_and_wait_value= -1.0;
  char *cpt,*value_pt,adr[Cdrskin_adrleN],*blank_mode= "";
  struct stat stbuf;
@@ -7147,62 +6878,21 @@ set_blank:;
        skin->do_blank= 1;
        skin->blank_fast= 1;
        blank_mode= "fast";
-     } else if(strcmp(cpt,"format_if_needed")==0) {
+     } else if(strcmp(cpt,"format_overwrite")==0) { 
-       skin->do_blank= 1;
-       skin->blank_format_type= 6;
-       skin->preskin->demands_cdrskin_caps= 1;
-     } else if(strcmp(cpt,"format_overwrite")==0) {
        skin->do_blank= 1;
        skin->blank_format_type= 1|(1<<8);
        skin->blank_format_size= 128*1024*1024;
        skin->preskin->demands_cdrskin_caps= 1;
-     } else if(strcmp(cpt,"format_overwrite_full")==0) {
+     } else if(strcmp(cpt,"format_overwrite_full")==0) { 
        skin->do_blank= 1;
        skin->blank_format_type= 1|(1<<10);
        skin->blank_format_size= 0;
        skin->preskin->demands_cdrskin_caps= 1;
-     } else if(strcmp(cpt,"format_overwrite_quickest")==0) {
+     } else if(strcmp(cpt,"format_overwrite_quickest")==0) { 
        skin->do_blank= 1;
        skin->blank_format_type= 1;
        skin->blank_format_size= 0;
        skin->preskin->demands_cdrskin_caps= 1;
-     } else if(strncmp(cpt,"format_defectmgt",16)==0) {
-       skin->do_blank= 1;
-       skin->blank_format_type= 4|(3<<9);  /* default payload size */
-       skin->blank_format_size= 0;
-       skin->preskin->demands_cdrskin_caps= 1;
-       if(cpt[16]=='_') {
-         cpt+= 17;
-         if(strcmp(cpt,"none")==0)
-           skin->blank_format_type= 4|(1<<13);
-         else if(strcmp(cpt,"max")==0)
-           skin->blank_format_type= 4;  /* smallest payload size above 0 */
-         else if(strcmp(cpt,"min")==0)
-           skin->blank_format_type= 4|(2<<9); /*largest payload size with mgt*/
-         else if(strncmp(cpt,"payload_",8)==0) {
-           skin->blank_format_size= Scanf_io_size(cpt+8,0);
-           skin->blank_format_type= 4;
-         } else if(strcmp(cpt,"cert_off")==0)
-           skin->blank_format_no_certify= 1;
-         else if(strcmp(cpt,"cert_on")==0)
-           skin->blank_format_no_certify= 0;
-         else
-           goto unsupported_blank_option;
-       }
-       skin->preskin->demands_cdrskin_caps= 1;
-     } else if(strncmp(cpt,"format_by_index_",16)==0) {
-       sscanf(cpt+16, "%d", &idx);
-       if(idx<0 || idx>255) { 
-         fprintf(stderr,"cdrskin: SORRY : blank=%s provides unusable index\n",
-                 cpt);
-         return(0);
-       }
-       skin->do_blank= 1;
-       skin->blank_format_type= 5|(2<<9)|(1<<15);
-       skin->blank_format_index= idx;
-       skin->blank_format_size= 0;
-       skin->preskin->demands_cdrskin_caps= 1;
-
      } else if(strcmp(cpt,"deformat_sequential")==0) {
        skin->do_blank= 1;
        skin->blank_format_type= 2;
@@ -7213,14 +6903,10 @@ set_blank:;
        skin->blank_format_type= 2;
        skin->blank_fast= 1;
        skin->preskin->demands_cdrskin_caps= 1;
-     } else if(strcmp(cpt,"as_needed")==0) {
+     } else if(strcmp(cpt,"help")==0) { 
-       skin->do_blank= 1;
-       skin->blank_format_type= 7;
-     } else if(strcmp(cpt,"help")==0) {
        /* is handled in Cdrpreskin_setup() */;
  continue;
      } else { 
-unsupported_blank_option:;
        fprintf(stderr,"cdrskin: FATAL : Blank option '%s' not supported yet\n",
                       cpt);
        return(0);
@@ -7484,13 +7170,8 @@ gracetime_equals:;
    } else if(strcmp(argv[i],"-isosize")==0) {
      skin->use_data_image_size= 1;
 
-   } else if(strcmp(argv[i],"--list_formats")==0) {
-     skin->do_list_formats= 1;
-     skin->preskin->demands_cdrskin_caps= 1;
-
    } else if(strcmp(argv[i],"--list_ignored_options")==0) {
      char line[80];
-     /* is also handled in Cdrpreskin_setup() */;
 
      line[0]= 0;
      printf("cdrskin: List of all ignored options:\n");
@@ -7708,17 +7389,6 @@ set_speed:;
      if(skin->verbosity>=Cdrskin_verbose_cmD)
        ClN(printf("cdrskin: speed : %f\n",skin->x_speed));
 
-   } else if(strncmp(argv[i],"-stream_recording=",18)==0) {
-     value_pt= argv[i]+18;
-     goto set_stream_recording;
-   } else if(strncmp(argv[i],"stream_recording=",17)==0) {
-     value_pt= argv[i]+17;
-set_stream_recording:;
-     if(strcmp(value_pt, "on")==0)
-       skin->stream_recording_is_set= 1;
-     else
-       skin->stream_recording_is_set= 0;
-
    } else if(strcmp(argv[i],"-swab")==0) {
      skin->swap_audio_bytes= 0;
 
@@ -8137,13 +7807,6 @@ int Cdrskin_run(struct CdrskiN *skin, int *exit_value, int flag)
    if(ret<=0)
      {*exit_value= 7; goto ex;}
  }
- if(skin->do_list_formats) {
-   if(skin->n_drives<=0)
-     {*exit_value= 14; goto no_drive;}
-   ret= Cdrskin_list_formats(skin, 0);
-   if(ret<=0)
-     {*exit_value= 14; goto ex;}
- }
  if(skin->do_blank) {
    if(skin->n_drives<=0)
      {*exit_value= 8; goto no_drive;}

cdrskin/cdrskin_eng.html

@@ -2,7 +2,7 @@
 
 <HEAD>
 <META NAME="description" CONTENT="cdrskin, a limited cdrecord compatibility wrapper for libburn">
-<META NAME="keywords" CONTENT="cdrskin, libburn, libburnia, burn, CD, DVD, linux, recording, burning, CD-R, CD-RW, DVD-R, DVD-RW, DVD+RW, DVD+R, DVD+R/DL, DVD-RAM, BD-RE, cdrecord, compatible, scdbackup">
+<META NAME="keywords" CONTENT="cdrskin, libburn, libburnia, burn, CD, DVD, linux, recording, burning, CD-R, CD-RW, DVD-R, DVD-RW, DVD+RW, DVD+R, cdrecord, compatible, scdbackup">
 <META NAME="robots" CONTENT="follow">
 <TITLE>cdrskin homepage english</TITLE>
 </HEAD>
@@ -17,27 +17,26 @@
 </A>
 <P><H2> Homepage of </H2>
 <H1> cdrskin </H1>
+<!-- <FONT SIZE=+0><A HREF="cdrskin_ger.html">deutsch (german)</A></FONT> -->
 
 <H2>Limited cdrecord compatibility wrapper for libburn</H2>
 </CENTER>
 
 <P>
 <H2>Purpose:</H2>
-Burns preformatted data to CD, DVD, and BD media:<BR>
+Burns preformatted data to CD and single layer DVD media:<BR>
-CD-R, DVD-R, DVD+R, DVD+R/DL, CD-RW, DVD-RW, DVD-RAM, DVD+RW, BD-RE
+CD-R, DVD-R, DVD+R, CD-RW, DVD-RW, DVD-RAM, DVD+RW
 </P>
 <P>
 
 <HR>
 
-<A HREF="#download">Direct hop to download links -></A>
-
 <P>
 <H2>Hardware requirements:</H2>
-A CD/DVD/BD recorder suitable for 
+A CD/DVD recorder suitable for 
 <A HREF="http://libburnia-project.org">http://libburnia-project.org</A> <BR>
 (SCSI , ATA , USB , or SATA writers compliant to standard MMC-3 for CD
-and to MMC-5 for DVD or BD).
+and to MMC-5 for DVD).
 <BR>
 </P>
 
@@ -57,10 +56,10 @@ and to MMC-5 for DVD or BD).
 GPL software included:<BR>
 </H2>
 <DL>
-<DT>libburn-0.4.8</DT>
+<DT>libburn-0.4.2</DT>
 <DD>(founded by Derek Foreman and Ben Jansens,
 furthered by team of libburnia-project.org)</DD>
-<DD>transfers data to CD, DVD, BD-RE</DD>
+<DD>transfers data to CD and DVD</DD>
 </DL>
 </P>
 
@@ -85,10 +84,10 @@ Ports to other usable systems are appreciated. Reports are welcome.
 <DL>
 <DT>The most common options of cdrecord for data and audio on CD media
 are provided in a compatible way.<BR>
-On all DVD media except DVD-R DL, cdrskin is able to perform any recording job
+On single layer DVD media cdrskin is able to perform any recording job
 which is possible with cdrecord.
-Other than with cdrecord, option -multi is supported with many DVD types and
+Other than with cdrecord, options -multi and -tao are supported with
-write mode -tao works with anything but quickly blanked DVD-RW.
+certain DVD types.
 </DT>
 <BR><BR>
 <DT>Get an overview of drives and their addresses</DT>
@@ -106,8 +105,9 @@ as listed by option --devices.</DT>
 <DD>$<KBD>&nbsp;cdrskin dev=ATA:1,0,0 -v -atip</KBD></DD>
 <DD>$<KBD>&nbsp;cdrskin dev=/dev/hdc -toc</KBD></DD>
 
-<DT>Prepare CD-RW or DVD-RW for re-use, DVD-RAM or BD-RE for first use:</DT>
+<DT>Make used CD-RW or used unformatted DVD-RW writable again:</DT>
-<DD>$<KBD>&nbsp;cdrskin -v dev=/dev/sg1 blank=as_needed -eject</KBD></DD>
+<DD>$<KBD>&nbsp;cdrskin -v dev=/dev/sg1 blank=fast -eject</KBD></DD>
+<DD>$<KBD>&nbsp;cdrskin -v dev=/dev/dvd blank=all -eject</KBD></DD>
 
 <DT>Format DVD-RW to avoid need for blanking before re-use:</DT>
 <DD>$<KBD>&nbsp;cdrskin -v dev=/dev/sr0 blank=format_overwrite</KBD></DD>
@@ -118,28 +118,28 @@ as listed by option --devices.</DT>
 <DT>Write ISO-9660 filesystem image as only one to blank or formatted media:
 </DT>
 <DD>$<KBD>&nbsp;cdrskin -v dev=/dev/hdc speed=12 fs=8m \</KBD></DD>
-<DD><KBD>&nbsp;&nbsp;blank=as_needed -eject padsize=300k my_image.iso</KBD></DD>
+<DD><KBD>&nbsp;&nbsp;-sao -eject padsize=300k my_image.iso</KBD></DD>
 
 <DT>Write compressed afio archive on-the-fly:</DT>
 <DD>$<KBD>&nbsp;find . | afio -oZ - | \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp;cdrskin -v dev=0,1,0 fs=32m speed=8 \</KBD></DD>
-<DD><KBD>&nbsp;&nbsp;blank=as_needed padsize=300k -</KBD></DD>
+<DD><KBD>&nbsp;&nbsp;-tao padsize=300k -</KBD></DD>
 
-<DT>Write several sessions to the same CD, DVD-R[W] or DVD+R[/DL]:</DT>
+<DT>Write several sessions to the same CD, DVD-R[W] or DVD+R:</DT>
-<DD>$<KBD>&nbsp;cdrskin dev=/dev/hdc -v padsize=300k -multi 1.iso</KBD>
+<DD>$<KBD>&nbsp;cdrskin dev=/dev/hdc -v padsize=300k -multi -tao 1.iso</KBD>
 </DD>
-<DD>$<KBD>&nbsp;cdrskin dev=/dev/hdc -v padsize=300k -multi 2.iso</KBD>
+<DD>$<KBD>&nbsp;cdrskin dev=/dev/hdc -v padsize=300k -multi -tao 2.iso</KBD>
 </DD>
-<DD>$<KBD>&nbsp;cdrskin dev=/dev/hdc -v padsize=300k -multi 3.iso</KBD>
+<DD>$<KBD>&nbsp;cdrskin dev=/dev/hdc -v padsize=300k -multi -tao 3.iso</KBD>
 </DD>
-<DD>$<KBD>&nbsp;cdrskin dev=/dev/hdc -v padsize=300k 4.iso</KBD></DD>
+<DD>$<KBD>&nbsp;cdrskin dev=/dev/hdc -v padsize=300k -tao 4.iso</KBD></DD>
 
 <DT>Get multi-session info for option -C of program mkisofs:</DT>
 <DD>$<KBD>&nbsp;c_values=$(cdrskin dev=/dev/sr0 -msinfo 2>/dev/null)</KBD></DD>
 <DD>$<KBD>&nbsp;mkisofs ... -C "$c_values" ...</KBD></DD>
 
-<DT>Inquire free space on media for a -multi run:</DT>
+<DT>Inquire free space on media for a -tao -multi run:</DT>
-<DD>$<KBD>&nbsp;x=$(cdrskin dev=/dev/sr0 -multi \</KBD></DD>
+<DD>$<KBD>&nbsp;x=$(cdrskin dev=/dev/sr0 -tao -multi \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp;--tell_media_space 2>/dev/null)</KBD></DD>
 <DD>$<KBD>&nbsp;echo "Available: $x blocks of 2048 data bytes"</KBD></DD>
 
@@ -166,28 +166,18 @@ man cdrecord</A></KBD></DD>
  this "don't bother Joerg" demand.)
 </DD>
 </DL>
-<DL>
-<DT>Learn to know a more versatile way to burn ISO 9660 formatted data</DT>
-<DD>
-Standalone ISO 9660 multi-session CD/DVD tool
-<A HREF="http://scdbackup.sourceforge.net/xorriso_eng.html">xorriso</A>.
-</DD>
-</DL>
 
-Testers wanted who are willing to risk some DVD-R DL media
+Testers wanted who are willing to risk some double layer DVD media.
-or to do experiments on BD-R media.
 
 </P>
 
 <HR>
 
-<A NAME="download"></A>
-
 <P>
 <DL>
 <DT>Download as source code (see README):</DT>
-<DD><A HREF="cdrskin-0.4.8.pl00.tar.gz">cdrskin-0.4.8.pl00.tar.gz</A>
+<DD><A HREF="cdrskin-0.4.2.pl00.tar.gz">cdrskin-0.4.2.pl00.tar.gz</A>
-(730 KB).
+(700 KB).
 </DD>
 <DD>
 The cdrskin tarballs are source code identical with libburn releases
@@ -195,8 +185,6 @@ of the same version number.
 They get produced via a different procedure, though.<BR>
 cdrskin is part of libburn - full libburn is provided with cdrskin releases.
 </DD>
-
-<!-- This is not offered any more since spring 2008
 <DD>&nbsp;</DD>
 <DT>Download as single x86 binaries (untar and move to /usr/bin/cdrskin):</DT>
 <DD><A HREF="cdrskin_0.4.2.pl00-x86-suse9_0.tar.gz">
@@ -211,9 +199,6 @@ cdrskin_0.4.2.pl00-x86-suse9_0-static.tar.gz</A>, (310 KB), -static compiled,
 <DD>runs on SuSE 7.2 (2.4.4), and on the systems above.</DD>
 </DL>
 </DD>
--->
-
-
 </DL>
 <DL><DT>Documentation:</DT>
 <DD><A HREF="README_cdrskin">README</A> an introduction</DD>
@@ -236,17 +221,17 @@ cdrskin_0.4.2.pl00-x86-suse9_0-static.tar.gz</A>, (310 KB), -static compiled,
 <HR>
 
 <P>
-Enhancements towards previous stable version cdrskin-0.4.6.pl00:
+Enhancements towards previous stable version cdrskin-0.4.0:
 <UL>
-<LI>none</LI>
+<LI>Safe dynamic linking possible with libburn.so.4</LI>
 </UL>
 
 <!--
--->
+ Bug fixes towards cdrskin-0.4.2.pl00:
-Bug fixes towards cdrskin-0.4.6.pl00:
 <UL>
-<LI>Random access addressing for DVD-RAM and BD-RE did not work</LI>
+<LI>none yet</LI>
 </UL>
+-->
 
 </P>
 
@@ -254,26 +239,25 @@ Bug fixes towards cdrskin-0.4.6.pl00:
 
 <P>
 <DL>
-<DT><H3>Development snapshot, version 0.4.9 :</H3></DT>
+<DT><H3>Development snapshot, version 0.4.3 :</H3></DT>
-<DD>Enhancements towards current stable version 0.4.8.pl00:
+<DD>Enhancements towards stable version 0.4.2.pl00:
 <UL>
+<LI>none yet</LI>
 <!--
 -->
-<LI>none yet</LI>
-
 </UL>
 </DD>
 <DD>&nbsp;</DD>
-<DD><A HREF="README_cdrskin_devel">README 0.4.9</A>
+<DD><A HREF="README_cdrskin_devel">README 0.4.3</A>
-<DD><A HREF="cdrskin__help_devel">cdrskin_0.4.9 --help</A></DD>
+<DD><A HREF="cdrskin__help_devel">cdrskin_0.4.3 --help</A></DD>
-<DD><A HREF="cdrskin_help_devel">cdrskin_0.4.9 -help</A></DD>
+<DD><A HREF="cdrskin_help_devel">cdrskin_0.4.3 -help</A></DD>
-<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 0.4.9)</A></DD>
+<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 0.4.3)</A></DD>
 <DD>&nbsp;</DD>
 <DT>Maintainers of cdrskin unstable packages please use SVN of
 <A HREF="http://libburnia-project.org"> libburnia-project.org</A></DT>
 <DD>Download: <KBD><B>svn co http://svn.libburnia-project.org/libburn/trunk libburn</B>
 </KBD></DD>
-<DD>Build: <KBD><B>cd libburn ; ./bootstrap ; ./configure --prefix /usr ; make ; cdrskin/compile_cdrskin.sh</B>
+<DD>Build: <KBD><B>cd libburn ; ./bootstrap ; ./configure --prefix /usr ; make</B>
 </KBD></DD>
 <DD>Build of SVN versions needs <A HREF="http://sources.redhat.com/autobook/">
 autotools</A> of at least version 1.7 installed.
@@ -281,20 +265,15 @@ But after the run of <KBD>./bootstrap</KBD>, only
 vanilla tools like make and gcc are needed.</DD>
 </DD>
 <DD>&nbsp;</DD>
-<DT>The following download is intended for adventurous end users or
+<DT>The following downloads are intended for adventurous end users or
 admins with full system souvereignty.</DT>
 <DD>Source (./bootstrap is already applied, build tested, for more see
 <A HREF="README_cdrskin_devel">upcoming README</A> ):
 </DD>
 <DD>
-<A HREF="cdrskin-0.4.9.tar.gz">cdrskin-0.4.9.tar.gz</A>
+<A HREF="cdrskin-0.4.3.tar.gz">cdrskin-0.4.3.tar.gz</A>
-(730 KB).
+(700 KB).
 </DD>
-
-<!-- This is not offered any more since spring 2008
-
-<DT>The following downloads are intended for adventurous end users or
-admins with full system souvereignty.</DT>
 <DD>Binary (untar and move to /usr/bin/cdrskin):</DD>
 <DD><A HREF="cdrskin_0.4.3-x86-suse9_0.tar.gz">
 cdrskin_0.4.3-x86-suse9_0.tar.gz</A>, (110 KB).
@@ -302,8 +281,6 @@ cdrskin_0.4.3-x86-suse9_0.tar.gz</A>, (110 KB).
 <DD><A HREF="cdrskin_0.4.3-x86-suse9_0-static.tar.gz">
 cdrskin_0.4.3-x86-suse9_0-static.tar.gz</A>, (310 KB)
 </DD>
--->
-
 </DL>
 </P>
 
@@ -351,8 +328,6 @@ Example how to setup K3b to use cdrskin for burning data CD projects.
 is a GUI frontend which uses cdrecord for CD burning.)
 </P>
 
-<!--
-
 <HR>
 
 <A NAME="scdbackup">
@@ -407,8 +382,6 @@ and try again.
 </DL>
 </P>
 
--->
-
 <HR>
 
 <A NAME="cdrecord">
@@ -421,7 +394,7 @@ cdrecord but not vice versa.
 I am a long time user of cdrecord and it works fine for me. 
 Especially i do appreciate its write mode -tao which allows to pipe arbitrary
 data on CD and CD-RW via stdin. cdrecord is reliable, versatile and well
-maintained. So for me - there would be no problem with it.
+maintained. So for me - there would be not problem with it.
 <BR>
 But the author of cdrecord and the Linux kernel people foster a very hostile 
 relationship. Ok, that's their business, not mine (or ours if you are with me).
@@ -468,25 +441,13 @@ and by <A HREF="http://sourceforge.net">sourceforge.net</A><BR>
 <HR>
 <DL>
 <DT>Links to my other published software projects :
-<DD><A HREF="http://scdbackup.webframe.org/xorriso_eng.html">
-xorriso, a standalone ISO 9660 multi-session CD/DVD burn tool.
-No mkisofs needed.
-<DL>
-<DD>
-<A HREF="http://scdbackup.sourceforge.net/xorriso_eng.html">
-(a second source of above)</A>
-</DD>
-</DL>
-</DD>
 <DD><A HREF=http://scdbackup.webframe.org/main_eng.html>
 scdbackup, multi volume CD backup</A>
 <DL><DD><A HREF=http://scdbackup.sourceforge.net/main_eng.html> 
-(a second source of above)</A></DD></DL></DD>
+(a second source of above)</A></DL>
 <DD><A HREF=http://stic.sourceforge.net>Some Tools for Image Collectors</A>
-</DD>
 <DD><A HREF=http://scdbackup.webframe.org/pppoem>
 pppoem, a DSL throughput monitor (mainly for Linux kernel 2.4)</A>
-</DD>
 </DL>
 <BR><BR>
 Legal statement: This website does not serve any commercial purpose.<BR>

cdrskin/cdrskin_timestamp.h

@@ -1 +1 @@
-#define Cdrskin_timestamP "2008.05.17.080001"
+#define Cdrskin_timestamP "2008.02.01.100001"

cdrskin/changelog.txt

@@ -5037,553 +5037,18 @@ Updated changelog before release
 ----------------------------- release  - cdrskin-0.4.2.pl00 - 2008.02.01.100001
 * Safe dynamic linking possible with libburn.so.4
 
------------------------------------- cycle  - cdrskin-0.4.3 - 2008.02.01.225039
+------------------------------------ cycle  - cdrskin-0.4.3 - 2008.
 
-2008.02.03.092013  [1463]
-libburn/libdax_msgs.h
-Registered error code range "libisofs-xorriso"
 
-2008.02.03.092134  [1464]
-configure.ac
-Incremented LT_* to get libburn.so.4.8.0 (forgot to do 4.7.1 anyway)
-
-2008.02.03.092509  [1465]
-libburn/libburn.h
-libburn/init.c
-New API call burn_sev_to_text()
-
-4 Feb 2008  [1473]
-README
-Announced deprecation of libisofs-0.2.x, temporory employment of libisofs-0.6.1
-
-2008.02.04.175209  [1474]
-libburn/libdax_msgs.h
-Registered range "libisoburn" 0x00060000 to 0x00006ffff
-
-2008.02.06.174009  [1482]
-libburn/libdax_msgs.h
-Re-instated range "vreixo" with old and new codes, adjusted severity definitions
-
-2008.02.06.182222  [1483]
-libburn/libburn.h
-Copied usage discussion about *_header_version_* from libisoburn
-
-2008.02.06.230041  [1488]
-libburn/read.c
-Installed a simple address logger in burn_read_data
-
-2008.02.07.232820  [1492]
-libburn/read.c
-Added debug message in case of burn_read_data() return 0
-
-2008.02.08.073414  [1493]
-libburn/mmc.c
-Allowed DVD +/- DL for reading
-
-2008.02.11.190802  [1518]
-libburn/libdax_msgs.h
-libburn/libdax_msgs.c
-Introduced LIBDAX_MSGS_SEV_MISHAP
-
-2008.02.14.074108  [1522]
-libburn/libburn.h
-Micro corrections in comment text
-
-14 Feb 2008  [1523]
-COPYRIGHT
-Updated year
-
-14 Feb 2008  [1524]
-cdrskin/README
-Pointed to ldconfig
-
-2008.02.16.121102  [1541]
-configure.ac
-Corrected typo in comment
-
-16 Feb 2008  [1542]
-doc/comments
-README
-cdrskin/wiki_plain.txt
-Updated project interrelations
-
-2008.02.21.200956  [1554]
-libburn/sg-linux.c
-Testwise inquiry of ioctl(CDROM_MEDIA_CHANGED) (disabled by default)
-
-21 Feb 2008  [1555]
-test/libburner.c
-Directed error message to proper output channel
-
-2008.02.21.201238  [1556]
-libburn/libdax_msgs.h
-libburn/libdax_msgs.c
-Introduced severity ERRFILE
-
-2008.02.21.202216  [1557]
-libburn/libdax_msgs.c
-Mapped unknown severity text to ALL rather than NEVER
-
-2008.02.21.215250  [1560]
-libburn/libdax_msgs.h
-Weakened demand to print file path in following message 
-
-2008.02.22.150939  [1562]
-libburn/libdax_msgs.h
-libburn/init.c
-New error code 0x00040008
-
-2008.02.22.213527  [1563]
-libburn/libdax_msgs.h
-libburn/libdax_msgs.c
-Imported changes from libiso_msgs.h
-
-2008.02.22.213726  [1564]
-libburn/init.c
-Changed meaning of unrecognized severity texts from FATAL to ALL
-
-2008.02.28.123152  [1565]
-libburn/libburn.h
-libburn/spc.c
-libburn/mmc.c
-libburn/write.c
-cdrskin/cdrskin.1
-Made support for DVD+R DL official, enabled untested support for BD-RE
-
-2008.02.28.132325  [1586]
-libburn/mmc.c
-cdrskin/README
-cdrskin/cdrskin.c
-cdrskin/cdrskin_eng.html
-cdrskin/wiki_plain.txt
-test/libburner.c
-Mentioned support for DVD+R/DL.
-
------------------------------------- cycle  - cdrskin-0.4.3 - 2008.03.01.154319
-* Support for DVD+R/DL media is now official
-* Experimental code for BD-RE with --allow_untested_media
-
-1 Mar 2008  [1595]
-cdrskin/changelog.txt
-Updated changelog
-
-2008.03.03.202930  [1598]
-libburn/libburn.h
-libburn/drive.c
-libburn/read.c
-Got rid of a cumbersome open-close cycle with burn_read_data() on stdio:
-
-2 Apr 2008  [1654]
-COPYRIGHT
-Corrected GPL version
-
------------------------------------- cycle  - cdrskin-0.4.3 - 2008.04.07.152331
-* libburn: Improved read performance from stdio: pseudo-drives
-
-2008.04.08.100001  [ZeroFourFour 1669]
-Makefile.am
-configure.ac
-README
-libburn/libburn.h (burn_header_version_*)
-cdrskin/cdrskin.c 
-cdrskin/README
-cdrskin/compile_cdrskin.sh
-cdrskin/cdrskin_timestamp.h
-cdrskin/wiki_plain.txt
-cdrskin/cdrskin_eng.html
-doc/comments
-Made number transition and activated development documentation
-
-8 Apr 2008  [ZeroFourFour 1670]
-- cdrskin/add_ts_changes_to_libburn_0_4_2
-- cdrskin/add_ts_changes_to_libburn_0_4_3
-+ cdrskin/add_ts_changes_to_libburn_0_4_4
-+ cdrskin/add_ts_changes_to_libburn_0_4_5
-Updated cdrskin tarball generator
-
-8 Apr 2008  [ZeroFourFour 1671]
-cdrskin/changelog.txt
-Documented changes and release timestamp
-
-2008.04.08.100001  [ZeroFourFour 1672]
-libburn/util.c
-Switched from configure.ac versioning to libburn.h versioning
-
-8 Apr 2008  [ZeroFourFour 1673]
-cdrskin/changelog.txt
-Documented last minute changes
-
------------------------------ release  - cdrskin-0.4.4.pl00 - 2008.04.08.100001
-* Support for DVD+R/DL media is now official
-* Experimental code for BD-RE with --allow_untested_media
-* libburn: Improved read performance from stdio: pseudo-drives
-
-
-2008.04.08.132344  [1674]
-Makefile.am
-configure.ac
-README
-libburn/libburn.h (burn_header_version_*)
-cdrskin/cdrskin.c 
-cdrskin/README
-cdrskin/compile_cdrskin.sh
-cdrskin/cdrskin_timestamp.h
-cdrskin/wiki_plain.txt
-cdrskin/cdrskin_eng.html
-doc/comments
-cdrskin/changelog.txt
-Made number transition
-
-8 Apr 2008 [1675]
-- cdrskin/add_ts_changes_to_libburn_0_4_2
-- cdrskin/add_ts_changes_to_libburn_0_4_3
-+ cdrskin/add_ts_changes_to_libburn_0_4_4
-+ cdrskin/add_ts_changes_to_libburn_0_4_5
-Updated cdrskin tarball generator
-
-2008.04.08.133452  [1676]
-libburn/util.c
-Switched from configure.ac versioning to libburn.h versioning
-
------------------------------------- cycle  - cdrskin-0.4.5 - 2008.04.08.134413
-
-2008.04.10.211529  [1681]
-libburn/mmc.c
-libburn/drive.c
-cdrskin/cdrskin.c
-Trying to fix bugs about BD-RE, macro for simulating BD-RE on DVD-RAM
-
-
------------------------------------- cycle  - cdrskin-0.4.5 - 2008.04.10.211529
-
-2008.04.12.164244  [1683]
-libburn/libburn.h
-libburn/transport.h
-libburn/options.h
-libburn/options.c
-libburn/write.c
-libburn/drive.c
-libburn/mmc.c
-New API call burn_write_opts_set_stream_recording()
-
-2008.04.12.164606  [1684]
-cdrskin/cdrskin.c
-cdrskin/cdrskin.1
-cdrskin/cdrskin_eng.html
-New option stream_recording=on|off
-
------------------------------------- cycle  - cdrskin-0.4.5 - 2008.04.12.164930
-* New option stream_recording=on can speed up DVD-RAM
-
-
-2008.04.15.094133  [1685]
-libburn/os-linux.h
-libburn/write.c
-Enforced tail padding with stream_recording, enlarged transport buffer
-
-15 Apr 2008  [1686]
-cdrskin/cdrskin.1
-Some adjustments of cdrskin man page
-
------------------------------------- cycle  - cdrskin-0.4.5 - 2008.04.15.094545
-
-2008.04.16.082208  [1687]
-libburn/read.c
-Made burn_read_data() obey its flag bit1
-
-2008.04.18.092715  [1688]
-libburn/libburn.h
-libburn/async.c
-libburn/drive.c
-libburn/mmc.c
-Began to implement formatting of DVD-RAM and experimentally of BD-RE
-
-2008.04.18.092816  [1689]
-cdrskin/cdrskin.c
-cdrskin/cdrskin.1
-Began to implement formatting of DVD-RAM and experimentally of BD-RE
-
-2008.04.18.194602  [1691]
-libburn/mmc.c
-Adjustments with DVD-RAM formatting
-
-2008.04.22.161139  [1695]
-libburn/libburn.h
-libburn/transport.h
-libburn/mmc.c
-libburn/drive.c
-cdrskin/cdrskin.c
-cdrskin/cdrskin.1
-Adjustments with DVD-RAM formatting
-
-2008.04.22.200949  [1696]
-cdrskin/cdrskin.c
-cdrskin/cdrskin.1
-New option --list_formats
-
-2008.04.23.110116  [1697]
-libburn/mmc.c
-cdrskin/cdrskin.c
-cdrskin/cdrskin.1
-New blank type blank=format_by_index_<number>
-
-24 Apr 2008  [1698]
-doc/cookbook.txt
-Wrote down what was learned about DVD-RAM formatting
-
-24 Apr 2008  [1699]
-cdrskin/cdrskin_eng.html
-Mentioned new features
-
-2008.04.25.131531  [1700]
-libburn/mmc.c
-Preparations for formatting BD-RE
-
-2008.04.25.132353  [1701]
-cdrskin/cdrskin.c
-cdrskin/cdrskin.1
-Documented experimental support for BD-RE formatting
-
-25 Apr 2008  [1702]
-configure.ac
-Incremented LT_CURRENT and LT_AGE to reflect API enhancements
-
-25 Apr 2008  [1703]
-cdrskin/cdrskin_eng.html
-Documented newest enhancements
-
------------------------------------- cycle  - cdrskin-0.4.5 - 2008.04.25.134438
-* New blank type blank=format_defectmgt for DVD-RAM
-* New option --list_formats
-* New blank type blank=format_by_index_<number>
-* Experimental support for formatting BD-RE
-
-
-2008.04.26.150646  [1704]
-libburn/libburn.h
-libburn/mmc.c
-libburn/drive.c
-doc/cookbook.txt
-Enabled quick formatting with DVD-RAM, made slow formatting default with BD-RE
-
-2008.04.26.150945  [1705]
-cdrskin/cdrskin.c
-cdrskin/cdrskin.1
-New blank subtypes format_defectmgt_cert_[on|off], on is default
-
-2008.04.27.084704  [1706]
-cdrskin/cdrskin.c
-cdrskin/cdrskin.1
-New blank type format_if_needed
-
-2008.04.27.140144  [1707]
-cdrskin/cdrskin.c
-cdrskin/cdrskin.1
-New blank type as_needed
-
-27 Apr 2008  [1708]
-cdrskin/cdrskin_eng.html
-Documented newest enhancements
-
------------------------------------- cycle  - cdrskin-0.4.5 - 2008.04.27.163625
-* New blank type blank=as_needed for automatic handling of media type and state
-
-
-3 May 2008  [1723]
-README
-Updated project history
-
-2008.05.06.082429  [1729]
-libburn/drive.c
-Avoided to report negative burn_multi_caps.start_range_high with DVD-RW
-
-2008.05.06.084156  [1730]
-libburn/mmc.c
-Mapped undefined size to 0 with burn_disc_get_formats() and DVD-RW
-
-2008.05.06.180813  [1733]
-libburn/libburn.h
-libburn/drive.c
-libburn/mmc.c
-doc/cookbook.txt
-doc/comments
-test/libburner.c
-Declared BD-RE to be supported
-
-2008.05.06.181100  [1734]
-cdrskin/cdrskin.c
-cdrskin/cdrskin.1
-cdrskin/wiki_plain.txt
-Declared BD-RE to be supported
-
-2008.05.06.181723  [1735]
-libburn/mmc.c
-Declared BD-RE to be supported
-
-6 May 2008  [1736]
-cdrskin/cdrskin_eng.html
-cdrskin/cdrskin.1
-Declared BD-RE to be supported
-
------------------------------------- cycle  - cdrskin-0.4.5 - 2008.05.06.183436
-* Support for BD-RE media is now official
-
-2008.05.09.143130  [1748]
-libburn/libburn.h
-Documented read-only profiles CD-ROM and DVD-ROM
-
-2008.05.09.145205  [1749]
-libburn/mmc.c
-Allowed BD-ROM and BD-R for read-only purposes
-
-9 May 2008  [1750]
-cdrskin/cdrskin.1
-Changed blank examples to blank=as_needed
-
-
------------------------------------- cycle  - cdrskin-0.4.5 - 2008.05.09.151327
-
-2008.05.10.080001  [1754] 
-Makefile.am
-configure.ac
-README
-libburn/libburn.h
-cdrskin/cdrskin.c 
-cdrskin/README
-cdrskin/compile_cdrskin.sh
-cdrskin/cdrskin_timestamp.h
-cdrskin/wiki_plain.txt
-cdrskin/cdrskin_eng.html
-doc/comments
-cdrskin/cdrskin.1
-Made number transition to 0.4.6 and activated development documentation
-
-10 May 2008  [1755] 
-cdrskin/README
-Made number transition to 0.4.6 and activated development documentation
-
-10 May 2008  [1756]
-- cdrskin/add_ts_changes_to_libburn_0_4_4
-- cdrskin/add_ts_changes_to_libburn_0_4_5
-+ cdrskin/add_ts_changes_to_libburn_0_4_6
-+ cdrskin/add_ts_changes_to_libburn_0_4_7
-Updated cdrskin tarball generator
-
-10 May 2008  [1757]
-cdrskin/changelog.txt
-Documented changes and release timestamp
-
-
------------------------------ release  - cdrskin-0.4.6.pl00 - 2008.05.10.080001
-* Support for BD-RE media is now official
-* New option stream_recording=on can speed up DVD-RAM and BD-RE
-* New option --list_formats
-* New blank types for expert formatting of DVD-RAM and BD-RE
-* New blank type blank=as_needed for automatic handling of media type and state
-
-
-2008.05.10.132543  [1758] 
-Makefile.am
-configure.ac
-README
-libburn/libburn.h (burn_header_version_*)
-cdrskin/cdrskin.c 
-cdrskin/README
-cdrskin/compile_cdrskin.sh
-cdrskin/cdrskin_timestamp.h
-cdrskin/wiki_plain.txt
-cdrskin/cdrskin_eng.html
-doc/comments
-cdrskin/cdrskin.1
-Made number transition to 0.4.7
-
-10 May 2008  [1759]
-- cdrskin/add_ts_changes_to_libburn_0_4_4
-- cdrskin/add_ts_changes_to_libburn_0_4_5
-+ cdrskin/add_ts_changes_to_libburn_0_4_6
-+ cdrskin/add_ts_changes_to_libburn_0_4_7
-Updated cdrskin tarball generator
-
-10 May 2008  [1760]
-cdrskin/changelog.txt
-Documented changes and release timestamp
-
------------------------------------- cycle  - cdrskin-0.4.7 - 2008.05.10.132543
-
-2008.05.14.165025  [1776]
-libburn/write.c
-Bug fix: random access addressing for DVD-RAM and BD-RE did not work
-
-2008.05.14.165157  [1777]
-libburn/libburn.h
-Added format types 0x30 and 0x32 to list in API comments
-
-2008.05.14.165258  [1778]
-cdrskin/cdrskin.c
-Made inability to get format list a reason to abort the program
-
------------------------------------- cycle  - cdrskin-0.4.7 - 2008.05.14.165258
-* Bug fix: random access addressing for DVD-RAM and BD-RE did not work
-
-
-2008.05.17.080001  [1788] 
-Makefile.am
-configure.ac
-README
-libburn/libburn.h
-cdrskin/cdrskin.c 
-cdrskin/README
-cdrskin/compile_cdrskin.sh
-cdrskin/cdrskin_timestamp.h
-cdrskin/cdrskin_eng.html
-cdrskin/cdrskin.1
-Made number transition to 0.4.8 and activated development documentation
-
-17 May 2008  [1789]
-- cdrskin/add_ts_changes_to_libburn_0_4_6
-- cdrskin/add_ts_changes_to_libburn_0_4_7
-+ cdrskin/add_ts_changes_to_libburn_0_4_8
-+ cdrskin/add_ts_changes_to_libburn_0_4_9
-Updated cdrskin tarball generator
-
-17 May 2008  []
-cdrskin/changelog.txt
-Documented changes and release timestamp
-
------------------------------ release  - cdrskin-0.4.8.pl00 - 2008.05.17.080001
-* Bug fix: random access addressing for DVD-RAM and BD-RE did not work
-
-
-
------------------------------------- cycle  - cdrskin-0.4.9 - 
------------------------------------- cycle  - cdrskin-0.4.9 - 
 
 ===============================================================================
                                     TODO
 ===============================================================================
 
-
---------------------------------- bugs -------------------------------------
-
-
-- Why are DVD+R tracks labeled "invisible" by dvd+rw-mediainfo ?
-  Why does the DVD drive only show the first session ?
-READ TRACK INFORMATION[#5]:
- Track State:           invisible
- Track Start Address:   954960*2KB
- Free Blocks:           0*2KB
- Track Size:            22784*2KB
- ROM Compatibility LBA: 265696
-
-
------------------------------- end of bugs ---------------------------------
-
-provide DVD+R DL layer break setter
-
-@since tags
-
 Check all SORRY and FATAL errors whether they should become FAILUREs
 
+Refuse writing if track size exceeds free media space
+
 problem with telltoc: double descriptor list from before load and after load 
 
 
@@ -5593,6 +5058,9 @@ cdrskin/README
 Thin out
 
 
+  []
+open(,O_LARGEFILE) ?
+
   []
 Emulate -dummy on overwriteables ?
 
@@ -5601,6 +5069,14 @@ Emulate -dummy on DVD+R ?
 
 
 
+
+------------------------------------ cycle  - cdrskin-0.3.9 - 
+cdrskin/changelog.txt
+Next cdrskin-0.3.9 cycle
+
+
+
+
 What about minimum track sizes ? (POWER OFF/ON , BUS RESET ?)
 
 
@@ -5608,6 +5084,14 @@ After cooking: review of -do_diet ?
 
 growisofs.c : _LINUX_CAPABILITY_VERSION CAP_SYS_RAWIO SYS_capset ?
 
+Questions to post:
+    A70211_to_cdwrite_growisofs_question_finalizing
+
+
+
+Format DVD-RAM ?
+Disable error checking with DVD-RAM.
+
 
 Rectify mmc_read_atip speed interpretation. 12x media are reported as 10x. I never heard of 6x media. 
 

cdrskin/compile_cdrskin.sh

@@ -1,13 +1,13 @@
 #!/bin/sh
 
 # compile_cdrskin.sh  
-# Copyright 2005 - 2008 Thomas Schmitt, scdbackup@gmx.net, GPL version 2
+# Copyright 2005 - 2008 Thomas Schmitt, scdbackup@gmx.net, GPL
 # to be executed within  ./libburn-*  resp ./cdrskin-*
 
 debug_opts="-O2"
 def_opts=
 largefile_opts="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1"
-libvers="-DCdrskin_libburn_0_4_8"
+libvers="-DCdrskin_libburn_0_4_2"
 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_4_8"
+  elif test "$i" = "-libburn_0_4_2"
   then
-    libvers="-DCdrskin_libburn_0_4_8"
+    libvers="-DCdrskin_libburn_0_4_2"
     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_4_9"
+    libvers="-DCdrskin_libburn_0_4_3"
     libdax_audioxtr_o="libburn/libdax_audioxtr.o"
     libdax_msgs_o="libburn/libdax_msgs.o"
     cleanup_src_or_obj="libburn/cleanup.o"
@@ -76,7 +76,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_4_8    set macro to match libburn-0.4.8."
+    echo "  -libburn_0_4_2    set macro to match libburn-0.4.2."
     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."

cdrskin/convert_man_to_html.sh

@@ -16,7 +16,7 @@ manpage="cdrskin"
 raw_html=$(pwd)/"cdrskin/raw_man_1_cdrskin.html"
 htmlpage=$(pwd)/"cdrskin/man_1_cdrskin.html"
 
-if test -r "$man_dir"/"$manpage".1
+if test -r "$manpage"
 then
   dummy=dummy
 else
@@ -56,7 +56,7 @@ then
   -e 's/^If you only got one CD capable drive/\&nbsp;<BR>If you only got one CD capable drive/' \
   -e 's/<b>Emulated drives:<\/b>/\&nbsp;<BR><b>Emulated drives:<\/b>/' \
   -e 's/^Alphabetical list of options/\&nbsp;<BR>Alphabetical list of options/' \
-  -e 's/<\/body>/<BR><HR><FONT SIZE=-1><CENTER>(HTML generated from '"$manpage"'.1 on '"$(date)"' by '$(basename "$0")' )<\/CENTER><\/FONT><\/body>/' \
+  -e 's/and for all others\.<\/td><\/table>/and for all others.<\/td><\/table>  <BR><HR><FONT SIZE=-1><CENTER>(HTML generated from '"$manpage"'.1 on '"$(date)"' by '$(basename "$0")' )<\/CENTER><\/FONT>/' \
   -e 's/See section FILES/See section <A HREF="#FILES">FILES<\/A>/' \
   -e 's/See section EXAMPLES/See section <A HREF="#EXAMPLES">EXAMPLES<\/A>/' \
   <"$2" >"$htmlpage"

cdrskin/wiki_plain.txt

@@ -8,9 +8,9 @@
 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
 traditionally provided by cdrecord. Currently it does CD-R and CD-RW this way.
-Overwriteable media DVD-RAM, DVD+RW, DVD-RW, and BD-RE are handled differently
+Overwriteable media DVD-RAM, DVD+RW and DVD-RW are handled differently than 
-than with cdrecord-ProDVD in order to offer TAO-like single track recording.
+with cdrecord-ProDVD in order to offer TAO-like single track recording.
-Sequential DVD-R[W], DVD+R, DVD+R DL are handled like CD-R[W] with TAO and
+Sequential DVD-R[W] and DVD+R are handled like CD-R[W] with TAO and
 multi-session. Additionally cdrskin offers cdrecord-ProDVD-like mode DAO
 with DVD-R[W].
 
@@ -23,7 +23,7 @@ About libburn API for burning CD and DVD: http://api.libburnia-project.org
 
 --------------------------------------------------------------------------
 
-For yet unsupported media types see the advice to use dvd+rw-tools at
+For dual layer DVD types see the advice to use dvd+rw-tools at
 the end of this text.
 
 --------------------------------------------------------------------------
@@ -81,19 +81,6 @@ has to offer both, r- and w-permission.
 
 --------------------------------------------------------------------------
 
-blank=as_needed applies the suitable blanking or formatting to make
-any supported type of media ready for writing from scratch.
-If this is not possible, e.g. because the media is written and not
-re-usable, then the program run fails.
-
-Option blank= offers several specialized blanking and formatting types,
-which one may use for particular purposes on DVD-RW, DVD-RAM and BD-RE.
-(See also below: blank=format_overwrite)
-The drive offers a list of possible formats by cdrskin option --list_formats.
-One should aquire MMC background information before making use of them.
-
---------------------------------------------------------------------------
-
 cdrskin does not only read from and write to optical drives which comply
 to the MMC standard but also does the same with regular files or block
 devices other than optical drives.
@@ -128,9 +115,9 @@ All files used as pseudo-drives have to offer rw-permission.
 --------------------------------------------------------------------------
 
 The DVD capabilities of cdrskin differ from those of cdrecord-ProDVD. cdrskin
-offers TAO-like multi-session with DVD-R[W], DVD+R[ DL] and TAO-like single
+offers TAO-like multi-session with DVD-R[W], DVD+R and TAO-like single session
-session with overwriteable DVD media. It also offers DAO on DVD-R[W] which is
+with overwriteable DVD media. It also offers DAO on DVD-R[W] which is probably
-probably the same as the traditional cdrecord-ProDVD write mode.
+the same as the traditional cdrecord-ProDVD write mode.
 
 Non-cdrecord blank mode blank=format_overwrite brings a DVD-RW
 disc from its initial profile "Sequential Recording" into profile state
@@ -139,9 +126,9 @@ disc from its initial profile "Sequential Recording" into profile state
 cdrskin dev=/dev/sr0 -v blank=format_overwrite
 }}}
 
-DVD-RAM, DVD+RW, BD-RE and overwriteable DVD-RW appear to cdrskin as blank
+DVD-RAM, DVD+RW and overwriteable DVD-RW appear to cdrskin as blank media
-media which are capable of taking only a single track. This track may be
+which are capable of taking only a single track. This track may be positioned
-positioned on a 32KiB aligned address, though.
+on a 32KiB aligned address, though.
 {{{
 cdrskin ... write_start_address=2412m ...
 }}}
@@ -164,7 +151,7 @@ option -multi tolerable with media and write modes which are not suitable for
 multi-session. (The default behavior of cdrskin deems me to be preferrable.)
 
 Option --grow_overwriteable_iso gives cdrskin ISO pseudo-multi-session
-capabilities on DVD-RAM, DVD+RW, BD-RE similar to growisofs.
+capabilities on DVD-RAM and DVD+RW similar to growisofs.
 Associated options blank=, -multi, -msinfo and -toc are available in this case.
 They either pretend a blank media (if there is no ISO 9660 image) or appendable
 media with a single session and track on it. blank= invalidates ISO images.
@@ -281,10 +268,10 @@ for an illustrated example with K3b 0.10 .
 
 DVD advise:
 
-For burning of DVD/BD media other than DVD-RAM, DVD+RW, DVD+R, DVD+R DL,
+For burning of DVD media other than DVD-RAM, DVD+RW, DVD+R, DVD-RW, DVD-R,
-DVD-RW, DVD-R, BD-RE, the cdrskin project currently advises to use
+the cdrskin project currently advises to use Andy Polyakov's dvd+rw-tools
-Andy Polyakov's dvd+rw-tools which despite their historic name are
+which despite their historic name are capable of all the media above 
-capable of all the media above and more, including BD discs. 
+and also do dual layer and even BD discs. 
 
 http://fy.chalmers.se/~appro/linux/DVD+RW/tools
 
@@ -292,27 +279,20 @@ They are not compatible or related to cdrecord resp. cdrecord-ProDVD
 (now obsoleted by original source cdrtools cdrecord with identical
 capabilities besides the license key).
 
-
---------------------------------------------------------------------------
-
-Advanced multi-session use cases:
-
 A special feature of dvd+rw-tools is growing of ISO-9660 filesystems on
 overwriteable media. This is not the same as multi-session writing of cdrskin
 with CD media, but retrieves additional information from the existing ISO
 image and finally manipulates the start sectors of this existing image.
 
 So, inspired by growisofs, cdrskin can offer DVD multi-session not only with
-sequential DVD-R[W] and with DVD+R [DL], but also with DVD-RAM, DVD+RW, BD-RE
+sequential DVD-R[W] and with DVD+R, but also with DVD-RAM, DVD+RW and
-and even regular disk files or block devices other than CD/DVD writers.
+even regular disk files or block devices other than CD/DVD writers.
 This is enabled by option --grow_overwriteable_iso.
 
-The libburnia project provides an integrated ISO-9660 multi-session tool
+We are currently preparing an integrated ISO-9660 multi-session tool
-named [wiki:Xorriso xorriso] which tries to go one step beyond
+named [wiki:Xorriso xorriso] which will try to go one step beyond
-growisofs. It uses  [wiki:Libburn libburn] , [wiki:Libisofs libisofs]
+growisofs.
-and [wiki:Libisoburn libisoburn].
 
-See [http://scdbackup.sourceforge.net/man_1_xorriso.html man xorriso].
 
 --------------------------------------------------------------------------
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libburn], [0.4.8], [http://libburnia-project.org])
+AC_INIT([libburn], [0.4.2], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	
 
@@ -57,37 +57,26 @@ dnl Beware of libburn-0.2.6 which had SONAME=6 and is not binary compatible.
 dnl Applications for libburn-0.2 to libburn-0.3.1 need recompilation but no
 dnl source code changes.
 dnl
-dnl Neatly versioned stable releases meanwhile:
-dnl    0.4.2 = libburn.so.4.7.0
-dnl    0.4.4 = libburn.so.4.9.0
-dnl    0.4.6 = libburn.so.4.11.0
-dnl    0.4.8 = libburn.so.4.13.0
-dnl
 dnl So LT_CURRENT, LT_REVISION and LT_AGE get set directly here.
 dnl SONAME of the emerging library is  LT_CURRENT - LT_AGE.
 dnl The linker will do no finer checks. Especially no age range check for
 dnl the application binary. If SONAME matches, then the couple starts.
 dnl 
 dnl Therefore at run time info is provided by libburn function burn_version().
-dnl It returns the major, minor and micro revision of the library.
+dnl It returns the MAJOR, MINOR and MICRO revision of the library.
 dnl Before using any API feature, a program should check for age.
 dnl
-dnl The variables BURN_*_VERSION are mere copies for informing libtool.
-dnl The true values which get issued and should be compared are macros
-dnl defined in libburn/libburn.h .
-dnl
 dnl Normally one can allow a program to run with a library which passed the
 dnl linker SONAME test and which is not older than the library it was
 dnl developed for. Library2 is younger than library1 if:
-dnl   major2>major1 || (major2==major1 &&
+dnl   MAJOR2>MAJOR1 || (MAJOR2==MAJOR1 &&
-dnl                     (minor2>minor1 || (minor2==minor1 && micro2 > micro1)))
+dnl                     (MINOR2>MINOR1 || (MINOR2==MINOR1 && MICRO2 > MICRO1)))
 dnl
 dnl If BURN_*_VERSION changes, be sure to change AC_INIT above to match.
 dnl
-dnl As said: Only copies. Original in libburn/libburn.h : burn_header_version_*
 BURN_MAJOR_VERSION=0
 BURN_MINOR_VERSION=4
-BURN_MICRO_VERSION=8
+BURN_MICRO_VERSION=2
 BURN_VERSION=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION
 
 AC_SUBST(BURN_MAJOR_VERSION)
@@ -97,16 +86,10 @@ AC_SUBST(BURN_VERSION)
 
 dnl Libtool versioning
 LT_RELEASE=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION
-dnl
+# SONAME = 11 - 7 = 4 . Library name = libburn.so.4.7.0
-dnl ts A80517
+LT_CURRENT=11
-dnl This is the release version libburn-0.4.8 = libburn.so.4.13.0
-dnl ### This is the development version after above release version
-dnl ### LT_CURRENT++, LT_AGE++ has not yet happened.
-dnl
-dnl SONAME = 17 - 13 = 4 . Library name = libburn.so.4.13.0
-LT_CURRENT=17
 LT_REVISION=0
-LT_AGE=13
+LT_AGE=7
 LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
 
 AC_SUBST(LT_RELEASE)
@@ -115,7 +98,7 @@ AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)
 AC_SUBST(LT_CURRENT_MINUS_AGE)
 
-dnl ts A71207: This is done only not to break any old components
+# ts A71207: This is done only not to break any old components
 BURN_INTERFACE_AGE=$LT_REVISION
 BURN_BINARY_AGE=`expr $LT_AGE + $BURN_INTERFACE_AGE`
 AC_SUBST(BURN_INTERFACE_AGE)

doc/comments

@@ -7,12 +7,10 @@
 
 Libburnia is an open-source project for reading, mastering and writing
 optical discs.
-For now this means CD-R, CD-RW, DVD-RAM, DVD+RW, DVD+R, DVD+R/DL, DVD-RW,
+For now this means CD-R, CD-RW, DVD-RAM, DVD+RW, DVD+R, DVD-RW, DVD-R.
-DVD-R, BD-RE.
 
-Not supported yet are DVD-R/DL, HD-DVD, BD-R (blue ray). Testers for
+Not supported yet are dual layer media, HD-DVD, BD (blue ray). Testers for
-DVD-R/DL are wanted, though. BD-R programming efforts would be made
+dual layer DVD+/-R are wanted, though.
-if an interested tester contacts us.
 
 The project comprises of several more or less interdependent parts which
 together strive to be a usable foundation for application development.
@@ -24,18 +22,13 @@ we would need : login on a development machine resp. a live OS on CD or DVD,
 advise from a system person about the equivalent of Linux sg or FreeBSD CAM,
 volunteers for testing of realistic use cases.
 
-We have a well tested code base for burning data and audio CDs and many DVD
+We have a workable code base for burning data and audio CDs and many DVD types.
-types. The burn API is quite comprehensively documented and can be used to
+The burn API is quite comprehensively documented and can be used to build a
-build a presentable application.
+presentable application.
 We have a functional binary which emulates the core use cases of cdrecord in
 order to prove that usability, and in order to allow you to explore libburn's
 scope by help of existing cdrecord frontends.
 
-ISO 9660 filesystems with Rock Ridge and Joliet extensions can be created
-and manipulated quite freely. This capability together with our burn capability
-makes possible a single binary application which covers all steps of image
-composition, updating and writing. Quite unique in the Linux world.
-
 @subsection components The project components (list subject to growth, hopefully):
 
 - libburn  is the library by which preformatted data get onto optical media.
@@ -50,28 +43,28 @@ composition, updating and writing. Quite unique in the Linux world.
            ISO 9660 disk image. This may then be brought to CD via libburn.
            libisofs is to be the foundation of our upcoming mkisofs emulation.
 
-- libisoburn is an add-on to libburn and libisofs which coordinates both and
+- libisoburn is an add-on to libburn and libisofs which allows to grow
-           also allows to grow ISO-9660 filesystem images on multi-session
+           ISO-9660 filesystem images on multi-session media as well as
-           media as well as on overwriteable media via the same API.
+           on overwriteable media via the same API. All media peculiarities
-           All media peculiarities are handled automatically.
+           are handled automatically.
 
 - cdrskin  is a limited cdrecord compatibility wrapper for libburn.
            cdrecord is a powerful GPL'ed burn program included in Joerg
            Schilling's cdrtools. cdrskin strives to be a second source for
            the services traditionally provided by cdrecord. Additionally it
-           provides libburn's DVD/BD capabilities, where only -sao is
+           provides libburn's DVD capabilities, where only -sao is compatible
-           compatible with cdrecord.
+           with cdrecord.
            cdrskin does not contain any bytes copied from cdrecord's sources.
            Many bytes have been copied from the message output of cdrecord
            runs, though.
            See cdrskin/README for more.
 
-- xorriso  is an application of all three libraries which creates, loads,
+- xorriso  is an upcomming application of all three libraries which creates,
-           manipulates and writes ISO 9660 filesystem images with
+           loads, manipulates and writes ISO 9660 filesystem images with
-           Rock Ridge extensions. Manipulation is not only adding or
+           Rock Ridge extensions. Manipulation will not only be adding or
            overwriting of files but also deletion, renaming, and attribute
-           changing. An incremental backup feature is provided.
+           changing.
-           See xorriso/README for more
+           See SVN of libisoburn, man test/xorriso.1, test/compile_xorriso.sh
 
 - "test"   is a collection of application gestures and examples given by the
            authors of the library features. The burn API example of libburn
@@ -79,19 +72,7 @@ composition, updating and writing. Quite unique in the Linux world.
            demonstrated in test/telltoc.c .
            Explore these examples if you look for inspiration.
 
-We strive to be a responsive upstream.
+We plan to be a responsive upstream. Bear with us.
-
-Our libraries are committed to maintain older feature sets in newer versions.
-This applies to source code headers (API) as well as to linkable objects (ABI).
-The only exception from this rule is about non-release versions x.y.*[13579]
-which are allowed to introduce new features, change those new features in
-any way and even may revoke such new features before the next release of
-x.y.*[02468]. As soon as it is released, a feature is promised to persist.
-
-SONAMES:
-libburn.so.4 (since 0.3.4, March 2007),
-libisofs.so.6 (since 0.6.2, February 2008),
-libisoburn.so.1 (since 0.1.0, February 2008).
 
 
    @section using Using the libraries

doc/cookbook.txt

@@ -1,11 +1,11 @@
-libburnia-project.org Optical Media Rotisserie Recipes as of April 2008
+libburnia-project.org Optical Media Rotisserie Recipes as of August 2007
 
 Content:
 - TAO Multi-Session CD Cookbook (CD-R, CD-RW)
 - SAO CD Cookbook (CD-R, CD-RW, pure audio or pure data only)
-- Overwriteable DVD Cookbook (DVD-RAM, DVD+RW, DVD-RW, BD-RE)
+- Overwriteable DVD Cookbook (DVD-RAM, DVD+RW, DVD-RW)
 - Sequential DVD-R[W] Cookbook
-- DVD+R[/DL] Cookbook
+- DVD+R Cookbook
 
 -------------------------------------------------------------------------------
                          TAO Multi-Session CD Cookbook
@@ -403,8 +403,7 @@ correctness of Pre-gap and Post-gap would become evident.
 -------------------------------------------------------------------------------
 Inspired by Andy Polyakov's http://fy.chalmers.se/~appro/linux/DVD+RW/tools ,
 backed by reading mmc5r03c.pdf from http://www.t10.org/ftp/t10/drafts/mmc5/
-by own experiments with drives NEC ND-4570A, LG GSA-4082B, PHILIPS SPD3300L,
+and by experiments with drives NEC ND-4570A and LG GSA-4082B.
-and by BD-RE experiments done by Giulio Orsero on LG BE06LU10.
 
 For libburnia-project.org by Thomas Schmitt <scdbackup@gmx.net>
 
@@ -417,20 +416,18 @@ DVD-RAM                        0012h
 DVD-RW Restricted Overwrite    0013h
 DVD-RW Sequential Recording    0014h (i.e. unformatted)
 DVD+RW                         001Ah
-BD-RE                          0043h
 
 A short compilation of the write model:
 - Overwriting in general
 
 The recipes described here are depending on formatting state:
-- DVD-RAM, fully formatted DVD+RW, DVD-RW, BD-RE
+- DVD-RAM, fully formatted DVD+RW or DVD-RW
 - Unformatted DVD+RW
 - Partly formatted DVD+RW
 - Unformatted DVD-RW
 - Partly formatted DVD-RW
 - Intermediate state DVD-RW
-- DVD-RAM and BD-RE formatting
+
-- DVD-RAM and BD-RE speed tuning
 
 -------------------------------------------------------------------------------
 Overwriting in general :
@@ -447,7 +444,7 @@ Optimal performance is promised without any speed setting. But my experiments
 showed that SET STREAMING values persist after media change.
 
 In the formatted area of the media, coarse random access is possible.
-For DVD-RAM, DVD+RW, BD-RE write addresses and data size need to be aligned
+For DVD-RAM and DVD+RW write addresses and data size need to be aligned
 to 2 KiB. For DVD-RW alignment has to be 32 KiB. Within these limitations
 the write address is at the discretion of the sending program.
 Just use 2Ah WRITE to send data.
@@ -486,12 +483,9 @@ software did anything wrong.
 
 
 -------------------------------------------------------------------------------
-DVD-RAM, fully formatted DVD+RW, DVD-RW, BD-RE :
+DVD-RAM, fully formatted DVD+RW or DVD-RW :
 
-Full format is the natural state of DVD-RAM.
+Full format is the natural state of DVD-RAM. 
-
-BD-RE are sold unformatted and need to be fully formatted first.
-See paragraph about DVD-RAM and BD-RE formatting below.
 
 DVD+RW reaches this state if Background Formatting is allowed to finish without
 being stopped by 5Bh CLOSE TRACK SESSION.
@@ -677,91 +671,6 @@ of Intermediate state by 5Bh CLOSE TRACK SESSION with Close Function 010b.
 (mmc5r03c.pdf 6.3.3.2.3)
 
 
--------------------------------------------------------------------------------
-DVD-RAM and BD-RE formatting :
-
-Although DVD-RAM usually are sold formatted, there may still arise the wish
-to adjust formatting.
-BD-RE are sold unformatted and need to be formatted prior to usage.
-
-Two format types are relevant for DVD-RAM : 00h and 01h.
-00h offers the default size format and usually a maximum payload size format.
-Even with that maximum size payload there is hardware defect management.
-(mmc5r03c.pdf 6.5.4.2.1.2)
-01h allows to convert payload capacity into spare blocks for defect
-managment. There is no way to increase payload capacity by format 01h.
-(mmc5r03c.pdf 6.5.4.2.2.1)
-
-With BD-RE there are three format types : 00h, 30h and 31h.
-00h offers the default size format.
-30h offers several sizes with defect management. Usually there are three
-size to choose: #1: default size, #2: maximum spare area, #3: minimal spare.
-31h offers a single size and disables defect management. This has the side
-effect to speed up writing to nominal speed.
-(mmc5r03c.pdf 6.5.4.2.15, 6.24.3.3, Table 472)
-
-Only format sizes from the list of format descriptors are permissible
-for DVD-RAM. The format list can be obtained by 23h READ FORMAT CAPACITIES.
-It also includes a description of the current formatting state.
-(mmc5r03c.pdf 6.24, 6.24.3.2, 6.24.3.3)
-
-Formatting is done by command 04h FORMAT UNIT. Its data payload consists
-of a Format List Header and a Format Descriptor. It is advisable to set
-the Immed bit and the FOV bit in header byte number 1. The descriptor should
-be a copy of a descriptor from 23h READ FORMAT CAPACITIES.
-(mmc5r03c.pdf 6.5, 6.5.3.2, 6.5.3.3)
-With nearly all formats Sub-type should be set to 0. But with BD-RE formats
-30h and 31h the Sub-type selects the certification mode.
-Usable with 30h seem 10b Full Certification and 11b Quick Certification.
-Usable with 31h seem also 00b Quick Reformat and 01b No Certification.
-(mmc5r03c.pdf 6.5.4.2.15.1)
-
-Other format types have their certification intensity controlled by
-a pair of bits: CmpList and DCRT.
-CmpList resides in CDB byte 1 as bit 3. DCRT resides in the payload byte 1
-as bit 5. Both together should request a quick size change without lengthy
-certification but maintaining the list of known defects.
-(mmc5r03c.pdf 6.5, table 249, 6.5.3.2)
-With DVD-RAM on my PHILIPS SPD3300L drive they prevent any format size
-change though. The TSSTcorp SH-S203B works properly.
-With BD-RE format 00h, the default is specified to be Quick Reformat,
-and with 00h in general certification can only be disabled not enabled.
-(mmc5r03c.pdf 6.5.4.2.1.7)
-
-
--------------------------------------------------------------------------------
-DVD-RAM and BD-RE tuning :
-
-A special aspect of DVD-RAM and BD-RE is their low speed with write operations,
-which usually is only half than the nominal speed of media and drive.
-This is blamed to the automatic checkreading which happens ifor managing
-eventual defects. 
-
-Defect management of BD-RE can be disabled by format type 31h. See above.
-There is no drive known yet which would apply command 2Ah WRITE10 to DVD-RAM
-with full speed.
-
-The only known way to get full speed from DVD-RAM or BD-RE with enabled defect
-management is the use of AAh WRITE12 with Streaming Bit set to 1.
-(mmc5r03c.pdf 6.45)
-With some DVD-RAM drives this fails if a write buffer is not full 32 kB.
-With the tested BD-RE ione has to write write full 64 kB buffers.
-
-Although it seems not optimal, this is specified not only to disable the
-cumbersome checkread but also to ignore known defects and to write data
-to these defective addresses.
-(mmc5r03c.pdf 4.8.5)
-So the speed-up is only advisable as long as the media are free of
-incorrectable errors.
-
-Caveat:
-MMC-5 does not guarantee AAh WRITE12 to work on DVD-RAM or BD-RE at all.
-None of the features of profiles 0012h and 0043 promises the existence of
-AAh WRITE12.
-Nevertheless it worked on all tested drives is proper alignment was observed.
-(mmc5r03c.pdf 5.4.13, 6.45)
-
-
 -------------------------------------------------------------------------------
 
 -------------------------------------------------------------------------------
@@ -1081,7 +990,7 @@ close session if multi-session is demanded.
 -------------------------------------------------------------------------------
 
 -------------------------------------------------------------------------------
-                             DVD+R[/DL] Cookbook
+                              DVD+R Cookbook
 -------------------------------------------------------------------------------
 Inspired by reading mmc5r03c.pdf from http://www.t10.org/ftp/t10/drafts/mmc5/
 backed by Andy Polyakov's http://fy.chalmers.se/~appro/linux/DVD+RW/tools ,
@@ -1097,7 +1006,7 @@ DVD+R/DL                       002bh
 
 - About empty, appendable and finalized DVD+R
 - Writing a Pseudo Session to DVD+R
-- DVD+R/DL (Dual Layer
+- >>> Hearsay about DVD+R/DL (Dual Layer) :
 
 The following two chapters of the Sequential DVD-R[W] Cookbook are valid for
 DVD+R media too:
@@ -1191,11 +1100,9 @@ by closing them already after the first session.
 
 
 -------------------------------------------------------------------------------
-DVD+R/DL (Dual Layer) :
+Hearsay about DVD+R/DL (Dual Layer) :
 
-libburn treats DL media just like their single layer equivalents.
+>>>
-This seems to work fine for DVD+R/DL, according to a report by nightmorph
-in http://libburnia-project.org/ticket/13 .
 
 -------------------------------------------------------------------------------
 

libburn/async.c

@@ -392,10 +392,6 @@ void burn_disc_format(struct burn_drive *drive, off_t size, int flag)
 		size = 0;
 		flag &= ~(2|8); /* no insisting in size 0, no expansion */
 		flag |= 4;      /* format up to maximum size */
-	} else if (drive->current_profile == 0x12) {
-		ok = 1; /* DVD-RAM */
-	} else if (drive->current_profile == 0x43) {
-		ok = 1; /* BD-RE */
 	}
 
 	if (!ok) {

libburn/drive.c

@@ -46,9 +46,6 @@ extern struct libdax_msgs *libdax_messenger;
 static struct burn_drive drive_array[255];
 static int drivetop = -1;
 
-/* ts A80410 : in init.c */
-extern int burn_support_untested_profiles;
-
 /* ts A61021 : the unspecific part of sg.c:enumerate_common()
 */
 int burn_setup_drive(struct burn_drive *d, char *fname)
@@ -61,7 +58,6 @@ int burn_setup_drive(struct burn_drive *d, char *fname)
 	d->released = 1;
 	d->stdio_fd = -1;
 	d->status = BURN_DISC_UNREADY;
-	d->do_stream_recording = 0;
 	return 1;
 }
 
@@ -443,9 +439,6 @@ int burn_drive_mark_unready(struct burn_drive *d)
 		burn_disc_free(d->disc);
 		d->disc = NULL;
 	}
-	if (d->stdio_fd >= 0)
-		close (d->stdio_fd);
-	d->stdio_fd = -1;
 	return 1;
 }
 
@@ -592,7 +585,7 @@ void burn_disc_erase_sync(struct burn_drive *d, int fast)
 
 /*
    @param flag: bit0 = fill formatted size with zeros
-                bit1, bit2 , bit4, bit5, bit7 - bit15 are for d->format_unit()
+                bit1, bit2 , bit4, bit7 - bit15 are for d->format_unit()
 */
 void burn_disc_format_sync(struct burn_drive *d, off_t size, int flag)
 {
@@ -615,7 +608,7 @@ void burn_disc_format_sync(struct burn_drive *d, off_t size, int flag)
 	d->cancel = 0;
 	d->busy = BURN_DRIVE_FORMATTING;
 
-	ret = d->format_unit(d, size, flag & 0xfff6); /* forward bits */
+	ret = d->format_unit(d, size, flag & 0xff96); /* forward bits */
 	if (ret <= 0)
 		d->cancel = 1;
 
@@ -1260,7 +1253,7 @@ int burn_drive_grab_dummy(struct burn_drive_info *drive_infos[], char *fname)
 		d->current_is_supported_profile = 1;
 		d->block_types[BURN_WRITE_TAO] = BURN_BLOCK_MODE1;
 		d->block_types[BURN_WRITE_SAO] = BURN_BLOCK_SAO;
-		burn_drive_set_media_capacity_remaining(d, size);
+		d->media_capacity_remaining = size;
 
 		/* >>> ? open file for a test ? (>>> beware of "-" = stdin) */;
 
@@ -1705,10 +1698,7 @@ int burn_abort(int patience,
 			occup = burn_drive_is_occupied(&(drive_array[i]));
 			if(occup == -2)
 		continue;
-			if(drive_array[i].drive_role != 1) {
+			if(occup <= 10) {
-				drive_array[i].busy = BURN_DRIVE_IDLE;
-				burn_drive_forget(&(drive_array[i]), 1);
-			} else if(occup <= 10) {
 				burn_drive_forget(&(drive_array[i]), 1);
 			} else if(occup <= 100) {
 				if(first_round)
@@ -1872,8 +1862,8 @@ off_t burn_disc_available_space(struct burn_drive *d,
 		return 0;
 	if (d->drive_role != 1) {
 		if (d->media_capacity_remaining <= 0)
-			burn_drive_set_media_capacity_remaining(d,
+			d->media_capacity_remaining = 
-			  (off_t) (512 * 1024 * 1024 - 1) * (off_t) 2048);
+			((off_t) (512 * 1024 * 1024 - 1) * (off_t) 2048);
 	} else {
 		if (o != NULL)
 			d->send_write_parameters(d, o);
@@ -2105,7 +2095,7 @@ int burn_disc_get_multi_caps(struct burn_drive *d, enum burn_write_types wt,
 		o->start_adr = 1;
 		size = d->media_capacity_remaining;
 		burn_os_stdio_capacity(d->devname, &size);
-		burn_drive_set_media_capacity_remaining(d, size);
+		d->media_capacity_remaining = size;
 		o->start_range_high = size;
 		o->start_alignment = 2048; /* imposting a drive, not a file */
 		o->might_do_sao = 4;
@@ -2170,12 +2160,9 @@ int burn_disc_get_multi_caps(struct burn_drive *d, enum burn_write_types wt,
 		if (wt == BURN_WRITE_NONE || wt == BURN_WRITE_SAO ||
 		    wt == BURN_WRITE_TAO)
 			o->might_simulate = 1;
-	} else if (d->current_profile == 0x12 ||
+	} else if (d->current_profile == 0x12 || d->current_profile == 0x13 ||
-			d->current_profile == 0x13 ||
+			d->current_profile == 0x1a) {
-			d->current_profile == 0x1a ||
+		/* DVD-RAM, overwriteable DVD-RW, DVD+RW */
-			d->current_profile == 0x43 
-	          ) {
-		/* DVD-RAM, overwriteable DVD-RW, DVD+RW, BD-RE */
 		o->start_adr = 1;
 		ret = burn_disc_get_formats(d, &status, &size, &dummy,
 					&num_formats);
@@ -2194,8 +2181,6 @@ int burn_disc_get_multi_caps(struct burn_drive *d, enum burn_write_types wt,
 				}
 				if (i >= num_formats) /* not expandable */
 					o->start_range_high -= 32 * 1024;
-				if (o->start_range_high < 0)
-					o->start_range_high = 0;
 			} else {
 				o->start_alignment = 2 * 1024;
 				if (d->best_format_size - 2048 >
@@ -2459,11 +2444,3 @@ int burn_drive_find_by_thread_pid(struct burn_drive **d, pid_t pid)
 }
 
 
-/* ts A80422 : centralizing this setting for debugging purposes
-*/
-int burn_drive_set_media_capacity_remaining(struct burn_drive *d, off_t value)
-{
-	d->media_capacity_remaining = value;
-	return 1;
-}
-

libburn/init.c

@@ -247,7 +247,7 @@ int burn_msgs_submit(int error_code, char msg_text[], int os_errno,
 
 	ret = libdax_msgs__text_to_sev(severity, &sevno, 0);
 	if (ret <= 0)
-		sevno = LIBDAX_MSGS_SEV_ALL;
+		sevno = LIBDAX_MSGS_SEV_FATAL;
 	if (error_code <= 0) {
 		switch(sevno) {
 		       case LIBDAX_MSGS_SEV_ABORT:   error_code = 0x00040000;
@@ -258,7 +258,7 @@ int burn_msgs_submit(int error_code, char msg_text[], int os_errno,
 		break; case LIBDAX_MSGS_SEV_NOTE:    error_code = 0x00040005;
 		break; case LIBDAX_MSGS_SEV_UPDATE:  error_code = 0x00040006;
 		break; case LIBDAX_MSGS_SEV_DEBUG:   error_code = 0x00040007;
-		break; default:                      error_code = 0x00040008;
+		break; default:                      error_code = 0x00040001;
 		}
 	}
 	if (d != NULL)
@@ -275,16 +275,8 @@ int burn_text_to_sev(char *severity_name, int *sevno, int flag)
 	int ret;
 
 	ret = libdax_msgs__text_to_sev(severity_name, sevno, 0);
-	return ret;
+	if (ret <= 0)
-}
+		*sevno = LIBDAX_MSGS_SEV_FATAL;
-
-
-/* ts A80202 API */
-int burn_sev_to_text(int severity_number, char **severity_name, int flag)
-{
-	int ret;
-
-	ret = libdax_msgs__sev_to_text(severity_number, severity_name, 0);
 	return ret;
 }
 

libburn/libburn.h

@@ -642,7 +642,7 @@ struct burn_speed_descriptor {
     This must be called before using any other functions in the library. It
     may be called more than once with no effect.
     It is possible to 'restart' the library by shutting it down and
-    re-initializing it. Once this was necessary if you follow the older and
+    re-initializing it. This is necessary if you follow the older and
     more general way of accessing a drive via burn_drive_scan() and
     burn_drive_grab(). See burn_drive_scan_and_grab() with its strong
     urges and its explanations.
@@ -730,6 +730,7 @@ void burn_preset_device_open(int exclusive, int blocking, int abort_on_busy);
 /** Allows the use of media types which are implemented in libburn but not yet
     tested. The list of those untested profiles is subject to change.
     Currently it contains: 0x15 "DVD-R/DL sequential recording",
+                           0x2b "DVD+R/DL"
     If you really test such media, then please report the outcome on
     libburn-hackers@pykix.org
     If ever then this call should be done soon after burn_initialize() before
@@ -808,7 +809,8 @@ void burn_allow_untested_profiles(int yes);
                   (cdrom/burner). Thus use with driveno 0 only. On failure
                   the array has no valid elements at all.
                   The returned array should be freed via burn_drive_info_free()
-                  when it is no longer needed.
+                  when it is no longer needed, and before calling a scan
+                  function again.
                   This is a result from call burn_drive_scan(). See there.
                   Use with driveno 0 only.
     @param adr    The persistent address of the desired drive. Either once
@@ -1089,29 +1091,22 @@ off_t burn_disc_available_space(struct burn_drive *d,
 /** Tells the MMC Profile identifier of the loaded media. The drive must be
     grabbed in order to get a non-zero result.
     libburn currently writes only to profiles 
-      0x09 "CD-R",                          0x0a "CD-RW",
+    0x09 "CD-R",                          0x0a "CD-RW",
-      0x11 "DVD-R sequential recording",    0x12 "DVD-RAM",
+    0x11 "DVD-R sequential recording",    0x12 "DVD-RAM",
-      0x13 "DVD-RW restricted overwrite",   0x14 "DVD-RW sequential recording",
+    0x13 "DVD-RW restricted overwrite",   0x14 "DVD-RW sequential recording",
-      0x1a "DVD+RW",                        0x1b "DVD+R",
+    0x1a "DVD+RW",                        0x1b "DVD+R".
-      0x2b "DVD+R/DL",                      0x43 "BD-RE",
-      0xffff "stdio file"
-    Note: 0xffff is not a MMC profile but a libburn invention.
     If enabled by burn_allow_untested_profiles() it also writes to profiles
-      0x15 "DVD-R/DL sequential recording",
+    0x15 "DVD-R/DL sequential recording", 0x2b "DVD+R/DL".
-    Read-only are the profiles
+    Writeable stdio-drives return this profile
-      0x08 "CD-ROM",                        0x10 "DVD-ROM",
+    0xffff "stdio file"
-      0x40 "BD-ROM",
-    For now read-only are BD-R profiles (testers wanted)
-      0x41 "BD-R sequential recording",     0x42 "BD-R random recording"
     @param d The drive where the media is inserted.
-    @param pno Profile Number. See also mmc5r03c.pdf, table 89
+    @param pno Profile Number as of mmc5r03c.pdf, table 89
     @param name Profile Name (see above list, unknown profiles have empty name)
     @return 1 profile is valid, 0 no profile info available 
 */
 int burn_disc_get_profile(struct burn_drive *d, int *pno, char name[80]);
 
 /** Tells whether a disc can be erased or not
-    @param d The drive to inquire.
     @return Non-zero means erasable
 */
 int burn_disc_erasable(struct burn_drive *d);
@@ -1170,40 +1165,27 @@ void burn_read_opts_free(struct burn_read_opts *opts);
 void burn_disc_erase(struct burn_drive *drive, int fast);
 
 
-/* ts A70101 - A70417 */
+/* ts A70101 - A70112 */
 /** Format media for use with libburn. This currently applies to DVD-RW
     in state "Sequential Recording" (profile 0014h) which get formatted to
     state "Restricted Overwrite" (profile 0013h). DVD+RW can be "de-iced"
     by setting bit2 of flag. Other media cannot be formatted yet. 
-    This function usually returns while the drive is still in the process
-    of formatting. The formatting is done, when burn_drive_get_status()
-    returns BURN_DRIVE_IDLE. This may be immediately after return or may
-    need several thousand seconds to occur.
     @param drive The drive with the disc to format.
     @param size The size in bytes to be used with the format command. It should
                 be divisible by 32*1024. The effect of this parameter may
-                depend on the media profile and on parameter flag.
+                depend on the media profile.
     @param flag Bitfield for control purposes:
                 bit0= after formatting, write the given number of zero-bytes
                       to the media and eventually perform preliminary closing.
-                bit1+2: size mode
+                bit1= insist in size 0 even if there is a better default known
-                   0 = use parameter size as far as it makes sense
+                bit2= format to maximum available size
-                   1 = insist in size 0 even if there is a better default known
-                       (on DVD-RAM or BD-RE identical to size mode 0)
-                   2 = without bit7: format to maximum available size
-                       with bit7   : take size from indexed format descriptor
-                   3 = without bit7: format to default size
-                       with bit7   : take size from indexed format descriptor
                 bit3= -reserved-
                 bit4= enforce re-format of (partly) formatted media
-                bit5= try to disable eventual defect management
-		bit6= try to avoid lengthy media certification
                 bit7= MMC expert application mode (else libburn tries to
                       choose a suitable format type):
                       bit8 to bit15 contain the index of the format to use. See
                       burn_disc_get_formats(), burn_disc_get_format_descr().
-                      Acceptable types are: 0x00, 0x01, 0x10, 0x11, 0x13,
+                      Acceptable types are: 0x00, 0x10, 0x11, 0x13, 0x15, 0x26.
-                      0x15, 0x26, 0x30, 0x31.
                       If bit7 is set, bit4 is set automatically.
 */
 void burn_disc_format(struct burn_drive *drive, off_t size, int flag);
@@ -1244,8 +1226,7 @@ int burn_disc_get_formats(struct burn_drive *drive, int *status, off_t *size,
     @param type  The format type.  See mmc5r03c.pdf, 6.5, 04h FORMAT UNIT.
                  0x00=full, 0x10=CD-RW/DVD-RW full, 0x11=CD-RW/DVD-RW grow,
                  0x15=DVD-RW quick, 0x13=DVD-RW quick grow,
-                 0x26=DVD+RW background, 0x30=BD-RE with spare areas,
+                 0x26=DVD+RW background
-                 0x31=BD-RE without spare areas
     @param size  The maximum size in bytes achievable with this format.
     @param tdp   Type Dependent Parameter. See mmc5r03c.pdf.
     @return 1 reply is valid , <=0 failure
@@ -1776,20 +1757,6 @@ void burn_write_opts_set_fillup(struct burn_write_opts *opts,
 void burn_write_opts_set_force(struct burn_write_opts *opts, int use_force);
 
 
-/* ts A80412 */
-/** Eventually makes use of the more modern write command AAh WRITE12 and
-    sets the Streaming bit. With DVD-RAM this can override the traditional
-    slowdown to half nominal speed. But if it speeds up writing then it also
-    disables error management and correction. Weigh your priorities.
-    This only affects the write operations of burn_disc_write().
-    @since 0.4.6
-    @param opts The write opts to change
-    @param value  0=use 2Ah WRITE10, 1=use AAh WRITE12 with Streaming bit
-*/
-void burn_write_opts_set_stream_recording(struct burn_write_opts *opts, 
-                                         int value);
-
-
 /** Sets whether to read in raw mode or not
     @param opts The read opts to change
     @param raw_mode If non-zero, reading will be done in raw mode, so that everything in the data tracks on the
@@ -2069,8 +2036,8 @@ int burn_track_get_mode(struct burn_track *track);
 */
 int burn_session_get_hidefirst(struct burn_session *session);
 
-/** Returns the library's version in its parts.
+/** Returns the library's version in its parts
-    This is the runtime counterpart of the three build time macros 
+    This is the runtime counterpart of the three build time macros
     burn_header_version_* below.
     @param major The major version number
     @param minor The minor version number
@@ -2098,54 +2065,12 @@ void burn_version(int *major, int *minor, int *micro);
 */
 #define burn_header_version_major  0
 #define burn_header_version_minor  4
-#define burn_header_version_micro  8
+#define burn_header_version_micro  2
 /** Note:
-    Above version numbers are also recorded in configure.ac because libtool
+    Above version numbers are also recorded in configure.ac and indirectly
-    wants them as parameters at build time.
+    lead to the reply of burn_version().
-    For the library compatibility check BURN_*_VERSION in configure.ac
+    So the version triples in configure.ac and libburn.h must be kept equal.
-    are not decisive. Only the three numbers above do matter.
+    In future versions the triple of libburn.h will be decisive alone.
-*/
-/** Usage discussion:
-
-Some developers of the libburnia project have differing
-opinions how to ensure the compatibility of libaries
-and applications.
-
-It is about whether to use at compile time and at runtime
-the version numbers isoburn_header_version_* provided here.
-Thomas Schmitt advises to use them.
-Vreixo Formoso advises to use other means.
-
-At compile time:
-
-Vreixo Formoso advises to leave proper version matching
-to properly programmed checks in the the application's
-build system, which will eventually refuse compilation.
-
-Thomas Schmitt advises to use the macros defined here
-for comparison with the application's requirements of
-library revisions and to eventually break compilation.
-
-Both advises are combinable. I.e. be master of your
-build system and have #if checks in the source code
-of your application, nevertheless.
-
-At runtime (via *_is_compatible()):
-
-Vreixo Formoso advises to compare the application's
-requirements of library revisions with the runtime
-library. This is to allow runtime libraries which are
-young enough for the application but too old for
-the lib*.h files seen at compile time.
-
-Thomas Schmitt advises to compare the header
-revisions defined here with the runtime library.
-This is to enforce a strictly monotonous chain
-of revisions from app to header to library,
-at the cost of excluding some older libraries.
-
-These two advises are mutually exclusive.
-
 */
 
 
@@ -2221,17 +2146,6 @@ int burn_msgs_submit(int error_code, char msg_text[], int os_errno,
 int burn_text_to_sev(char *severity_name, int *severity_number, int flag);
 
 
-/* ts A80202 */
-/** Convert a severity number into a severity name
-    @since 0.4.4
-    @param severity_number The rank number: the higher, the more severe.
-    @param severity_name A name as with burn_msgs_submit(), e.g. "SORRY".
-    @param flag Bitfield for control purposes (unused yet, submit 0)
-*/
-int burn_sev_to_text(int severity_number, char **severity_name, int flag);
-
-
-
 /* ts A70915 */
 /** Replace the messenger object handle of libburn by a compatible handle
     obtained from a related library. 
@@ -2292,7 +2206,7 @@ void burn_set_signal_handling(void *handle, burn_abort_handler_t handler,
                         drive buffer without further data transfer).
     @param flag         Bitfield for control purposes:
                         bit0 = flush the drive buffer after eventual writing
-    @return 1=sucessful , <=0 : number of transfered bytes * -1
+    @return 1=sucessful , <=0 : number of tranfered bytes * -1
 */
 int burn_random_access_write(struct burn_drive *d, off_t byte_address,
                              char *data, off_t data_count, int flag);

libburn/libdax_msgs.c

@@ -254,8 +254,6 @@ int libdax_msgs__text_to_sev(char *severity_name, int *severity,
    *severity= LIBDAX_MSGS_SEV_FATAL;
  else if(strncmp(severity_name,"FAILURE",7)==0)
    *severity= LIBDAX_MSGS_SEV_FAILURE;
- else if(strncmp(severity_name,"MISHAP",6)==0)
-   *severity= LIBDAX_MSGS_SEV_MISHAP;
  else if(strncmp(severity_name,"SORRY",5)==0)
    *severity= LIBDAX_MSGS_SEV_SORRY;
  else if(strncmp(severity_name,"WARNING",7)==0)
@@ -268,12 +266,10 @@ int libdax_msgs__text_to_sev(char *severity_name, int *severity,
    *severity= LIBDAX_MSGS_SEV_UPDATE;
  else if(strncmp(severity_name,"DEBUG",5)==0)
    *severity= LIBDAX_MSGS_SEV_DEBUG;
- else if(strncmp(severity_name,"ERRFILE",7)==0)
-   *severity= LIBDAX_MSGS_SEV_ERRFILE;
  else if(strncmp(severity_name,"ALL",3)==0)
    *severity= LIBDAX_MSGS_SEV_ALL;
  else {
-   *severity= LIBDAX_MSGS_SEV_ALL;
+   *severity= LIBDAX_MSGS_SEV_NEVER;
    return(0);
  }
  return(1);
@@ -284,7 +280,7 @@ int libdax_msgs__sev_to_text(int severity, char **severity_name,
                              int flag)
 {
  if(flag&1) {
-   *severity_name= "NEVER\nABORT\nFATAL\nFAILURE\nMISHAP\nSORRY\nWARNING\nHINT\nNOTE\nUPDATE\nDEBUG\nERRFILE\nALL";
+   *severity_name= "NEVER\nABORT\nFATAL\nFAILURE\nSORRY\nWARNING\nHINT\nNOTE\nUPDATE\nDEBUG\nALL";
    return(1);
  }
  *severity_name= "";
@@ -296,8 +292,6 @@ int libdax_msgs__sev_to_text(int severity, char **severity_name,
    *severity_name= "FATAL";
  else if(severity>=LIBDAX_MSGS_SEV_FAILURE)
    *severity_name= "FAILURE";
- else if(severity>=LIBDAX_MSGS_SEV_MISHAP)
-   *severity_name= "MISHAP";
  else if(severity>=LIBDAX_MSGS_SEV_SORRY)
    *severity_name= "SORRY";
  else if(severity>=LIBDAX_MSGS_SEV_WARNING)
@@ -310,8 +304,6 @@ int libdax_msgs__sev_to_text(int severity, char **severity_name,
    *severity_name= "UPDATE";
  else if(severity>=LIBDAX_MSGS_SEV_DEBUG)
    *severity_name= "DEBUG";
- else if(severity>=LIBDAX_MSGS_SEV_ERRFILE)
-   *severity_name= "ERRFILE";
  else if(severity>=LIBDAX_MSGS_SEV_ALL)
    *severity_name= "ALL";
  else {

libburn/libdax_msgs.h

@@ -120,19 +120,6 @@ struct libdax_msgs_item;
 */
 #define LIBDAX_MSGS_SEV_ALL                                          0x00000000
 
-
-/** Messages of this severity shall transport plain disk file paths
-    whenever an event of severity SORRY or above is related with an
-    individual disk file.
-    No message text shall be added to the file path. The ERRFILE message
-    shall be issued before the human readable message which carries the
-    true event severity. That message should contain the file path so it
-    can be found by strstr(message, path)!=NULL.
-    The error code shall be the same as with the human readable message.
-*/ 
-#define LIBDAX_MSGS_SEV_ERRFILE                                      0x08000000
-
-
 /** Debugging messages not to be visible to normal users by default
 */
 #define LIBDAX_MSGS_SEV_DEBUG                                        0x10000000
@@ -154,19 +141,12 @@ struct libdax_msgs_item;
 #define LIBDAX_MSGS_SEV_WARNING                                      0x50000000
 
 
-/** Non-fatal error messages indicating that parts of an action failed but
+/** Non-fatal error messages indicating that important parts of an action
-    processing may go on if one accepts deviations from the desired result.
+    failed but processing may go on if one accepts deviations from the
+    desired result.
 
-    SORRY may also be the severity for incidents which are severe enough
+    E.g.: One of several libisofs input files cannot be found.
-    for FAILURE but happen within already started irrevocable actions,
-    like ISO image generation. A precondition for such a severity ease is
-    that the action can be continued after the incident.
-    See below MISHAP for what xorriso would need instead of this kind of SORRY
-    and generates for itself in case of libisofs image generation.
-
-    E.g.: A pattern yields no result.
           A speed setting cannot be made.
-          A libisofs input file is inaccessible during image generation.
 
     After SORRY a function should try to go on if that makes any sense
     and if no threshold prescribes abort on SORRY. The function should
@@ -176,31 +156,15 @@ struct libdax_msgs_item;
 #define LIBDAX_MSGS_SEV_SORRY                                        0x60000000
 
 
-/** A FAILURE (see below) which can be tolerated during long lasting
+/** Non-fatal error indicating that a complete action failed and that
-    operations just because they cannot simply be stopped or revoked.
+    only a thorough new setup of preconditions will give hope for success.
-
-    xorriso converts libisofs SORRY messages issued during image generation
-    into MISHAP messages in order to allow its evaluators to distinguish
-    image generation problems from minor image composition problems.
-    E.g.:
-      A libisofs input file is inaccessible during image generation.
-
-    After a MISHAP a function should behave like after SORRY.
-*/
-#define LIBDAX_MSGS_SEV_MISHAP                                       0x64000000
-
-
-/** Non-fatal error indicating that an important part of an action failed and
-    that only a new setup of preconditions will give hope for sufficient
-    success.
 
     E.g.: No media is inserted in the output drive.
           No write mode can be found for inserted media.
-          A libisofs input file is inaccessible during grafting.
+          All libisofs input files are inaccessible.
 
-    After FAILURE a function should end with a return value indicating failure.
+    After FAILURE a function should end very soon with a return value
-    It is at the discretion of the function whether it ends immediately in any
+    indicating failure.
-    case or whether it tries to go on if the eventual threshold allows.
 */
 #define LIBDAX_MSGS_SEV_FAILURE                                      0x68000000
 
@@ -535,81 +499,34 @@ Range "scdbackup"          :  0x00020000 to 0x0002ffff
 ------------------------------------------------------------------------------
 Range "vreixo"              :  0x00030000 to 0x0003ffff
 
- 0x0003ffff (FAILURE,HIGH) = Operation canceled
+ General:
- 0x0003fffe (FATAL,HIGH)   = Unknown or unexpected fatal error
+ 0x00031001 (SORRY,HIGH)    = Cannot read file (ignored)
- 0x0003fffd (FAILURE,HIGH) = Unknown or unexpected error
+ 0x00031002 (FATAL,HIGH)    = Cannot read file (operation canceled)
- 0x0003fffc (FATAL,HIGH)   = Internal programming error
- 0x0003fffb (FAILURE,HIGH) = NULL pointer where NULL not allowed
- 0x0003fffa (FATAL,HIGH)   = Memory allocation error
- 0x0003fff9 (FATAL,HIGH)   = Interrupted by a signal
- 0x0003fff8 (FAILURE,HIGH) = Invalid parameter value
- 0x0003fff7 (FATAL,HIGH)   = Cannot create a needed thread
- 0x0003fff6 (FAILURE,HIGH) = Write error
- 0x0003fff5 (FAILURE,HIGH) = Buffer read error
- 0x0003ffc0 (FAILURE,HIGH) = Trying to add a node already added to another dir
- 0x0003ffbf (FAILURE,HIGH) = Node with same name already exist
- 0x0003ffbe (FAILURE,HIGH) = Trying to remove a node that was not added to dir
- 0x0003ffbd (FAILURE,HIGH) = A requested node does not exist
- 0x0003ffbc (FAILURE,HIGH) = Image already bootable
- 0x0003ffbb (FAILURE,HIGH) = Trying to use an invalid file as boot image
- 0x0003ff80 (FAILURE,HIGH) = Error on file operation
- 0x0003ff7f (FAILURE,HIGH) = Trying to open an already openned file
- 0x0003ff7e (FAILURE,HIGH) = Access to file is not allowed
- 0x0003ff7d (FAILURE,HIGH) = Incorrect path to file
- 0x0003ff7c (FAILURE,HIGH) = The file does not exist in the filesystem
- 0x0003ff7b (FAILURE,HIGH) = Trying to read or close a file not openned
- 0x0003ff7a (FAILURE,HIGH) = Directory used where no dir is expected
- 0x0003ff79 (FAILURE,HIGH) = File read error
- 0x0003ff78 (FAILURE,HIGH) = Not dir used where a dir is expected
- 0x0003ff77 (FAILURE,HIGH) = Not symlink used where a symlink is expected
- 0x0003ff76 (FAILURE,HIGH) = Cannot seek to specified location
- 0x0003ff75 (HINT,MEDIUM)  = File not supported in ECMA-119 tree and ignored
- 0x0003ff74 (HINT,MEDIUM)  = File bigger than supported by used standard
- 0x0003ff73 (MISHAP,HIGH)  = File read error during image creation
- 0x0003ff72 (HINT,MEDIUM)  = Cannot convert filename to requested charset
- 0x0003ff71 (SORRY,HIGH)   = File cannot be added to the tree
- 0x0003ff70 (HINT,MEDIUM)  = File path breaks specification constraints
- 0x0003ff00 (FAILURE,HIGH) = Charset conversion error
- 0x0003feff (FAILURE,HIGH) = Too much files to mangle
- 0x0003fec0 (FAILURE,HIGH) = Wrong or damaged Primary Volume Descriptor
- 0x0003febf (SORRY,HIGH)   = Wrong or damaged RR entry
- 0x0003febe (SORRY,HIGH)   = Unsupported RR feature
- 0x0003febd (FAILURE,HIGH) = Wrong or damaged ECMA-119
- 0x0003febc (FAILURE,HIGH) = Unsupported ECMA-119 feature
- 0x0003febb (SORRY,HIGH)   = Wrong or damaged El-Torito catalog
- 0x0003feba (SORRY,HIGH)   = Unsupported El-Torito feature
- 0x0003feb9 (SORRY,HIGH)   = Cannot patch isolinux boot image
- 0x0003feb8 (SORRY,HIGH)   = Unsupported SUSP feature
- 0x0003feb7 (WARNING,HIGH) = Error on a RR entry that can be ignored
- 0x0003feb6 (HINT,MEDIUM)  = Error on a RR entry that can be ignored
- 0x0003feb5 (WARNING,HIGH) = Multiple ER SUSP entries found
- 0x0003feb4 (HINT,MEDIUM)  = Unsupported volume descriptor found
- 0x0003feb3 (WARNING,HIGH) = El-Torito related warning
- 0x0003feb2 (MISHAP,HIGH)  = Image write cancelled
- 0x0003feb1 (WARNING,HIGH) = El-Torito image is hidden
 
-Outdated codes which may not be re-used for other purposes than
+ Image reading:
-re-instating them, if ever:
+ 0x00031000 (FATAL,HIGH)    = Unsupported ISO-9660 image
-
+ 0x00031001 (HINT,MEDIUM)   = Unsupported Vol Desc that will be ignored
-X 0x00031001 (SORRY,HIGH)    = Cannot read file (ignored)
+ 0x00031002 (FATAL,HIGH)    = Damaged ISO-9660 image
-X 0x00031002 (FATAL,HIGH)    = Cannot read file (operation canceled)
+ 0x00031003 (SORRY,HIGH)    = Cannot read previous image file
-X 0x00031000 (FATAL,HIGH)    = Unsupported ISO-9660 image
+ 
-X 0x00031001 (HINT,MEDIUM)   = Unsupported Vol Desc that will be ignored
+ Rock-Ridge:
-X 0x00031002 (FATAL,HIGH)    = Damaged ISO-9660 image
+ 0x00030101 (HINT,MEDIUM)   = Unsupported SUSP entry that will be ignored
-X 0x00031003 (SORRY,HIGH)    = Cannot read previous image file
+ 0x00030102 (SORRY,HIGH)    = Wrong/damaged SUSP entry
-X 0x00030101 (HINT,MEDIUM)   = Unsupported SUSP entry that will be ignored
+ 0x00030103 (WARNING,MEDIUM)= Multiple SUSP ER entries where found
-X 0x00030102 (SORRY,HIGH)    = Wrong/damaged SUSP entry
+ 0x00030111 (SORRY,HIGH)    = Unsupported RR feature
-X 0x00030103 (WARNING,MEDIUM)= Multiple SUSP ER entries where found
+ 0x00030112 (SORRY,HIGH)    = Error in a Rock Ridge entry
-X 0x00030111 (SORRY,HIGH)    = Unsupported RR feature
+ 
-X 0x00030112 (SORRY,HIGH)    = Error in a Rock Ridge entry
+ El-Torito:
-X 0x00030201 (HINT,MEDIUM)   = Unsupported Boot Vol Desc that will be ignored
+ 0x00030201 (HINT,MEDIUM)   = Unsupported Boot Vol Desc that will be ignored
-X 0x00030202 (SORRY,HIGH)    = Wrong El-Torito catalog
+ 0x00030202 (SORRY,HIGH)    = Wrong El-Torito catalog
-X 0x00030203 (HINT,MEDIUM)   = Unsupported El-Torito feature
+ 0x00030203 (HINT,MEDIUM)   = Unsupported El-Torito feature
-X 0x00030204 (SORRY,HIGH)    = Invalid file to be an El-Torito image
+ 0x00030204 (SORRY,HIGH)    = Invalid file to be an El-Torito image
-X 0x00030205 (WARNING,MEDIUM)= Cannot properly patch isolinux image
+ 0x00030205 (WARNING,MEDIUM)= Cannot properly patch isolinux image
-X 0x00030206 (WARNING,MEDIUM)= Copying El-Torito from a previous image without
+ 0x00030206 (WARNING,MEDIUM)= Copying El-Torito from a previous image without
-X                              enought info about it
+                              enought info about it
-X 0x00030301 (NOTE,MEDIUM)   = Unsupported file type for Joliet tree
+ 
+ Joliet:
+ 0x00030301 (NOTE,MEDIUM)   = Unsupported file type for Joliet tree
 
 
 ------------------------------------------------------------------------------
@@ -623,23 +540,6 @@ Range "application"         :  0x00040000 to 0x0004ffff
  0x00040005 (NOTE,HIGH)     : Application supplied message
  0x00040006 (UPDATE,HIGH)   : Application supplied message
  0x00040007 (DEBUG,HIGH)    : Application supplied message
- 0x00040008 (*,HIGH)        : Application supplied message
-
-
-------------------------------------------------------------------------------
-Range "libisofs-xorriso"    :  0x00050000 to 0x0005ffff
-
-This is an alternative representation of libisofs.so.6 error codes in xorriso.
-If values returned by iso_error_get_code() do not fit into 0x30000 to 0x3ffff
-then they get truncated to 16 bit and mapped into this range.
-(This should never need to happen, of course.)
-
-------------------------------------------------------------------------------
-Range "libisoburn"          :  0x00060000 to 0x00006ffff
-
- 0x00060000 (*,*)           : Message which shall be attributed to libisoburn
-
- >>> the messages of libisoburn need to be registered individually
 
 
 ------------------------------------------------------------------------------

libburn/mmc.c

@@ -46,7 +46,6 @@ extern struct libdax_msgs *libdax_messenger;
 #define Libburn_support_dvd_minusrw_overW 1
 
 /* ts A70112 */
-/* ts A80410 : applies to BD-RE too */
 #define Libburn_support_dvd_raM 1
 
 /* ts A70129 */
@@ -55,26 +54,7 @@ extern struct libdax_msgs *libdax_messenger;
 /* ts A70306 */
 #define Libburn_support_dvd_plus_R 1
 
-/* ts A70509 : handling 0x41 and 0x42 as read-only types */
+/* DVD progress report:
-#define Libburn_support_bd_r_readonlY 1
-
-
-/* ts A80410 : <<< Dangerous experiment: Pretend that DVD-RAM is BD-RE
- # define Libburn_dvd_ram_as_bd_rE yes
-*/
-/* ts A80509 : <<< Experiment: pretend that DVD-COM and CD-ROM are other media
-                   like BD-ROM (0x40), BD-R seq (0x41), BD-R random (0x42)
- # define Libburn_rom_as_profilE 0x40
-*/
-
-
-/* ts A80425 : Prevents command FORMAT UNIT for DVD-RAM or BD-RE.
-               Useful only to test the selection of format descriptors without
-               actually formatting the media.
- # define Libburn_do_not_format_dvd_ram_or_bd_rE 1
-*/
-
-/* DVD/BD progress report:
    ts A61219 : It seems to work with a used (i.e. thoroughly formatted) DVD+RW.
                Error messages of class DEBUG appear because of inability to
                read TOC or track info. Nevertheless, the written images verify.
@@ -111,14 +91,6 @@ extern struct libdax_msgs *libdax_messenger;
    ts A70208 : Finally made tests with DVD-R. Worked exactly as new DVD-RW.
    ts A70306 : Implemented DVD+R (always -multi for now)
    ts A70330 : Allowed finalizing of DVD+R.
-   ts A80228 : Made DVD+R/DL support official after nightmorph reported success
-               in http://libburnia-project.org/ticket/13
-   ts A80416 : drive->do_stream_recording brings DVD-RAM to full nominal
-               writing speed at cost of no defect management.
-   ts A80416 : Giulio Orsero reports success with BD-RE writing. With
-               drive->do_stream_recording it does full nominal speed.
-   ts A80506 : Giulio Orsero reports success with BD-RE formatting.
-               BD-RE is now an officially supported profile.
 */
 
 /* ts A70519 : With MMC commands of data direction FROM_DRIVE:
@@ -334,19 +306,14 @@ int mmc_read_track_info(struct burn_drive *d, int trackno, struct buffer *buf,
 	c.opcode[1] = 1;
 	if(trackno<=0) {
 		if (d->current_profile == 0x1a || d->current_profile == 0x13 ||
-		    d->current_profile == 0x12 || d->current_profile == 0x42 ||
+		    d->current_profile == 0x12 )
-		    d->current_profile == 0x43)
+			 /* DVD+RW , DVD-RW restricted overwrite , DVD-RAM */
-			 /* DVD+RW , DVD-RW restricted overwrite , DVD-RAM
-			    BD-R random recording, BD-RE */
 			trackno = 1;
 		else if (d->current_profile == 0x10 ||
 			 d->current_profile == 0x11 ||
 			 d->current_profile == 0x14 ||
-			 d->current_profile == 0x15 ||
+			 d->current_profile == 0x15)
-			 d->current_profile == 0x40 ||
+			/* DVD-ROM ,  DVD-R[W] Sequential */
-			 d->current_profile == 0x41)
-			/* DVD-ROM ,  DVD-R[W] Sequential ,
-			   BD-ROM , BD-R sequential */
 			trackno = d->last_track_no;
 		else /* mmc5r03c.pdf: valid only for CD, DVD+R, DVD+R DL */
 			trackno = 0xFF;
@@ -382,7 +349,7 @@ int mmc_get_nwa(struct burn_drive *d, int trackno, int *lba, int *nwa)
 	*nwa = mmc_four_char_to_int(data + 12);
 	num = mmc_four_char_to_int(data + 16);
 	if (d->current_profile == 0x1a || d->current_profile == 0x13 ||
-	    d->current_profile == 0x12 || d->current_profile == 0x43) {
+	    d->current_profile == 0x12) {
 		 /* overwriteable */
 		*lba = *nwa = num = 0;
 	} else if (!(data[7]&1)) {
@@ -393,8 +360,7 @@ int mmc_get_nwa(struct burn_drive *d, int trackno, int *lba, int *nwa)
 		return 0;
 	}
 	if (num > 0) {
-		burn_drive_set_media_capacity_remaining(d,
+		d->media_capacity_remaining = ((off_t) num) * ((off_t) 2048);
-					((off_t) num) * ((off_t) 2048));
 		d->media_lba_limit = *nwa + num;
 	} else
 		d->media_lba_limit = 0;
@@ -734,26 +700,22 @@ int mmc_write(struct burn_drive *d, int start, struct buffer *buf)
 	if(d->wait_for_buffer_free)
 		mmc_wait_for_buffer_free(d, buf);
 
-	/* ts A80412 */
+	scsi_init_command(&c, MMC_WRITE_10, sizeof(MMC_WRITE_10));
-	if(d->do_stream_recording > 0)  {
+/*
-
+	memcpy(c.opcode, MMC_WRITE_10, sizeof(MMC_WRITE_10));
-		/* >>> ??? is WRITE12 available ?  */
+	c.oplen = sizeof(MMC_WRITE_10);
-			/* >>> ??? inquire feature 107h Stream Writing bit ? */
+*/
-
-		scsi_init_command(&c, MMC_WRITE_12, sizeof(MMC_WRITE_12));
-		mmc_int_to_four_char(c.opcode + 2, start);
-		mmc_int_to_four_char(c.opcode + 6, len);
-		c.opcode[10] = 1<<7; /* Streaming bit */
-	} else {
-		scsi_init_command(&c, MMC_WRITE_10, sizeof(MMC_WRITE_10));
-		mmc_int_to_four_char(c.opcode + 2, start);
-		c.opcode[6] = 0;
-		c.opcode[7] = (len >> 8) & 0xFF;
-		c.opcode[8] = len & 0xFF;
-	}
 	c.retry = 1;
+	mmc_int_to_four_char(c.opcode + 2, start);
+	c.opcode[6] = 0;
+	c.opcode[7] = (len >> 8) & 0xFF;
+	c.opcode[8] = len & 0xFF;
 	c.page = buf;
 	c.dir = TO_DRIVE;
+/*
+	burn_print(12, "%d, %d, %d, %d - ", c->opcode[2], c->opcode[3], c->opcode[4], c->opcode[5]);
+	burn_print(12, "%d, %d, %d, %d\n", c->opcode[6], c->opcode[7], c->opcode[8], c->opcode[9]);
+*/
 
 #ifdef Libburn_log_in_and_out_streaM
 	/* <<< ts A61031 */
@@ -1013,8 +975,7 @@ int mmc_fake_toc(struct burn_drive *d)
 	}
 	/* ts A71128 : My DVD-ROM drive issues no reliable track info.
 			One has to try 43h READ TOC/PMA/ATIP Form 0. */
-	if ((d->current_profile == 0x10 || d->current_profile == 0x40) &&
+	if (d->current_profile == 0x10 && d->last_track_no <= 1) {
-	     d->last_track_no <= 1) {
 		ret = mmc_read_toc_fmt0(d);
 		return ret;
 	}
@@ -1077,9 +1038,9 @@ int mmc_fake_toc(struct burn_drive *d)
 		if (session_number > d->disc->sessions) {
 			if (i == d->last_track_no - 1) {
 				/* ts A70212 : Last track field Free Blocks */
-				burn_drive_set_media_capacity_remaining(d,
+				d->media_capacity_remaining =
 				  ((off_t) mmc_four_char_to_int(tdata + 16)) *
-				  ((off_t) 2048));
+				  ((off_t) 2048);
 				d->media_lba_limit = 0;
 			}	
 	continue;
@@ -1457,28 +1418,10 @@ static int mmc_read_disc_info_al(struct burn_drive *d, int *alloc_len)
 	d->erasable = !!(data[2] & 16);
 
  	disc_status = data[2] & 3;
-	if (d->current_profile == 0x10 || d->current_profile == 0x40) {
+	if (d->current_profile == 0x10) { /* DVD-ROM */
-							 /* DVD-ROM , BD-ROM */
 		disc_status = 2; /* always full and finalized */
 		d->erasable = 0; /* never erasable */
 	}
-
-	/* ts A80207 : DVD - R DL can normally be read but not be written */
-	if(d->current_profile == 0x15 && !burn_support_untested_profiles) {
-		disc_status = 2; /* always full and finalized */
-		d->erasable = 0; /* never erasable */
-	}
-
-#ifdef Libburn_support_bd_r_readonlY
-	/* <<< For now: declaring BD-R read-only
-	*/
-	if (d->current_profile == 0x41 || d->current_profile == 0x42) {
-						 /* BD-R seq, BD-R rnd */
-		disc_status = 2; /* always full and finalized */
-		d->erasable = 0; /* never erasable */
-	}
-#endif /* Libburn_support_bd_r_readonlY */
-
 	switch (disc_status) {
 	case 0:
 		d->toc_entries = 0;
@@ -1502,21 +1445,6 @@ static int mmc_read_disc_info_al(struct burn_drive *d, int *alloc_len)
 		break;
 	}
 
-
-#ifdef NIX
-        /* <<< on its way out. DVD-R DL are current_is_supported_profile
-               unconditionally. Writeability is handled above now.
-        */
-	/* ts A80207 : DVD - R DL can normally be read but not be written */
-	if(d->current_profile == 0x15 && !d->current_is_supported_profile) {
-		if(d->status == BURN_DISC_APPENDABLE)
-			d->status = BURN_DISC_FULL;
-		d->erasable = 0; /* never erasable */
-		d->current_is_supported_profile = 1;
-	}
-#endif /* NIX */
-
-
 	if ((d->current_profile != 0 || d->status != BURN_DISC_UNREADY) 
 		&& ! d->current_is_supported_profile) {
 		if (!d->silent_on_scsi_error) {
@@ -1552,7 +1480,7 @@ static int mmc_read_disc_info_al(struct burn_drive *d, int *alloc_len)
 	   ts A70112 : same for DVD-RAM
 	*/
 	if (d->current_profile == 0x1a || d->current_profile == 0x13 ||
-	    d->current_profile == 0x12 || d->current_profile == 0x43)
+	    d->current_profile == 0x12)
 		d->status = BURN_DISC_BLANK;
 
 	if (d->status == BURN_DISC_BLANK) {
@@ -2152,34 +2080,9 @@ static int mmc_get_configuration_al(struct burn_drive *d, int *alloc_len)
 	if (len < 8 || len > 4096)
 		return 0;
 	cp = (c.page->data[6]<<8) | c.page->data[7];
-
-#ifdef Libburn_rom_as_profilE
-	if (cp == 0x08 || cp == 0x10 || cp==0x40)
-		cp = Libburn_rom_as_profilE;
-#endif /* Libburn_rom_as_profilE */
-
 	d->current_profile = cp;
 	strcpy(d->current_profile_text, mmc_obtain_profile_name(cp));
-
+	if (cp == 0x08 || cp == 0x09 || cp == 0x0a)
-	/* Read-only supported media */
-
-	if (cp == 0x08) /* CD-ROM */
-		d->current_is_supported_profile = d->current_is_cd_profile = 1;
-	if (cp == 0x10) /* DVD-ROM */
-		d->current_is_supported_profile = 1;
-	if (cp == 0x40) /* BD-ROM */
-		d->current_is_supported_profile = 1;
-
-#ifdef Libburn_support_bd_r_readonlY
-	if (cp == 0x41 || cp == 0x42) /* BD-R sequential, BD-R random */
-		d->current_is_supported_profile = 1;
-#endif
-
-
-	/* Write supported media (they get declared suitable in
-	                          burn_disc_get_multi_caps) */
-
-	if (cp == 0x09 || cp == 0x0a)
 		d->current_is_supported_profile = d->current_is_cd_profile = 1;
 
 #ifdef Libburn_support_dvd_plus_rW
@@ -2191,25 +2094,18 @@ static int mmc_get_configuration_al(struct burn_drive *d, int *alloc_len)
 		d->current_is_supported_profile = 1;
 #endif
 #ifdef Libburn_support_dvd_raM
-	if (cp == 0x12 || cp == 0x43) {                  /* DVD-RAM , BD-RE */
+	if (cp == 0x12)
 		d->current_is_supported_profile = 1;
-
-#ifdef Libburn_dvd_ram_as_bd_rE
-		cp = d->current_profile = 0x43;
-		strcpy(d->current_profile_text, mmc_obtain_profile_name(cp));
-#endif
-
-	}
 #endif
 #ifdef Libburn_support_dvd_r_seQ
-	if (cp == 0x11 || cp == 0x14) /* DVD-R, DVD-RW */
+	if (cp == 0x10 || cp == 0x11 || cp == 0x14) /* DVD-ROM,DVD-R,DVD-RW */
 		d->current_is_supported_profile = 1;
-	if (cp == 0x15) /* DVD-R/DL . */
+	if (cp == 0x15 && burn_support_untested_profiles) /* DVD-R/DL */
-		 	/* Writeable only if burn_support_untested_profiles */
 		d->current_is_supported_profile = 1;
 #endif
 #ifdef Libburn_support_dvd_plus_R
-	if (cp == 0x1b || cp == 0x2b) /* DVD+R , DVD+R/DL */
+	if (cp == 0x1b || (cp == 0x2b && burn_support_untested_profiles))
+						/* DVD+R , DVD+R/DL */
 		d->current_is_supported_profile = 1;
 #endif
 
@@ -2419,8 +2315,6 @@ static int mmc_read_format_capacities_al(struct burn_drive *d,
 	d->format_descr_type = dpt[4] & 3;
 	d->format_curr_max_size = (((off_t) dpt[0]) << 24)
 		 		  + (dpt[1] << 16) + (dpt[2] << 8) + dpt[3];
-	if (d->format_descr_type == BURN_FORMAT_IS_UNKNOWN)
-		d->format_curr_max_size = 0;
 	d->format_curr_blsas = (dpt[5] << 16) + (dpt[6] << 8) + dpt[7];
 
 /* <<<
@@ -2433,45 +2327,6 @@ static int mmc_read_format_capacities_al(struct burn_drive *d,
 */
 
 	d->format_curr_max_size *= (off_t) 2048;
-	if((d->current_profile == 0x12 || d->current_profile == 0x43)
-	   && d->media_capacity_remaining == 0) {
-		burn_drive_set_media_capacity_remaining(d,
-						d->format_curr_max_size);
-		d->media_lba_limit = d->format_curr_max_size / 2048;
-	}
-
-
-#ifdef Libburn_dvd_ram_as_bd_rE
-	/* <<< dummy format descriptor list as obtained from
-	       dvd+rw-mediainfo by Giulio Orsero in April 2008
-	*/
-	d->num_format_descr = 5;
-	d->format_descriptors[0].type = 0x00;
-	d->format_descriptors[0].size = (off_t) 11826176 * (off_t) 2048;
-	d->format_descriptors[0].tdp = 0x3000;
-	d->format_descriptors[1].type = 0x30;
-	d->format_descriptors[1].size = (off_t) 11826176 * (off_t) 2048;
-	d->format_descriptors[1].tdp = 0x3000;
-	d->format_descriptors[2].type = 0x30;
-	d->format_descriptors[2].size = (off_t) 11564032 * (off_t) 2048;
-	d->format_descriptors[2].tdp = 0x5000;
-	d->format_descriptors[3].type = 0x30;
-	d->format_descriptors[3].size = (off_t) 12088320 * (off_t) 2048;
-	d->format_descriptors[3].tdp = 0x1000;
-	d->format_descriptors[4].type = 0x31;
-	d->format_descriptors[4].size = (off_t) 12219392 * (off_t) 2048;
-	d->format_descriptors[4].tdp = 0x800;
-	d->best_format_type = 0x00;
-	d->best_format_size = (off_t) 11826176 * (off_t) 2048;
-
-	/* silencing compiler warnings about unused variables */
-	num_blocks = size = sign = i = max_score = num_descr = score = type = 0;
-
-	if (d->current_profile == 0x12 || d->current_profile == 0x43)
-		return 1;
-	d->num_format_descr = 0;
-
-#endif /* Libburn_dvd_ram_as_bd_rE */
 
 	if (top_wanted == 0x00 || top_wanted == 0x10)
 		sign = -1; /* the caller clearly desires full format */
@@ -2504,6 +2359,11 @@ static int mmc_read_format_capacities_al(struct burn_drive *d,
 		/* Criterion is proximity to quick intermediate state */
 		if (type == 0x00) { /* full format (with lead out) */
 			score = 1 * sign;
+			if(d->current_profile == 0x12 &&
+			   d->media_capacity_remaining == 0) {
+				d->media_capacity_remaining = size;
+				d->media_lba_limit = num_blocks;
+			}
 		} else if (type == 0x10) { /* DVD-RW full format */
 			score = 10 * sign;
 		} else if(type == 0x13) { /* DVD-RW quick grow last session */
@@ -2511,13 +2371,12 @@ static int mmc_read_format_capacities_al(struct burn_drive *d,
 		} else if(type == 0x15) { /* DVD-RW Quick */
 			score = 50 * sign;
 			if(d->current_profile == 0x13) {
-				burn_drive_set_media_capacity_remaining(d,
+				d->media_capacity_remaining = size;
-									size);
 				d->media_lba_limit = num_blocks;
 			}
 		} else if(type == 0x26) { /* DVD+RW */
 			score = 1 * sign;
-			burn_drive_set_media_capacity_remaining(d, size);
+			d->media_capacity_remaining = size;
 			d->media_lba_limit = num_blocks;
 		} else {
 	continue;
@@ -2673,16 +2532,10 @@ int mmc_read_buffer_capacity(struct burn_drive *d)
                and mmc5r03c.pdf, 6.5 FORMAT UNIT */
 /*
    @param size The size (in bytes) to be sent with the FORMAT comand
-   @param flag bit1+2: size mode
+   @param flag bit1= insist in size 0 even if there is a better default known
-                 0 = use parameter size as far as it makes sense
+               bit2= format to maximum available size
-                 1 = insist in size 0 even if there is a better default known
-                 2 = without bit7: format to maximum available size
-                     with bit7   : take size from indexed format descriptor
-                 3 = format to default size
                bit3= expand format up to at least size
                bit4= enforce re-format of (partly) formatted media
-               bit5= try to disable eventual defect management
-               bit6= try to avoid lengthy media certification
                bit7= bit8 to bit15 contain the index of the format to use
                bit8-bit15 = see bit7
 */
@@ -2691,15 +2544,13 @@ int mmc_format_unit(struct burn_drive *d, off_t size, int flag)
 	struct buffer buf;
 	struct command c;
 	int ret, tolerate_failure = 0, return_immediately = 0, i, format_type;
-	int index, format_sub_type = 0, format_00_index, size_mode;
+	int index;
-	int accept_count = 0;
+	off_t num_of_blocks = 0, diff;
-	off_t num_of_blocks = 0, diff, format_size, i_size, format_00_max_size;
 	char msg[160],descr[80];
 	int full_format_type = 0x00; /* Full Format (or 0x10 for DVD-RW ?) */
 
 	if (mmc_function_spy(d, "mmc_format_unit") <= 0)
 		return 0;
-	size_mode = (flag >> 1) & 3;
 
 	scsi_init_command(&c, MMC_FORMAT_UNIT, sizeof(MMC_FORMAT_UNIT));
 /*
@@ -2726,7 +2577,7 @@ int mmc_format_unit(struct burn_drive *d, off_t size, int flag)
 		if (ret <= 0)
 			goto selected_not_suitable;
 		index = (flag >> 8) & 0xff;
-		if(index < 0 || index >= d->num_format_descr) {
+		if(index < 0 || index > d->num_format_descr) {
 selected_not_suitable:;
 			libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x00020132,
@@ -2737,17 +2588,13 @@ selected_not_suitable:;
 		}
 		if (!(d->current_profile == 0x13 ||
 			d->current_profile == 0x14 ||
-			d->current_profile == 0x1a ||
+			d->current_profile == 0x1a))
-			d->current_profile == 0x12 ||
-			 d->current_profile == 0x43))
 			goto unsuitable_media;
 		      
 		format_type = d->format_descriptors[index].type;
-		if (!(format_type == 0x00 || format_type == 0x01 ||
+		if (!(format_type == 0x00 || format_type == 0x10 ||
-		      format_type == 0x10 ||
 		      format_type == 0x11 || format_type == 0x13 ||
-		      format_type == 0x15 || format_type == 0x26 ||
+		      format_type == 0x15 || format_type == 0x26))
- 		      format_type == 0x30 || format_type == 0x31 ))
 			goto selected_not_suitable;
 		if (flag & 4) {
 			num_of_blocks =
@@ -2759,20 +2606,7 @@ selected_not_suitable:;
 				 c.page->data[9 + i] =
 					( d->format_descriptors[index].tdp >>
 					  (16 - 8 * i)) & 0xff;
-		if (format_type == 0x30 || format_type == 0x31) {
+		sprintf(descr, "%s (bit7)", d->current_profile_text);
-			if (flag & 64)
-				format_sub_type = 3; /* Quick certification */
-			else
-				format_sub_type = 2; /* Full certification */
-		}
-		if (d->current_profile == 0x12 && format_type !=0x01 &&
-		    (flag & 64)) {
-			/* DCRT and CmpList, see below */
-			c.page->data[1] |= 0x20;
-			c.opcode[1] |= 0x08;
-		}
-		c.page->data[1] |= 0x80;  /* FOV = this flag vector is valid */
-		sprintf(descr, "%s (descr %d)", d->current_profile_text,index);
 		return_immediately = 1; /* caller must do the waiting */
 
 	} else if (d->current_profile == 0x1a) { /* DVD+RW */
@@ -2783,8 +2617,6 @@ selected_not_suitable:;
 		/* mmc5r03c.pdf , 6.5.4.2.14, DVD+RW Basic Format */
 		format_type = 0x26;
 
-					/* >>> ??? is this "| 8" a bug ? */
-
 		if ((size <= 0 && !(flag & 2)) || (flag & (4 | 8))) {
 			/* maximum capacity */
 			memset(c.page->data + 4, 0xff, 4); 
@@ -2872,7 +2704,6 @@ selected_not_suitable:;
 			}
 
 		} else {
-no_suitable_formatting_type:;
 			libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x00020131,
 				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
@@ -2886,170 +2717,9 @@ no_suitable_formatting_type:;
 			format_type == 0x15 ? "quick" : "full");
 		return_immediately = 1; /* caller must do the waiting */
 
-	} else if (d->current_profile == 0x12) {
-		/* ts A80417 : DVD-RAM */
-		/*  6.5.4.2.1  Format Type = 00h (Full Format)
-		    6.5.4.2.2  Format Type = 01h (Spare Area Expansion)
-		*/
-		index = format_00_index = -1;
-		format_size = format_00_max_size = -1;
-		for (i = 0; i < d->num_format_descr; i++) {
-			format_type = d->format_descriptors[i].type;
-			i_size = d->format_descriptors[i].size;
-			if (format_type != 0x00 && format_type != 0x01)
-		continue;
-			if (flag & 32) { /* No defect mgt */
-				/* Search for largest 0x00 format descriptor */
-				if (format_type != 0x00)
-		continue;
-				if (i_size < format_size)
-		continue;
-				format_size = i_size;
-				index = i;
-		continue;
-			} else if (flag & 4) { /*Max or default size with mgt*/
-				/* Search for second largest 0x00
-				   format descriptor. For max size allow
-				   format type 0x01.
-				 */
-				if (format_type == 0x00) {
-					if (i_size < format_size) 
-		continue;
-					if (i_size < format_00_max_size) {
-						format_size = i_size;
-						index = i;
-		continue;
-					}
-					format_size = format_00_max_size;
-					index = format_00_index;
-					format_00_max_size = i_size;
-					format_00_index = i;
-		continue;
-				}
-				if (size_mode==3)
-		continue;
-				if (i_size > format_size) {
-					format_size = i_size;
-					index = i;
-				}
-		continue;
-			} 
-			/* Search for smallest 0x0 or 0x01
-			   descriptor >= size */;
-			if (d->format_descriptors[i].size >= size &&
-			    (format_size < 0 || i_size < format_size)
-			   ) {
-				format_size = i_size;
-				index = i;
-			}
-		}
-		if(index < 0 && (flag & 4) && !(flag & 32)) {
-			format_size = format_00_max_size;
-			index = format_00_index;
-		}
-		if(index < 0)
-			goto no_suitable_formatting_type;
-		format_type = d->format_descriptors[index].type;
-		num_of_blocks = d->format_descriptors[index].size / 2048;
-		mmc_int_to_four_char(c.page->data + 4, num_of_blocks);
-		for (i = 0; i < 3; i++)
-			 c.page->data[9 + i] =
-				( d->format_descriptors[index].tdp >>
-					  (16 - 8 * i)) & 0xff;
-		sprintf(descr, "%s", d->current_profile_text);
-		return_immediately = 1; /* caller must do the waiting */
-		c.page->data[1] |= 0x80;  /* FOV = this flag vector is valid */
-
-		if ((flag & 64) && format_type != 0x01) {
-			/* MMC-5 6.5.3.2 , 6.5.4.2.1.2
-			   DCRT: Disable Certification and maintain number
-			         of blocks
-   		           CmpList: Override maintaining of number of blocks
-			            with DCRT
-			*/
-			/* ts A80426 : prevents change of formatted size
-		               with PHILIPS SPD3300L and Verbatim 3x DVD-RAM
-			       and format_type 0x00. Works on TSSTcorp SH-S203B
-			*/
-			c.page->data[1] |= 0x20;
-			c.opcode[1] |= 0x08;
-		}
-
-	} else if (d->current_profile == 0x43) {
-		/* BD-RE */
-		index = -1;
-		format_size = -1;
-		if (d->num_format_descr <= 0)
-			goto no_suitable_formatting_type;
-		if (d->format_descriptors[0].type != 0)
-			goto no_suitable_formatting_type;
-		for (i = 0; i < d->num_format_descr; i++) {
-			format_type = d->format_descriptors[i].type;
-			i_size = d->format_descriptors[i].size;
-			if (format_type != 0x00 && format_type != 0x30 &&
-			    format_type != 0x31)
-		continue;
-			if (flag & 32) { /* No defect mgt */
-				/* search largest format 0x31 */
-				if(format_type != 0x31)
-		continue;
-			} else if(size_mode == 2) { /* max payload size */
-				/* search largest 0x30 format descriptor */
-				if(format_type != 0x30)
-		continue;
-			} else if(size_mode == 3) { /* default payload size */
-				if (accept_count < 1)
-					index = 0; /* this cannot certify */
-				if(format_type != 0x30)
-		continue;
-				accept_count++;
-				if (accept_count == 1)
-					index = i;
-		continue;
-			} else { /* defect managed format with size wish */
-				/* search for smallest 0x30 >= size */
-				if(format_type != 0x30)
-		continue;
-				if (i_size < size)
-		continue;
-				if (format_size >= 0 && i_size >= format_size)
-		continue;
-				index = i;
-				format_size = i_size;
-		continue;
-			}
-			/* common for all cases which search largest
-			   descriptors */
-			if (i_size > format_size) {
-				format_size = i_size;
-				index = i;
-			}
-		}
-		if (size_mode == 2 && index < 0 && !(flag & 32))
-			index = 0;
-		if (index < 0)
-			goto no_suitable_formatting_type;
-		format_type = d->format_descriptors[index].type;
-		if (format_type == 0x30 || format_type == 0x31) {
-			if (flag & 64)
-				format_sub_type = 3; /* Quick certification */
-			else
-				format_sub_type = 2; /* Full certification */
-		}
-		num_of_blocks = d->format_descriptors[index].size / 2048;
-		mmc_int_to_four_char(c.page->data + 4, num_of_blocks);
-		for (i = 0; i < 3; i++)
-			 c.page->data[9 + i] =
-				( d->format_descriptors[index].tdp >>
-					  (16 - 8 * i)) & 0xff;
-		sprintf(descr, "%s", d->current_profile_text);
-		return_immediately = 1; /* caller must do the waiting */
-		c.page->data[1] |= 0x80;  /* FOV = this flag vector is valid */
-		
 	} else { 
 
-		/* >>> other formattable types to come */
+	/* >>> other formattable types to come */
-
 unsuitable_media:;
 		sprintf(msg, "Unsuitable media detected. Profile %4.4Xh  %s",
 			d->current_profile, d->current_profile_text);
@@ -3059,39 +2729,13 @@ unsuitable_media:;
 			msg, 0, 0);
 		return 0;
 	}
-	c.page->data[8] = (format_type << 2) | (format_sub_type & 3);
+	c.page->data[8] = format_type << 2;
 
-	sprintf(msg, "Format type %2.2Xh \"%s\", blocks = %.f",
+	sprintf(msg, "Format type %2.2Xh \"%s\", blocks = %.f\n",
 		format_type, descr, (double) num_of_blocks);
 	libdax_msgs_submit(libdax_messenger, d->global_index, 0x00000002,
 			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO,
 			msg, 0, 0);
-	sprintf(msg, "CDB: ");
-	for (i = 0; i < 6; i++)
-		sprintf(msg + strlen(msg), "%2.2X ", c.opcode[i]);
-	libdax_msgs_submit(libdax_messenger, d->global_index, 0x00000002,
-			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO,
-			msg, 0, 0);
-	sprintf(msg, "Format list: ");
-	for (i = 0; i < 12; i++)
-		sprintf(msg + strlen(msg), "%2.2X ", c.page->data[i]);
-	strcat(msg, "\n");
-	libdax_msgs_submit(libdax_messenger, d->global_index, 0x00000002,
-			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO,
-			msg, 0, 0);
-	
-#ifdef Libburn_do_not_format_dvd_ram_or_bd_rE
-	if(d->current_profile == 0x43 || d->current_profile == 0x12) {
-		sprintf(msg,
-		   "Formatting of %s not implemented yet - This is a dummy",
-		   d->current_profile_text);
-		libdax_msgs_submit(libdax_messenger, d->global_index,
-			0x00000002,
-			LIBDAX_MSGS_SEV_WARNING, LIBDAX_MSGS_PRIO_ZERO,
-			msg, 0, 0);
-		return 1;
-	}
-#endif /* Libburn_do_not_format_dvd_ram_or_bd_rE */
 
 	d->issue_command(d, &c);
 	if (c.error && !tolerate_failure) {
@@ -3350,9 +2994,8 @@ int mmc_compose_mode_page_5(struct burn_drive *d,
 		pd[13] = 16;
 
 	} else if (d->current_profile == 0x1a || d->current_profile == 0x1b ||
-	           d->current_profile == 0x2b || d->current_profile == 0x12 ||
+	           d->current_profile == 0x2b || d->current_profile == 0x12) {
-		   d->current_profile == 0x43) {
+		/* not with DVD+R[W][/DL] or DVD-RAM */;
-		/* not with DVD+R[W][/DL] or DVD-RAM or BD-RE */;
 		return 0;
 	} else {
 		/* Traditional setup for CD */

libburn/options.c

@@ -38,7 +38,6 @@ struct burn_write_opts *burn_write_opts_new(struct burn_drive *drive)
 	opts->start_byte = -1;
 	opts->fill_up_media = 0;
 	opts->force_is_set = 0;
-	opts->do_stream_recording = 0;
 	opts->has_mediacatalog = 0;
 	opts->format = BURN_CDROM;
 	opts->multi = 0;
@@ -381,16 +380,6 @@ void burn_write_opts_set_force(struct burn_write_opts *opts, int use_force)
 }
 
 
-/* ts A80412: API */
-void burn_write_opts_set_stream_recording(struct burn_write_opts *opts,
-					 int value)
-{
-	opts->do_stream_recording = !!value;
-}
-
-
-
-
 /* ts A70901: API */
 struct burn_drive *burn_write_opts_get_drive(struct burn_write_opts *opts)
 {

libburn/options.h

@@ -49,11 +49,6 @@ struct burn_write_opts
 	*/
 	int force_is_set;
 
-	/* ts A80412 : whether to use WRITE12 with Streaming bit set
-	   rather than WRITE10. Speeds up DVD-RAM. Might help with BD-RE.
-	   This gets transferred to burn_drive.do_stream_recording */
-	int do_stream_recording;
-
 	/** A disc can have a media catalog number */
 	int has_mediacatalog;
 	unsigned char mediacatalog[13];

libburn/os-linux.h

@@ -43,12 +43,9 @@ SIGKILL, SIGCHLD, SIGSTOP, SIGURG, SIGWINCH
 /* The maximum size for a (SCSI) i/o transaction */
 /* Important : MUST be at least 32768 ! */
 /* ts A70523 : >32k seems not good with kernel 2.4 USB drivers and audio
-   #define BURN_OS_TRANSPORT_BUFFER_SIZE 32768
-*/
-/* ts A80414 : curbed in write.c CD media to Libburn_cd_obS = 32 kiB
-               re-enlarged transport to 64 kiB for BD-RE experiments
-*/
 #define BURN_OS_TRANSPORT_BUFFER_SIZE 65536
+*/
+#define BURN_OS_TRANSPORT_BUFFER_SIZE 32768
 
 
 /* To hold the index number of the most recently delivered address from

libburn/read.c

@@ -325,19 +325,6 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
 	char msg[81], *wpt;
 	struct buffer buf;
 
-/*
-#define Libburn_read_data_adr_logginG 1
-*/
-#ifdef Libburn_read_data_adr_logginG
-	static FILE *log_fp= NULL;
-
-	if(log_fp == NULL)
-		log_fp = fopen("/tmp/burn_read_data_log", "a");
-	if(log_fp!=NULL)
-		fprintf(log_fp, "%d\n", (int) (byte_address / 2048));
-#endif /* Libburn_read_data_logginG */
-
-
 	*data_count = 0;
 	sose_mem = d->silent_on_scsi_error;
 
@@ -388,10 +375,7 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
 #define O_LARGEFILE 0
 #endif
 
-		fd = d->stdio_fd;
+		fd = open(d->devname, O_RDONLY | O_LARGEFILE);
-		if (fd < 0)
-			d->stdio_fd = fd =
-				open(d->devname, O_RDONLY | O_LARGEFILE);
 		if (fd == -1) {
 			if (errno != ENOENT  || !(flag & 2))
 				libdax_msgs_submit(libdax_messenger,
@@ -464,13 +448,6 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
 				wpt += 2048;
 				*data_count += 2048;
 			}
-			if (!(flag & 2))
-				libdax_msgs_submit(libdax_messenger,
-				  d->global_index,
-				  0x00020000,
-				  LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
-				  "burn_read_data() returns 0",
-				  0, 0);
 			ret = 0; goto ex;
 		}
 		memcpy(wpt, d->buffer->data, cpy_size);
@@ -480,10 +457,8 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
 
 	ret = 1;
 ex:;
-/* <<< let it open until drive is given up or writing shall happen
 	if (fd != -1)
 		close(fd);
-*/
 	d->buffer = NULL;
 	d->busy = BURN_DRIVE_IDLE;
 	return ret;

libburn/sg-linux.c

@@ -308,28 +308,6 @@ static int sg_close_drive_fd(char *fname, int driveno, int *fd, int sorry)
 
 	if(*fd < 0)
 		return(0);
-
-#ifdef CDROM_MEDIA_CHANGED_disabled_because_not_helpful
-#ifdef CDSL_CURRENT
-	/* ts A80217 : wondering whether the os knows about our activities */
-	ret = ioctl(*fd, CDROM_MEDIA_CHANGED, CDSL_CURRENT);
-	sprintf(msg, "ioctl(CDROM_MEDIA_CHANGED) == %d", ret);
-	libdax_msgs_submit(libdax_messenger, driveno, 0x00000002,
-		LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH, msg, 0, 0);
-
-#ifdef BLKFLSBUF_disabled_because_not_helpful
-	ret = ioctl(*fd, BLKFLSBUF, 0);
-	sprintf(msg, "ioctl(BLKFLSBUF) == %d", ret);
-	os_errno = 0;
-	if(ret == -1)
-		os_errno = errno;
-	libdax_msgs_submit(libdax_messenger, driveno, 0x00000002,
-		LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH, msg, os_errno,0);
-#endif /* BLKFLSBUF */
-
-#endif /* CDSL_CURRENT */
-#endif /* CDROM_MEDIA_CHANGED */
-
 	ret = close(*fd);
 	*fd = -1337;
 	if(ret != -1) {

libburn/spc.c

@@ -580,7 +580,7 @@ void spc_sense_write_params(struct burn_drive *d)
 
 	/* ts A70212 : try to setup d->media_capacity_remaining */
 	if (d->current_profile == 0x1a || d->current_profile == 0x13 ||
-	    d->current_profile == 0x12 || d->current_profile == 0x43)
+	    d->current_profile == 0x12)
 		d->read_format_capacities(d, -1);
 	else if (d->status == BURN_DISC_BLANK ||
 	     (d->current_is_cd_profile && d->status == BURN_DISC_APPENDABLE)) {

libburn/transport.h

@@ -187,11 +187,6 @@ struct burn_drive
 	               synchronize chache has happened yet */
 	int needs_sync_cache;
 
-	/* ts A80412 : whether to use WRITE12 with Streaming bit set
-	               rather than WRITE10. Speeds up DVD-RAM. Might help
-	               with BD-RE */
-	int do_stream_recording;
-
 	/* ts A61218 from 51h READ DISC INFORMATION */
 	int bg_format_status; /* 0=needs format start, 1=needs format restart*/
 
@@ -353,9 +348,4 @@ struct burn_drive
 
 /* end of generic 'drive' data structures */
 
-/* ts A80422 : centralizing this setting for debugging purposes
-*/
-int burn_drive_set_media_capacity_remaining(struct burn_drive *d, off_t value);
-
-
 #endif /* __TRANSPORT */

libburn/util.c

@@ -47,14 +47,7 @@ char *burn_strndup(char *s, int n)
 
 void burn_version(int *major, int *minor, int *micro)
 {
-/* ts A80408 : switched from configure.ac versioning to libburn.h versioning */
-#ifdef burn_header_version_major
-    *major = burn_header_version_major;
-    *minor = burn_header_version_minor;
-    *micro = burn_header_version_micro;
-#else
     *major = BURN_MAJOR_VERSION;
     *minor = BURN_MINOR_VERSION;
     *micro = BURN_MICRO_VERSION;
-#endif
 }

libburn/write.c

@@ -49,24 +49,6 @@
 extern struct libdax_msgs *libdax_messenger;
 
 
-/* The maximum output size to be used with CD media. This is also curbed
-   by BURN_OS_TRANSPORT_BUFFER_SIZE. The smaller number gets into effect.
-*/ 
-#define Libburn_cd_obS (32 * 1024)
-
-/* The size to be used with DVD media.
-*/
-#define Libburn_dvd_obS (32 * 1024)
-
-/* The size to be used with BD-RE media in normal, not streamed mode.
-*/
-#define Libburn_bd_re_obS (32 * 1024)
-
-/* The size to be used with BD-RE media in streamed mode.
-*/
-#define Libburn_bd_re_streamed_obS (64 * 1024)
-
-
 static int type_to_ctrl(int mode)
 {
 	int ctrl = 0;
@@ -985,9 +967,8 @@ int burn_precheck_write(struct burn_write_opts *o, struct burn_disc *disc,
 	if (d->status == BURN_DISC_UNSUITABLE)
 		goto unsuitable_profile;
 	if (d->drive_role == 2 ||
-		d->current_profile == 0x1a || d->current_profile == 0x12 ||
+		d->current_profile == 0x1a || d->current_profile == 0x12) { 
-		d->current_profile == 0x43) { 
+		/* DVD+RW , DVD-RAM , emulated drive on stdio file */
-		/* DVD+RW , DVD-RAM , BD-RE, emulated drive on stdio file */
 		if (o->start_byte >= 0 && (o->start_byte % 2048))
 			strcat(reasons,
 			 "write start address not properly aligned to 2048, ");
@@ -1389,8 +1370,8 @@ int burn_dvd_write_session(struct burn_write_opts *o,
 		ret = burn_disc_close_session_dvd_minus_r(o, s);
 		if (ret <= 0)
 			return 0;
-	} else if (d->current_profile == 0x12 || d->current_profile == 0x43) {
+	} else if (d->current_profile == 0x12) {
-		/* DVD-RAM , BD-RE */
+		/* DVD-RAM */
 		/* ??? any finalization needed ? */;
 	} else if (d->current_profile == 0x13) {
 		/* DVD-RW restricted overwrite */
@@ -1419,6 +1400,7 @@ int burn_disc_setup_dvd_plus_rw(struct burn_write_opts *o,
 {
 	struct burn_drive *d = o->drive;
 	int ret;
+	char msg[160];
 
 	if (d->bg_format_status==0 || d->bg_format_status==1) {
 		d->busy = BURN_DRIVE_FORMATTING;
@@ -1429,6 +1411,16 @@ int burn_disc_setup_dvd_plus_rw(struct burn_write_opts *o,
 		d->busy = BURN_DRIVE_WRITING;
 		d->needs_close_session = 1;
 	}
+	d->nwa = 0;
+	if (o->start_byte >= 0) {
+		d->nwa = o->start_byte / 2048;
+
+		sprintf(msg, "Write start address is  %d * 2048", d->nwa);
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+				0x00020127,
+				LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH,
+				msg, 0, 0);
+	}
 
 	/* >>> perform OPC if needed */;
 
@@ -1518,7 +1510,7 @@ int burn_disc_setup_dvd_plus_r(struct burn_write_opts *o,
 }
 
 
-/* ts A61218 - A70415 */
+/* ts A61218 - A70129 */
 int burn_dvd_write_sync(struct burn_write_opts *o,
 				 struct burn_disc *disc)
 {
@@ -1530,12 +1522,8 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
 
 	d->needs_close_session = 0;
 
-	/* buffer flush trigger for sector.c:get_sector() */
+	if (d->current_profile == 0x1a || d->current_profile == 0x12) { 
-	o->obs = Libburn_dvd_obS;
+		/* DVD+RW , DVD-RAM */
-
-	if (d->current_profile == 0x1a || d->current_profile == 0x12 ||
-	    d->current_profile == 0x43) { 
-		/* DVD+RW , DVD-RAM , BD-RE */
 		ret = 1;
 		if (d->current_profile == 0x1a)
 			ret = burn_disc_setup_dvd_plus_rw(o, disc);
@@ -1548,24 +1536,7 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
 				msg, 0, 0);
 			goto early_failure;
 		}
-		d->nwa = 0;
-		if (o->start_byte >= 0) {
-			d->nwa = o->start_byte / 2048;
-			sprintf(msg, "Write start address is  %d * 2048",
-				d->nwa);
-			libdax_msgs_submit(libdax_messenger, d->global_index,
-				0x00020127,
-				LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH,
-				msg, 0, 0);
-		}
 		o->obs_pad = 0; /* no filling-up of track's last 32k buffer */
-		if (d->current_profile == 0x43) /* BD-RE */
-			o->obs = Libburn_bd_re_obS;
-		if (d->do_stream_recording) {
-			o->obs_pad = 1;
-			if (d->current_profile == 0x43) /* BD-RE */
-				o->obs = Libburn_bd_re_streamed_obS;
-		}
 
 	} else if (d->current_profile == 0x13) {
 		 /* DVD-RW Restricted Overwrite */
@@ -1638,11 +1609,7 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
 		/* ??? padding needed ??? cowardly doing it for now */
 		o->obs_pad = 1; /* fill-up track's last 32k buffer */
 	}
-
+	o->obs = 32*1024; /* buffer flush trigger for sector.c:get_sector() */
-	sprintf(msg, "dvd/bd Profile= %2.2Xh , obs= %d , obs_pad= %d",
-		d->current_profile, o->obs, o->obs_pad);
-	libdax_msgs_submit(libdax_messenger, d->global_index, 0x00000002,
-		LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO, msg, 0, 0);
 
 	for (i = 0; i < disc->sessions; i++) {
 		/* update progress */
@@ -2009,9 +1976,6 @@ void burn_disc_write_sync(struct burn_write_opts *o, struct burn_disc *disc)
 	/* ts A61224 */
 	burn_disc_init_write_status(o, disc); /* must be done very early */
 
-	/* ts A80412 */
-	d->do_stream_recording = o->do_stream_recording;
-
 	d->buffer = &buf;
 	memset(d->buffer, 0, sizeof(struct buffer));
 	d->rlba = -150;
@@ -2022,26 +1986,16 @@ void burn_disc_write_sync(struct burn_write_opts *o, struct burn_disc *disc)
 		ret = burn_stdio_write_sync(o, disc);
 		if (ret <= 0)
 			goto fail_wo_sync;
-		goto ex;
+		return;
 	}
 	/* ts A61218 */
 	if (! d->current_is_cd_profile) {
 		ret = burn_dvd_write_sync(o, disc);
 		if (ret <= 0)
 			goto fail_wo_sync;
-		goto ex;
+		return;
 	}
 
-	/* ts A70521 : Linux 2.4 USB audio fails with 64 kiB */
-	/* ts A80414 : might need 64 kiB for BD-RE streaming */
-        /* buffer flush trigger for sector.c:get_sector() */
-	o->obs = Libburn_cd_obS;
-
-	sprintf(msg, "cd Profile= %2.2Xh , obs= %d , obs_pad= %d",
-		d->current_profile, o->obs, o->obs_pad);
-	libdax_msgs_submit(libdax_messenger, d->global_index, 0x00000002,
-		LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO, msg, 0, 0);
-
 	/* ts A70218 */
 	if (o->write_type == BURN_WRITE_SAO) {
 		for (i = 0 ; i < disc->session[0]->tracks; i++) {
@@ -2192,7 +2146,7 @@ return crap.  so we send the command, then ignore the result.
 
 	/* ts A61012 : This return was traditionally missing. I suspect this
 			to have caused Cdrskin_eject() failures */
-	goto ex;
+	return;
 
 fail:
 	d->sync_cache(d);
@@ -2204,9 +2158,6 @@ fail_wo_sync:;
 			"Burn run failed", 0, 0);
 	d->cancel = 1;
 	d->busy = BURN_DRIVE_IDLE;
-ex:;
-	d->do_stream_recording = 0;
-	return;
 }
 
 /* ts A70811 : API function */
@@ -2240,8 +2191,6 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
 		alignment = 32 * 1024;
 	if (d->current_profile == 0x1a) /* DVD+RW */
 		alignment = 2 * 1024;
-	if (d->current_profile == 0x43) /* BD-RE */
-		alignment = 2 * 1024;
 	if (alignment == 0) {
 		sprintf(msg, "Write start address not supported");
 		libdax_msgs_submit(libdax_messenger, d->global_index,

test/libburner.c

@@ -8,9 +8,8 @@
   
   libburner is a minimal demo application for the library libburn as provided
   on  http://libburnia-project.org . It can list the available devices, can
-  blank a CD-RW or DVD-RW, can format DVD-RW and BD-RE, can burn to CD-R,
+  blank a CD-RW or DVD-RW, can format a DVD-RW, can burn to CD-R, CD-RW, DVD-R,
-  CD-RW, DVD-R, DVD+R, DVD+R/DL, DVD+RW, DVD-RW, DVD-RAM, BD-RE. 
+  DVD+R, DVD+RW, DVD-RAM or DVD-RW. Not supported yet: double layer media.
-  Not supported yet: DVD-R/DL, BD-R.
 
   It's main purpose, nevertheless, is to show you how to use libburn and also
   to serve the libburnia team as reference application. libburner.c does indeed
@@ -29,9 +28,8 @@
   With that aquired drive you can blank a CD-RW
      libburner_blank_disc()
   or you can format a DVD-RW to profile "Restricted Overwrite" (needed once)
-  or an unused BD-RE to default size
+     libburner_format_row()
-     libburner_format_owrt()
+  With the aquired drive you can burn to CD-R, CD-RW, DVD+RW, DVD-RAM, DVD-RW
-  With the aquired drive you can burn to CD or DVD
      libburner_payload()
   When everything is done, main() releases the drive and shuts down libburn:
      burn_drive_release();
@@ -315,45 +313,26 @@ int libburner_blank_disc(struct burn_drive *drive, int blank_fast)
 }
 
 
-/** Formats unformatted DVD-RW to profile 0013h "Restricted Overwrite"
+/** Persistently changes DVD-RW profile 0014h "Sequential Recording" to
-    which needs no blanking for re-use but is not capable of multi-session.
+    profile 0013h "Restricted Overwrite" which needs no blanking for re-use
-    Expect a behavior similar to blanking with unusual noises from the drive.
+    but is not capable of multi-session.
 
-    Formats unformatted BD-RE to default size. This will allocate some
+    Expect a behavior similar to blanking with unusual noises from the drive.
-    reserve space, test for bad blocks and make the media ready for writing.
-    Expect a very long run time.
 */
-int libburner_format_owrt(struct burn_drive *drive)
+int libburner_format_row(struct burn_drive *drive)
 {
 	struct burn_progress p;
 	double percent = 1.0;
-	int ret, status, num_formats, format_flag= 0;
-	off_t size = 0;
-	unsigned dummy;
 
 	if (current_profile == 0x13) {
 		fprintf(stderr, "IDLE: DVD-RW media is already formatted\n");
 		return 2;
-	} else if (current_profile == 0x43) {
+	} else if (current_profile != 0x14) {
-		ret = burn_disc_get_formats(drive, &status, &size, &dummy,
+		fprintf(stderr, "FATAL: Can only format DVD-RW\n");
-								&num_formats);
-		if (ret > 0 && status == BURN_FORMAT_IS_FORMATTED) {
-			fprintf(stderr,
-				"IDLE: BD-RE media is already formatted\n");
-			return 2;
-		}
-		size = 0;           /* does not really matter */
-		format_flag = 3<<1; /* format to default size, no quick */
-	} else if (current_profile == 0x14) { /* sequential DVD-RW */
-		size = 128 * 1024 * 1024;
-		format_flag = 1; /* write initial 128 MiB */
-	} else {
-		fprintf(stderr, "FATAL: Can only format DVD-RW or BD-RE\n");
 		return 0;
 	}
-
 	printf("Beginning to format media.\n");
-	burn_disc_format(drive, size, format_flag);
+	burn_disc_format(drive, (off_t) 0, 0);
 
 	sleep(1);
 	while (burn_drive_get_status(drive, &p) != BURN_DRIVE_IDLE) {
@@ -365,10 +344,9 @@ int libburner_format_owrt(struct burn_drive *drive)
 	}
 	burn_disc_get_profile(drive_list[0].drive, &current_profile,
 				 current_profile_name);
-	if (current_profile == 0x14 || current_profile == 0x13)
+	printf("Media type now: %4.4xh  \"%s\"\n",
-		printf("Media type now: %4.4xh  \"%s\"\n",
+		 current_profile, current_profile_name);
-				 current_profile, current_profile_name);
+	if (current_profile != 0x13) {
-	if (current_profile == 0x14) {
 		fprintf(stderr,
 		  "FATAL: Failed to change media profile to desired value\n");
 		return 0;
@@ -465,8 +443,7 @@ int libburner_payload(struct burn_drive *drive,
 	  /* Use the fifo object as data source for the track */
 	  if (burn_track_set_source(track, fifo_src[trackno])
 							 != BURN_SOURCE_OK) {
-		fprintf(stderr,
+		printf("FATAL: Cannot attach source object to track object\n");
-		       "FATAL: Cannot attach source object to track object\n");
 		return 0;
 	  }
 
@@ -556,8 +533,7 @@ int libburner_payload(struct burn_drive *drive,
 	burn_session_free(session);
 	burn_disc_free(target_disc);
 	if (multi && current_profile != 0x1a && current_profile != 0x13 &&
-		current_profile != 0x12 && current_profile != 0x43) 
+		current_profile != 0x12) /* not with DVD+RW, DVD-RW, DVD-RAM */
-			/* not with DVD+RW, formatted DVD-RW, DVD-RAM, BD-RE */
 		printf("NOTE: Media left appendable.\n");
 	if (simulate_burn)
 		printf("\n*** Did TRY to SIMULATE burning ***\n\n");
@@ -720,7 +696,7 @@ int main(int argc, char **argv)
 		{ ret = 0; goto release_drive; }
 	if (do_blank) {
 		if (do_blank > 100)
-			ret = libburner_format_owrt(drive_list[driveno].drive);
+			ret = libburner_format_row(drive_list[driveno].drive);
 		else
 			ret = libburner_blank_disc(drive_list[driveno].drive,
 							do_blank == 1);