Add get_hwinfo functions in image drivers.

22 files changed, 60 insertions, 392 deletions

diff --git a/lib/image/bincue.c b/lib/image/bincue.c
index d147fbea..e5566d20 100644
--- a/lib/image/bincue.c
+++ b/lib/image/bincue.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bincue.c,v 1.42 2004/09/03 23:20:11 rocky Exp $
+    $Id: bincue.c,v 1.43 2004/09/04 00:06:50 rocky Exp $
 
     Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -26,7 +26,7 @@
    (*.cue).
 */
 
-static const char _rcsid[] = "$Id: bincue.c,v 1.42 2004/09/03 23:20:11 rocky Exp $";
+static const char _rcsid[] = "$Id: bincue.c,v 1.43 2004/09/04 00:06:50 rocky Exp $";
 
 #include "image.h"
 #include "cdio_assert.h"
@@ -35,6 +35,7 @@ static const char _rcsid[] = "$Id: bincue.c,v 1.42 2004/09/03 23:20:11 rocky Exp
 
 #include <cdio/logging.h>
 #include <cdio/util.h>
+#include <cdio/version.h>
 
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
@@ -973,6 +974,16 @@ cdio_get_default_device_bincue(void)
   return drive;
 }
 
+static bool
+get_hwinfo_bincue ( const CdIo *p_cdio, /*out*/ cdio_hwinfo_t *hw_info)
+{
+  strcpy(hw_info->psz_vendor, "libcdio");
+  strcpy(hw_info->psz_model, "CDRWIN");
+  strcpy(hw_info->psz_revision, CDIO_VERSION);
+  return true;
+  
+}
+
 /*!
   Return the number of tracks in the current medium.
   CDIO_INVALID_TRACK is returned on error.
@@ -1151,6 +1162,7 @@ cdio_open_cue (const char *psz_cue_name)
  _funcs.get_discmode       = _get_discmode_image;
  _funcs.get_drive_cap      = _get_drive_cap_image;
  _funcs.get_first_track_num= _get_first_track_num_image;
+ _funcs.get_hwinfo         = get_hwinfo_bincue;
  _funcs.get_mcn            = _get_mcn_image;
  _funcs.get_num_tracks     = _get_num_tracks_image;
  _funcs.get_track_format   = _get_track_format_bincue;
diff --git a/lib/image/cdrdao.c b/lib/image/cdrdao.c
index e525bbc6..fa1f7f43 100644
--- a/lib/image/cdrdao.c
+++ b/lib/image/cdrdao.c
@@ -1,5 +1,5 @@
 /*
-    $Id: cdrdao.c,v 1.27 2004/09/03 23:20:11 rocky Exp $
+    $Id: cdrdao.c,v 1.28 2004/09/04 00:06:50 rocky Exp $
 
     Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
     toc reading routine adapted from cuetools
@@ -25,7 +25,7 @@
    (*.cue).
 */
 
-static const char _rcsid[] = "$Id: cdrdao.c,v 1.27 2004/09/03 23:20:11 rocky Exp $";
+static const char _rcsid[] = "$Id: cdrdao.c,v 1.28 2004/09/04 00:06:50 rocky Exp $";
 
 #include "image.h"
 #include "cdio_assert.h"
@@ -34,6 +34,7 @@ static const char _rcsid[] = "$Id: cdrdao.c,v 1.27 2004/09/03 23:20:11 rocky Exp
 #include <cdio/logging.h>
 #include <cdio/sector.h>
 #include <cdio/util.h>
+#include <cdio/version.h>
 
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
@@ -1017,6 +1018,16 @@ cdio_get_default_device_cdrdao(void)
   return drive;
 }
 
+static bool
+get_hwinfo_cdrdao ( const CdIo *p_cdio, /*out*/ cdio_hwinfo_t *hw_info)
+{
+  strcpy(hw_info->psz_vendor, "libcdio");
+  strcpy(hw_info->psz_model, "cdrdao");
+  strcpy(hw_info->psz_revision, CDIO_VERSION);
+  return true;
+  
+}
+
 /*!
   Return the number of tracks in the current medium.
   CDIO_INVALID_TRACK is returned on error.
@@ -1135,6 +1146,7 @@ cdio_open_cdrdao (const char *psz_cue_name)
  _funcs.get_discmode       = _get_discmode_image;
  _funcs.get_drive_cap      = _get_drive_cap_image;
  _funcs.get_first_track_num= _get_first_track_num_image;
+ _funcs.get_hwinfo         = get_hwinfo_cdrdao;
  _funcs.get_mcn            = _get_mcn_image;
  _funcs.get_num_tracks     = _get_num_tracks_image;
  _funcs.get_track_format   = _get_track_format_cdrdao;
diff --git a/lib/image/nrg.c b/lib/image/nrg.c
index 8e2752bb..337136ee 100644
--- a/lib/image/nrg.c
+++ b/lib/image/nrg.c
@@ -1,5 +1,5 @@
 /*
-    $Id: nrg.c,v 1.39 2004/09/03 23:20:11 rocky Exp $
+    $Id: nrg.c,v 1.40 2004/09/04 00:06:50 rocky Exp $
 
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
     Copyright (C) 2001, 2003 Herbert Valerio Riedel <hvr@gnu.org>
@@ -39,13 +39,14 @@
 
 #include <cdio/logging.h>
 #include <cdio/util.h>
+#include <cdio/version.h>
 #include "cdio_assert.h"
 #include "bytesex.h"
 #include "ds.h"
 #include "_cdio_stdio.h"
 #include "nrg.h"
 
-static const char _rcsid[] = "$Id: nrg.c,v 1.39 2004/09/03 23:20:11 rocky Exp $";
+static const char _rcsid[] = "$Id: nrg.c,v 1.40 2004/09/04 00:06:50 rocky Exp $";
 
 
 /* reader */
@@ -1091,12 +1092,22 @@ cdio_get_default_device_nrg(void)
   return drive;
 }
 
+static bool
+get_hwinfo_nrg ( const CdIo *p_cdio, /*out*/ cdio_hwinfo_t *hw_info)
+{
+  strcpy(hw_info->psz_vendor, "libcdio");
+  strcpy(hw_info->psz_model, "Nero");
+  strcpy(hw_info->psz_revision, CDIO_VERSION);
+  return true;
+  
+}
+
 /*!
   Return the number of tracks in the current medium.
   CDIO_INVALID_TRACK is returned on error.
 */
 static track_format_t
-_get_track_format_nrg(void *user_data, track_t track_num) 
+get_track_format_nrg(void *user_data, track_t track_num) 
 {
   _img_private_t *env = user_data;
   
@@ -1196,9 +1207,10 @@ cdio_open_nrg (const char *psz_source)
   _funcs.get_discmode       = _get_discmode_image;
   _funcs.get_drive_cap      = _get_drive_cap_image;
   _funcs.get_first_track_num= _get_first_track_num_image;
+  _funcs.get_hwinfo         = get_hwinfo_nrg;
   _funcs.get_mcn            = _get_mcn_image;
   _funcs.get_num_tracks     = _get_num_tracks_image;
-  _funcs.get_track_format   = _get_track_format_nrg;
+  _funcs.get_track_format   = get_track_format_nrg;
   _funcs.get_track_green    = _get_track_green_nrg;
   _funcs.get_track_lba      = NULL; /* Will use generic routine via msf */
   _funcs.get_track_msf      = _get_track_msf_image;
diff --git a/test/cdda-mcn.right b/test/cdda-mcn.right
index ae6d3cf4..a53d4f2b 100644
--- a/test/cdda-mcn.right
+++ b/test/cdda-mcn.right
@@ -1,29 +1,6 @@
 This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
-Hardware                    : Disk Image
-Can eject                   : No
-Can close tray              : No
-Can disable manual eject    : No
-Can select juke-box disc    : No
-
-Can set drive speed         : No
-Can detect if CD changed    : No
-Can read multiple sessions  : No
-Can hard reset device       : No
-
-Reading....
-  Can play audio            : Yes
-  Can read  CD-R            : Yes
-  Can read  CD-RW           : Yes
-  Can read  DVD-ROM         : No
-
-Writing....
-  Can write CD-RW           : No
-  Can write DVD-R           : No
-  Can write DVD-RAM         : No
-  Can write DVD-RW          : No
-  Can write DVD+RW          : No
 __________________________________
 
 Disc mode is listed as: CD-DA
diff --git a/test/cdda.right b/test/cdda.right
index ce6031aa..32e378f4 100644
--- a/test/cdda.right
+++ b/test/cdda.right
@@ -1,29 +1,6 @@
 This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
-Hardware                    : Disk Image
-Can eject                   : No
-Can close tray              : No
-Can disable manual eject    : No
-Can select juke-box disc    : No
-
-Can set drive speed         : No
-Can detect if CD changed    : No
-Can read multiple sessions  : No
-Can hard reset device       : No
-
-Reading....
-  Can play audio            : Yes
-  Can read  CD-R            : Yes
-  Can read  CD-RW           : Yes
-  Can read  DVD-ROM         : No
-
-Writing....
-  Can write CD-RW           : No
-  Can write DVD-R           : No
-  Can write DVD-RAM         : No
-  Can write DVD-RW          : No
-  Can write DVD+RW          : No
 __________________________________
 
 Disc mode is listed as: CD-DA
diff --git a/test/check_cue.sh.in b/test/check_cue.sh.in
index 2adc0d70..0815518b 100644
--- a/test/check_cue.sh.in
+++ b/test/check_cue.sh.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-#$Id: check_cue.sh.in,v 1.20 2004/07/24 14:23:39 rocky Exp $
+#$Id: check_cue.sh.in,v 1.21 2004/09/04 00:06:50 rocky Exp $
 # Tests to see that BIN/CUE and cdrdao TOC file iamge reading is correct
 # (via cd-info).
 
@@ -21,18 +21,18 @@ BASE=`basename $0 .sh`
 
 fname=cdda
 testnum=CD-DA
-opts="--quiet --cue-file ${srcdir}/${fname}.cue --no-cddb"
+opts="--quiet --no-device-info --cue-file ${srcdir}/${fname}.cue --no-cddb"
 test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
 RC=$?
 check_result $RC "cd-info CUE test $testnum" "cd-info $opts"
   
 
-opts="--quiet --bin-file ${srcdir}/${fname}.bin --no-cddb"
+opts="--quiet --no-device-info --bin-file ${srcdir}/${fname}.bin --no-cddb"
 test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
 RC=$?
 check_result $RC "cd-info BIN test $testnum" "cd-info $opts"
 
-opts="--quiet --toc-file ${srcdir}/${fname}.toc --no-cddb"
+opts="--quiet --no-device-info --toc-file ${srcdir}/${fname}.toc --no-cddb"
 test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
 RC=$?
 check_result $RC "cd-info TOC test $testnum" "cd-info $opts"
@@ -40,7 +40,7 @@ check_result $RC "cd-info TOC test $testnum" "cd-info $opts"
 fname=isofs-m1
 testnum='ISO 9660 mode1 CUE'
 if test -f  ${srcdir}/${fname}.bin ; then
-  opts="-q --no-disc-mode --cue-file ${srcdir}/${fname}.cue --iso9660"
+  opts="-q --no-device-info --no-disc-mode --cue-file ${srcdir}/${fname}.cue --iso9660"
   test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
   RC=$?
   check_result $RC "cd-info CUE test $testnum" "$opts"
@@ -50,7 +50,7 @@ fi
 
 testnum='ISO 9660 mode1 TOC'
 if test -f  ${srcdir}/${fname}.bin ; then
-  opts="-q --no-disc-mode --toc-file ${srcdir}/${fname}.toc --iso9660"
+  opts="-q --no-device-info --no-disc-mode --toc-file ${srcdir}/${fname}.toc --iso9660"
   test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
   RC=$?
   check_result $RC "cd-info TOC test $testnum" "cd-info $opts"
@@ -66,12 +66,12 @@ else
 fi
 testnum='Video CD'
 if test -f ${srcdir}/${fname}.bin ; then
-  opts="-q --no-disc-mode -c ${srcdir}/${fname}.cue --iso9660"
+  opts="-q --no-device-info --no-disc-mode -c ${srcdir}/${fname}.cue --iso9660"
   test_cdinfo "$opts" ${fname}.dump $right
   RC=$?
   check_result $RC "cd-info CUE test $testnum" "cd-info $opts" 
 
-  opts="-q --no-disc-mode -t ${srcdir}/${fname}.toc --iso9660"
+  opts="-q --no-device-info --no-disc-mode -t ${srcdir}/${fname}.toc --iso9660"
   if test -f ${srcdir}/${fname}.toc ; then
     test_cdinfo "$opts" ${fname}.dump $right
     RC=$?
@@ -86,7 +86,7 @@ fi
 fname=svcd_ogt_test_ntsc
 testnum='Super Video CD'
 if test -f ${srcdir}/${fname}.bin ; then
-  opts="-q --no-disc-mode --cue-file ${srcdir}/${fname}.cue $vcd_opt --iso9660"
+  opts="-q --no-device-info --no-disc-mode --cue-file ${srcdir}/${fname}.cue $vcd_opt --iso9660"
   test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
   RC=$?
   check_result $RC "cd-info CUE test $testnum" "cd-info $opts"
diff --git a/test/check_nrg.sh.in b/test/check_nrg.sh.in
index 346e17bd..f1c0b076 100755
--- a/test/check_nrg.sh.in
+++ b/test/check_nrg.sh.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-#$Id: check_nrg.sh.in,v 1.10 2004/05/31 13:32:19 rocky Exp $
+#$Id: check_nrg.sh.in,v 1.11 2004/09/04 00:06:50 rocky Exp $
 
 if test -n "@VCDINFO_LIBS@" ; then
   vcd_opt='--no-vcd'
@@ -18,7 +18,7 @@ fi
 BASE=`basename $0 .sh`
 test_name=videocd
 
-test_cdinfo "--quiet --nrg-file ${srcdir}/${test_name}.nrg $vcd_opt --iso9660 " \
+test_cdinfo "--quiet --no-device-info --nrg-file ${srcdir}/${test_name}.nrg $vcd_opt --iso9660 " \
   ${test_name}.dump ${srcdir}/${test_name}.right
 RC=$?
 check_result $RC 'cd-info NRG test 1'
@@ -27,7 +27,7 @@ BASE=`basename $0 .sh`
 nrg_file=${srcdir}/monvoisin.nrg
 
 if test -f  $nrg_file ; then
-  test_cdinfo "-q --nrg-file $nrg_file $vcd_opt --iso9660 " \
+  test_cdinfo "-q --no-device-info --nrg-file $nrg_file $vcd_opt --iso9660 " \
     monvoisin.dump ${srcdir}/monvoisin.right
   RC=$?
   check_result $RC 'cd-info NRG test 2'
@@ -39,7 +39,7 @@ fi
 test_name='svcdgs'
 nrg_file=${srcdir}/${test_name}.nrg
 if test -f  $nrg_file ; then
-  test_cdinfo "-q --nrg-file $nrg_file $vcd_opt --iso9660" \
+  test_cdinfo "-q --no-device-info --nrg-file $nrg_file $vcd_opt --iso9660" \
     ${test_name}.dump ${srcdir}/${test_name}.right
   RC=$?
   check_result $RC "cd-info NRG $test_name"
@@ -51,7 +51,7 @@ fi
 test_name='cdda-mcn'
 nrg_file=${srcdir}/${test_name}.nrg
 if test -f  $nrg_file ; then
-  test_cdinfo "-q --nrg-file $nrg_file --no-cddb" \
+  test_cdinfo "-q --no-device-info --nrg-file $nrg_file --no-cddb" \
     ${test_name}.dump ${srcdir}/${test_name}.right
   RC=$?
   check_result $RC "cd-info NRG $test_name"
diff --git a/test/check_opts.sh b/test/check_opts.sh
index d1b116bf..258db53a 100755
--- a/test/check_opts.sh
+++ b/test/check_opts.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#$Id: check_opts.sh,v 1.6 2004/05/07 02:15:56 rocky Exp $
+#$Id: check_opts.sh,v 1.7 2004/09/04 00:06:50 rocky Exp $
 # Check cd-info options
 if test -z "$srcdir" ; then
   srcdir=`pwd`
@@ -18,7 +18,7 @@ i=0
 for opt in '-T' '--no-tracks' '-A' '--no-analyze' '-I' '--no-ioctl' \
       '-q' '--quiet' ; do 
   testname=${BASE}$i
-  opts="--cue-file ${srcdir}/${fname}.cue $opt --quiet"
+  opts="--no-device-info --cue-file ${srcdir}/${fname}.cue $opt --quiet"
   test_cdinfo  "$opts" ${testname}.dump ${srcdir}/${testname}.right
   RC=$?
   check_result $RC "cd-info option test $opt" "cd-info $opts"
diff --git a/test/check_opts0.right b/test/check_opts0.right
index 7ab47576..18458186 100644
--- a/test/check_opts0.right
+++ b/test/check_opts0.right
@@ -1,29 +1,6 @@
 This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
-Hardware                    : Disk Image
-Can eject                   : No
-Can close tray              : No
-Can disable manual eject    : No
-Can select juke-box disc    : No
-
-Can set drive speed         : No
-Can detect if CD changed    : No
-Can read multiple sessions  : No
-Can hard reset device       : No
-
-Reading....
-  Can play audio            : Yes
-  Can read  CD-R            : Yes
-  Can read  CD-RW           : Yes
-  Can read  DVD-ROM         : No
-
-Writing....
-  Can write CD-RW           : No
-  Can write DVD-R           : No
-  Can write DVD-RAM         : No
-  Can write DVD-RW          : No
-  Can write DVD+RW          : No
 __________________________________
 
 Disc mode is listed as: CD-DATA Form 1
diff --git a/test/check_opts1.right b/test/check_opts1.right
index 7ab47576..18458186 100644
--- a/test/check_opts1.right
+++ b/test/check_opts1.right
@@ -1,29 +1,6 @@
 This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
-Hardware                    : Disk Image
-Can eject                   : No
-Can close tray              : No
-Can disable manual eject    : No
-Can select juke-box disc    : No
-
-Can set drive speed         : No
-Can detect if CD changed    : No
-Can read multiple sessions  : No
-Can hard reset device       : No
-
-Reading....
-  Can play audio            : Yes
-  Can read  CD-R            : Yes
-  Can read  CD-RW           : Yes
-  Can read  DVD-ROM         : No
-
-Writing....
-  Can write CD-RW           : No
-  Can write DVD-R           : No
-  Can write DVD-RAM         : No
-  Can write DVD-RW          : No
-  Can write DVD+RW          : No
 __________________________________
 
 Disc mode is listed as: CD-DATA Form 1
diff --git a/test/check_opts2.right b/test/check_opts2.right
index 19d6a6bb..96c905ed 100644
--- a/test/check_opts2.right
+++ b/test/check_opts2.right
@@ -1,29 +1,6 @@
 This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
-Hardware                    : Disk Image
-Can eject                   : No
-Can close tray              : No
-Can disable manual eject    : No
-Can select juke-box disc    : No
-
-Can set drive speed         : No
-Can detect if CD changed    : No
-Can read multiple sessions  : No
-Can hard reset device       : No
-
-Reading....
-  Can play audio            : Yes
-  Can read  CD-R            : Yes
-  Can read  CD-RW           : Yes
-  Can read  DVD-ROM         : No
-
-Writing....
-  Can write CD-RW           : No
-  Can write DVD-R           : No
-  Can write DVD-RAM         : No
-  Can write DVD-RW          : No
-  Can write DVD+RW          : No
 __________________________________
 
 Disc mode is listed as: CD-DATA Form 1
diff --git a/test/check_opts3.right b/test/check_opts3.right
index 19d6a6bb..96c905ed 100644
--- a/test/check_opts3.right
+++ b/test/check_opts3.right
@@ -1,29 +1,6 @@
 This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
-Hardware                    : Disk Image
-Can eject                   : No
-Can close tray              : No
-Can disable manual eject    : No
-Can select juke-box disc    : No
-
-Can set drive speed         : No
-Can detect if CD changed    : No
-Can read multiple sessions  : No
-Can hard reset device       : No
-
-Reading....
-  Can play audio            : Yes
-  Can read  CD-R            : Yes
-  Can read  CD-RW           : Yes
-  Can read  DVD-ROM         : No
-
-Writing....
-  Can write CD-RW           : No
-  Can write DVD-R           : No
-  Can write DVD-RAM         : No
-  Can write DVD-RW          : No
-  Can write DVD+RW          : No
 __________________________________
 
 Disc mode is listed as: CD-DATA Form 1
diff --git a/test/check_opts4.right b/test/check_opts4.right
index bb09eb9a..8e75b2bd 100644
--- a/test/check_opts4.right
+++ b/test/check_opts4.right
@@ -1,29 +1,6 @@
 This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
-Hardware                    : Disk Image
-Can eject                   : No
-Can close tray              : No
-Can disable manual eject    : No
-Can select juke-box disc    : No
-
-Can set drive speed         : No
-Can detect if CD changed    : No
-Can read multiple sessions  : No
-Can hard reset device       : No
-
-Reading....
-  Can play audio            : Yes
-  Can read  CD-R            : Yes
-  Can read  CD-RW           : Yes
-  Can read  DVD-ROM         : No
-
-Writing....
-  Can write CD-RW           : No
-  Can write DVD-R           : No
-  Can write DVD-RAM         : No
-  Can write DVD-RW          : No
-  Can write DVD+RW          : No
 __________________________________
 
 Disc mode is listed as: CD-DATA Form 1
diff --git a/test/check_opts5.right b/test/check_opts5.right
index bb09eb9a..8e75b2bd 100644
--- a/test/check_opts5.right
+++ b/test/check_opts5.right
@@ -1,29 +1,6 @@
 This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
-Hardware                    : Disk Image
-Can eject                   : No
-Can close tray              : No
-Can disable manual eject    : No
-Can select juke-box disc    : No
-
-Can set drive speed         : No
-Can detect if CD changed    : No
-Can read multiple sessions  : No
-Can hard reset device       : No
-
-Reading....
-  Can play audio            : Yes
-  Can read  CD-R            : Yes
-  Can read  CD-RW           : Yes
-  Can read  DVD-ROM         : No
-
-Writing....
-  Can write CD-RW           : No
-  Can write DVD-R           : No
-  Can write DVD-RAM         : No
-  Can write DVD-RW          : No
-  Can write DVD+RW          : No
 __________________________________
 
 Disc mode is listed as: CD-DATA Form 1
diff --git a/test/check_opts6.right b/test/check_opts6.right
index bb09eb9a..8e75b2bd 100644
--- a/test/check_opts6.right
+++ b/test/check_opts6.right
@@ -1,29 +1,6 @@
 This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
-Hardware                    : Disk Image
-Can eject                   : No
-Can close tray              : No
-Can disable manual eject    : No
-Can select juke-box disc    : No
-
-Can set drive speed         : No
-Can detect if CD changed    : No
-Can read multiple sessions  : No
-Can hard reset device       : No
-
-Reading....
-  Can play audio            : Yes
-  Can read  CD-R            : Yes
-  Can read  CD-RW           : Yes
-  Can read  DVD-ROM         : No
-
-Writing....
-  Can write CD-RW           : No
-  Can write DVD-R           : No
-  Can write DVD-RAM         : No
-  Can write DVD-RW          : No
-  Can write DVD+RW          : No
 __________________________________
 
 Disc mode is listed as: CD-DATA Form 1
diff --git a/test/check_opts7.right b/test/check_opts7.right
index bb09eb9a..8e75b2bd 100644
--- a/test/check_opts7.right
+++ b/test/check_opts7.right
@@ -1,29 +1,6 @@
 This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
-Hardware                    : Disk Image
-Can eject                   : No
-Can close tray              : No
-Can disable manual eject    : No
-Can select juke-box disc    : No
-
-Can set drive speed         : No
-Can detect if CD changed    : No
-Can read multiple sessions  : No
-Can hard reset device       : No
-
-Reading....
-  Can play audio            : Yes
-  Can read  CD-R            : Yes
-  Can read  CD-RW           : Yes
-  Can read  DVD-ROM         : No
-
-Writing....
-  Can write CD-RW           : No
-  Can write DVD-R           : No
-  Can write DVD-RAM         : No
-  Can write DVD-RW          : No
-  Can write DVD+RW          : No
 __________________________________
 
 Disc mode is listed as: CD-DATA Form 1
diff --git a/test/isofs-m1.right b/test/isofs-m1.right
index f3892e20..c8cb83d1 100644
--- a/test/isofs-m1.right
+++ b/test/isofs-m1.right
@@ -1,29 +1,6 @@
 This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
-Hardware                    : Disk Image
-Can eject                   : No
-Can close tray              : No
-Can disable manual eject    : No
-Can select juke-box disc    : No
-
-Can set drive speed         : No
-Can detect if CD changed    : No
-Can read multiple sessions  : No
-Can hard reset device       : No
-
-Reading....
-  Can play audio            : Yes
-  Can read  CD-R            : Yes
-  Can read  CD-RW           : Yes
-  Can read  DVD-ROM         : No
-
-Writing....
-  Can write CD-RW           : No
-  Can write DVD-R           : No
-  Can write DVD-RAM         : No
-  Can write DVD-RW          : No
-  Can write DVD+RW          : No
 __________________________________
 
 CD-ROM Track List (1 - 1)
diff --git a/test/monvoisin.right b/test/monvoisin.right
index d850e955..017aaa43 100644
--- a/test/monvoisin.right
+++ b/test/monvoisin.right
@@ -1,29 +1,6 @@
 This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
-Hardware                    : Disk Image
-Can eject                   : No
-Can close tray              : No
-Can disable manual eject    : No
-Can select juke-box disc    : No
-
-Can set drive speed         : No
-Can detect if CD changed    : No
-Can read multiple sessions  : No
-Can hard reset device       : No
-
-Reading....
-  Can play audio            : Yes
-  Can read  CD-R            : Yes
-  Can read  CD-RW           : Yes
-  Can read  DVD-ROM         : No
-
-Writing....
-  Can write CD-RW           : No
-  Can write DVD-R           : No
-  Can write DVD-RAM         : No
-  Can write DVD-RW          : No
-  Can write DVD+RW          : No
 __________________________________
 
 Disc mode is listed as: CD DATA Form 2
diff --git a/test/svcd_ogt_test_ntsc.right b/test/svcd_ogt_test_ntsc.right
index 8eddb37d..6ea3229d 100644
--- a/test/svcd_ogt_test_ntsc.right
+++ b/test/svcd_ogt_test_ntsc.right
@@ -1,29 +1,6 @@
 This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
-Hardware                    : Disk Image
-Can eject                   : No
-Can close tray              : No
-Can disable manual eject    : No
-Can select juke-box disc    : No
-
-Can set drive speed         : No
-Can detect if CD changed    : No
-Can read multiple sessions  : No
-Can hard reset device       : No
-
-Reading....
-  Can play audio            : Yes
-  Can read  CD-R            : Yes
-  Can read  CD-RW           : Yes
-  Can read  DVD-ROM         : No
-
-Writing....
-  Can write CD-RW           : No
-  Can write DVD-R           : No
-  Can write DVD-RAM         : No
-  Can write DVD-RW          : No
-  Can write DVD+RW          : No
 __________________________________
 
 CD-ROM Track List (1 - 2)
diff --git a/test/svcdgs.right b/test/svcdgs.right
index cc878749..c7fedb3b 100644
--- a/test/svcdgs.right
+++ b/test/svcdgs.right
@@ -1,29 +1,6 @@
 This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
-Hardware                    : Disk Image
-Can eject                   : No
-Can close tray              : No
-Can disable manual eject    : No
-Can select juke-box disc    : No
-
-Can set drive speed         : No
-Can detect if CD changed    : No
-Can read multiple sessions  : No
-Can hard reset device       : No
-
-Reading....
-  Can play audio            : Yes
-  Can read  CD-R            : Yes
-  Can read  CD-RW           : Yes
-  Can read  DVD-ROM         : No
-
-Writing....
-  Can write CD-RW           : No
-  Can write DVD-R           : No
-  Can write DVD-RAM         : No
-  Can write DVD-RW          : No
-  Can write DVD+RW          : No
 __________________________________
 
 Disc mode is listed as: CD DATA Form 2
diff --git a/test/vcd_demo_vcdinfo.right b/test/vcd_demo_vcdinfo.right
index 5a746a66..f78807f8 100644
--- a/test/vcd_demo_vcdinfo.right
+++ b/test/vcd_demo_vcdinfo.right
@@ -1,29 +1,6 @@
 This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
-Hardware                    : Disk Image
-Can eject                   : No
-Can close tray              : No
-Can disable manual eject    : No
-Can select juke-box disc    : No
-
-Can set drive speed         : No
-Can detect if CD changed    : No
-Can read multiple sessions  : No
-Can hard reset device       : No
-
-Reading....
-  Can play audio            : Yes
-  Can read  CD-R            : Yes
-  Can read  CD-RW           : Yes
-  Can read  DVD-ROM         : No
-
-Writing....
-  Can write CD-RW           : No
-  Can write DVD-R           : No
-  Can write DVD-RAM         : No
-  Can write DVD-RW          : No
-  Can write DVD+RW          : No
 __________________________________
 
 CD-ROM Track List (1 - 3)
diff --git a/test/videocd.right b/test/videocd.right
index c0a6cacd..1ceb01ea 100644
--- a/test/videocd.right
+++ b/test/videocd.right
@@ -1,29 +1,6 @@
 This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
-Hardware                    : Disk Image
-Can eject                   : No
-Can close tray              : No
-Can disable manual eject    : No
-Can select juke-box disc    : No
-
-Can set drive speed         : No
-Can detect if CD changed    : No
-Can read multiple sessions  : No
-Can hard reset device       : No
-
-Reading....
-  Can play audio            : Yes
-  Can read  CD-R            : Yes
-  Can read  CD-RW           : Yes
-  Can read  DVD-ROM         : No
-
-Writing....
-  Can write CD-RW           : No
-  Can write DVD-R           : No
-  Can write DVD-RAM         : No
-  Can write DVD-RW          : No
-  Can write DVD+RW          : No
 __________________________________
 
 Disc mode is listed as: CD DATA Form 2