rb_cdio 0.1.1 → 0.2.0

data/ext/CdIo_Common.c

@@ -24,6 +24,7 @@ get_cap(cdio_drive_read_cap_t * read_cap,
     rb_hash_aset(ret, rb_str_new2("read"), read);
     rb_hash_aset(ret, rb_str_new2("write"), write);
     rb_hash_aset(ret, rb_str_new2("misc"), misc);
+    // read 
     CAP(read, "audio", read_cap, CDIO_DRIVE_CAP_READ_AUDIO);
     CAP(read, "cd-da", read_cap, CDIO_DRIVE_CAP_READ_CD_DA);
     CAP(read, "cd+g", read_cap, CDIO_DRIVE_CAP_READ_CD_G);
@@ -36,6 +37,12 @@ get_cap(cdio_drive_read_cap_t * read_cap,
     CAP(read, "dvd-rw", read_cap, CDIO_DRIVE_CAP_READ_DVD_RW);
     CAP(read, "dvd+rw", read_cap, CDIO_DRIVE_CAP_READ_DVD_RPW);
     CAP(read, "c2_errs", read_cap, CDIO_DRIVE_CAP_READ_C2_ERRS);
+    CAP(read, "mode2_form1", read_cap, CDIO_DRIVE_CAP_READ_MODE2_FORM1);
+    CAP(read, "mode2_form2", read_cap, CDIO_DRIVE_CAP_READ_MODE2_FORM2);
+    CAP(read, "mcn", read_cap, CDIO_DRIVE_CAP_READ_MCN);
+    CAP(read, "isrc", read_cap, CDIO_DRIVE_CAP_READ_ISRC);
+
+    // write
     CAP(write, "cd-r", write_cap, CDIO_DRIVE_CAP_WRITE_CD_R);
     CAP(write, "cd-rw", write_cap, CDIO_DRIVE_CAP_WRITE_CD_RW);
     CAP(write, "dvd-r", write_cap, CDIO_DRIVE_CAP_WRITE_DVD_R);
@@ -48,6 +55,7 @@ get_cap(cdio_drive_read_cap_t * read_cap,
     CAP(write, "burn_proof", write_cap, CDIO_DRIVE_CAP_WRITE_BURN_PROOF);
     CAP(write, "cd", write_cap, CDIO_DRIVE_CAP_WRITE_CD);
     CAP(write, "dvd", write_cap, CDIO_DRIVE_CAP_WRITE_DVD);
+    // misc
     CAP(misc, "close_tray", misc_cap, CDIO_DRIVE_CAP_MISC_CLOSE_TRAY);
     CAP(misc, "eject", misc_cap, CDIO_DRIVE_CAP_MISC_EJECT);
     CAP(misc, "lock", misc_cap, CDIO_DRIVE_CAP_MISC_LOCK);
@@ -57,9 +65,7 @@ get_cap(cdio_drive_read_cap_t * read_cap,
 	CDIO_DRIVE_CAP_MISC_MULTI_SESSION);
     CAP(misc, "media_changed", misc_cap,
 	CDIO_DRIVE_CAP_MISC_MEDIA_CHANGED);
-    CAP(misc, "misc_reset", misc_cap, CDIO_DRIVE_CAP_MISC_RESET);
-    CAP(misc, "mcn", misc_cap, CDIO_DRIVE_CAP_MCN);
-    CAP(misc, "isrc", misc_cap, CDIO_DRIVE_CAP_ISRC);
+    CAP(misc, "reset", misc_cap, CDIO_DRIVE_CAP_MISC_RESET);
     CAP(misc, "file", misc_cap, CDIO_DRIVE_CAP_MISC_FILE);
     return ret;
 }
@@ -115,14 +121,53 @@ _cdio_cd_is_iso(CdIo * p_cdio, track_t track)
  */
 
 VALUE
-get_track(VALUE obj, track_t i)
+get_track(VALUE cd, track_t i)
 {
-    GET_CDIO(obj, p_cdio);
+    GET_CDIO(cd, p_cdio);
+    // printf("get_track 1:%d\n",i);
     VALUE           track;
+    track_format_t  format = cdio_get_track_format(p_cdio, i);
+    VALUE           argv[2];
+    argv[0] = cd;
+    argv[1] = INT2FIX(i);
+    // printf("get_track 2:%d\n",FIX2INT(argv[1]));
+
     if (_cdio_cd_is_iso(p_cdio, i)) {
-	track = rb_cdio_trackiso9660_new(obj, i);
+	return rb_class_new_instance(2, argv, cCdIoTrackIso9660);
+    } else if (TRACK_FORMAT_AUDIO == format) {
+	return rb_class_new_instance(2, argv, cCdIoTrackCdda);
     } else {
-	track = rb_cdio_track_new(obj, i);
+	return rb_class_new_instance(2, argv, cCdIoTrack);
+    }
+}
+void
+verify_return_code(driver_return_code_t rc)
+{
+    switch (rc) {
+    case DRIVER_OP_SUCCESS:
+	break;
+    case DRIVER_OP_ERROR:
+	rb_raise(eCdIoError, "Operation returned an error");
+	break;
+    case DRIVER_OP_UNSUPPORTED:
+	rb_raise(eCdIoUnsupported, "Driver doesn't support feature");
+	break;
+    case DRIVER_OP_UNINIT:
+	rb_raise(eCdIoUnitit, "driver hasn't been initialized");
+	break;
+    case DRIVER_OP_NOT_PERMITTED:
+	rb_raise(eCdIoNotPermitted, "Operation not permitted.");
+	break;
+    case DRIVER_OP_BAD_PARAMETER:
+	rb_raise(eCdIoBadParameter,
+		 "Bad parameter (library bug, probably)");
+	break;
+    case DRIVER_OP_BAD_POINTER:
+	rb_raise(eCdIoBadPointer, "Bad pointer (library bug, probably)");
+	break;
+    case DRIVER_OP_NO_DRIVER:
+	rb_raise(eCdIoNoDriver,
+		 "Operaton called on a driver not available on this OS");
+	break;
     }
-    return track;
 }

data/ext/CdIo_Modulo.c

@@ -31,8 +31,6 @@ rb_cdio_get_devices(int argc, VALUE * argv, VALUE module)
 	    rb_ary_push(aDevices, rb_str_new2(*i));
 	}
 	cdio_free_device_list(devices);
-	free(devices);
-	devices = NULL;
 	return aDevices;
     } else {
 	return Qnil;
@@ -193,7 +191,7 @@ rb_cdio_track_type_describe(VALUE module, VALUE track)
     return rb_str_new2(desc);
 }
 
-static          VALUE
+static VALUE
 _is_file_bool(bool(*pf) (const char *n), VALUE name)
 {
     Check_Type(name, T_STRING);
@@ -202,7 +200,7 @@ _is_file_bool(bool(*pf) (const char *n), VALUE name)
     return res ? Qtrue : Qfalse;
 }
 
-static          VALUE
+static VALUE
 _is_file_char(char *(*pf) (const char *n), VALUE name)
 {
     Check_Type(name, T_STRING);
@@ -244,3 +242,13 @@ rb_cdio_is_device(int argc, VALUE * argv, VALUE module)
 {
     return Qnil;
 }
+
+VALUE
+rb_cdio_close_tray(VALUE module, VALUE name)
+{
+    Check_Type(name, T_STRING);
+    SafeStringValue(name);
+    driver_return_code_t rc = cdio_close_tray(StringValuePtr(name), NULL);
+    verify_return_code(rc);
+    return Qtrue;
+}

data/ext/CdIo_Track.c

@@ -8,49 +8,20 @@
 */
 
 #include "CdIo.h"
-/** 
-* Funci?n extraida de cd-info.c
-*/
-
-
-VALUE
-rb_cdio_track_new(VALUE cd, int track)
-{
-    VALUE           argv[2];
-    argv[0] = cd;
-    argv[1] = INT2FIX(track);
-    return rb_class_new_instance(2, argv, cCdIoTrack);
-}
-
-int
-rb_cdio_track_number(VALUE obj)
-{
-    return FIX2INT(rb_iv_get(obj, "@number"));
-}
-
-VALUE
-rb_cdio_track_green(VALUE obj)
-{
-    GET_CDIO(rb_iv_get(obj, "@cd"), p_cdio);
-    if (cdio_get_track_green(p_cdio, rb_cdio_track_number(obj))) {
-	return Qtrue;
-    } else {
-	return Qfalse;
-    }
-}
-
 VALUE
 rb_cdio_track_init(VALUE obj, VALUE cd, VALUE track)
 {
-    // Verificaci?n de tipos.
+    // Verificacion de tipos.
     lsn_t           lsn;
     int             i_track;
     FIXNUM_P(track);
     if (Qtrue != rb_obj_is_instance_of(cd, cCdIoCd)) {
 	rb_raise(rb_eArgError, "Arg 1 must be a CdIo::Cd");
     }
+
     GET_CDIO(cd, p_cdio);
     i_track = FIX2INT(track);
+    // printf("En init:%d\n",i_track);
     // Verify track number
     track_t         min,
                     max;
@@ -79,9 +50,9 @@ rb_cdio_track_init(VALUE obj, VALUE cd, VALUE track)
     if (cdio_get_track_msf(p_cdio, i_track, &msf)) {
 	msf_s = cdio_msf_to_str(&msf);
 	// printf("C->%d:%d:%d\n",(int)msf.m,(int)msf.s,(int)msf.f);
-	rb_iv_set(obj, "@min", INT2FIX(from_bcd8(msf.m)));
-	rb_iv_set(obj, "@sec", INT2FIX(from_bcd8(msf.s)));
-	rb_iv_set(obj, "@frames", INT2FIX(from_bcd8(msf.f)));
+	rb_iv_set(obj, "@min", INT2FIX(cdio_from_bcd8(msf.m)));
+	rb_iv_set(obj, "@sec", INT2FIX(cdio_from_bcd8(msf.s)));
+	rb_iv_set(obj, "@frames", INT2FIX(cdio_from_bcd8(msf.f)));
 	rb_iv_set(obj, "@msf", rb_str_new2(msf_s));
 	free(msf_s);
     }
@@ -98,6 +69,23 @@ rb_cdio_track_init(VALUE obj, VALUE cd, VALUE track)
     return obj;
 }
 
+int
+rb_cdio_track_number(VALUE obj)
+{
+    return FIX2INT(rb_iv_get(obj, "@number"));
+}
+
+VALUE
+rb_cdio_track_green(VALUE obj)
+{
+    GET_CDIO(rb_iv_get(obj, "@cd"), p_cdio);
+    if (cdio_get_track_green(p_cdio, rb_cdio_track_number(obj))) {
+	return Qtrue;
+    } else {
+	return Qfalse;
+    }
+}
+
 VALUE
 rb_cdio_track_get_cdtext(VALUE obj)
 {

data/ext/CdIo_TrackCdda.c

@@ -0,0 +1,13 @@
+#include "CdIo.h"
+
+VALUE
+rb_cdio_trackcdda_play(VALUE obj)
+{
+    GET_TRACK(obj, p_cdio, track_i);
+    msf_t           msf_start,
+                    msf_end;
+    cdio_get_track_msf(p_cdio, track_i, &msf_start);
+    cdio_get_track_msf(p_cdio, track_i + 1, &msf_end);
+    verify_return_code(cdio_audio_play_msf(p_cdio, &msf_start, &msf_end));
+    return Qtrue;
+}

data/ext/CdIo_TrackIso9660.c

@@ -9,7 +9,7 @@
 
 
 #include "CdIo.h"
-static          bool
+static bool
 read_iso9660_pvd(const CdIo * p_cdio, track_format_t track_format,	/* out 
 									 */
 		 iso9660_pvd_t * p_pvd)
@@ -36,14 +36,6 @@ read_iso9660_pvd(const CdIo * p_cdio, track_format_t track_format,	/* out
     return true;
 }
 
-VALUE
-rb_cdio_trackiso9660_new(VALUE cd, int track)
-{
-    VALUE           argv[2];
-    argv[0] = cd;
-    argv[1] = INT2FIX(track);
-    return rb_class_new_instance(2, argv, cCdIoTrackIso9660);
-}
 
 VALUE
 rb_cdio_trackiso9660_init(VALUE obj, VALUE cd, VALUE track)

data/ext/CdIo_Tracks.c

@@ -18,6 +18,7 @@ rb_cdio_tracks_init(VALUE obj, VALUE cd)
     int             j,
                     i = first_track_num;
     for (j = 0; j < num_tracks; i++, j++) {
+	// printf("rb_cdio_tracks_init->%d\n",i);
 	rb_ary_push(aTracks, get_track(cd, i));
     }
     rb_iv_set(obj, "@tracks", aTracks);
@@ -60,7 +61,16 @@ rb_cdio_tracks_diff(VALUE obj, VALUE a, VALUE b)
 VALUE
 rb_cdio_tracks_index(VALUE obj, VALUE index)
 {
-
+    // ok, this is a very stupid method, but...
     FIXNUM_P(index);
-    return get_track(rb_iv_get(obj, "@cd"), FIX2INT(index));
+    VALUE           aTracks = rb_iv_get(obj, "@tracks");
+    long            len = RARRAY(aTracks)->len;
+    long            i;
+    for (i = 0; i < len; i++) {
+	if (rb_iv_get(rb_ary_entry(aTracks, i), "@number") == index) {
+	    return rb_ary_entry(aTracks, i);
+	}
+    }
+    return Qnil;
+    // return get_track(rb_iv_get(obj, "@cd"), FIX2INT(index));
 }

data/ext/extconf.rb

@@ -1,4 +1,7 @@
 require 'mkmf'
 have_library("cdio","cdio_open");
 have_library("iso9660","iso9660_get_system_id");
+if have_library("cddb","cddb_new")
+	have_header("cddb/cddb.h")
+end
 create_makefile("rb_cdio");

data/ext/mkmf.log

@@ -24,3 +24,26 @@ int t() { iso9660_get_system_id(); return 0; }
 
 --------------------
 
+have_library: checking for cddb_new() in -lcddb... -------------------- yes
+
+"i686-pc-linux-gnu-gcc -o conftest -I/home/cdx/ruby/rb_cdio/ext -I/usr/lib/ruby/1.8/i686-linux  -O2 -march=athlon-xp -m3dnow -msse -mfpmath=sse -mmmx -pipe -ffast-math  -fPIC conftest.c  -L'/usr/lib' -Wl,-R'/usr/lib'     -liso9660 -lcdio  -lruby18-static -lcddb -liso9660 -lcdio  -ldl -lcrypt -lm   -lc"
+checked program was:
+/* begin */
+
+/*top*/
+int main() { return 0; }
+int t() { cddb_new(); return 0; }
+/* end */
+
+--------------------
+
+have_header: checking for cddb/cddb.h... -------------------- yes
+
+"i686-pc-linux-gnu-gcc -E -I/home/cdx/ruby/rb_cdio/ext -I/usr/lib/ruby/1.8/i686-linux  -O2 -march=athlon-xp -m3dnow -msse -mfpmath=sse -mmmx -pipe -ffast-math  -fPIC  conftest.c -o conftest.i"
+checked program was:
+/* begin */
+#include <cddb/cddb.h>
+/* end */
+
+--------------------
+

data/lib/rb_cdio_read.rb

@@ -1,6 +1,9 @@
-#require 'rubygems'
-#require_gem "rb_cdio",">=0.0.3"
-require "../ext/rb_cdio"
+if(File::exists?("../ext/rb_cdio.so"))
+	require "../ext/rb_cdio"
+else
+	require 'rubygems'
+	require_gem "rb_cdio",">=0.2"
+end
 dev=( ARGV[0].nil? ) ? nil:ARGV[0]; 
 CdIo.open(ARGV[0]) {|cd|
 	puts "Device:"+cd.device
@@ -12,26 +15,32 @@ CdIo.open(ARGV[0]) {|cd|
 	puts "Discmode: "+CdIo.discmode_describe(cd.discmode);
 	puts "Is Cd?: "+((cd.is_cd? ) ? "Yes" : "No");
 	puts "Is Dvd?: "+((cd.is_dvd? ) ? "Yes" : "No");
+	cdda=false
 	if (cd.discmode==CdIo::CDIO_DISC_MODE_CD_DA)
-	puts "CDTEXT"	
-	p cd.get_cdtext
-		#puts "Cddb: "+cd.cddb_id
-		#freedb=cd.get_freedb
-		#freedb.fetch
-		#freedb.results.each { |r| puts r }
-		#puts "Pistas =  \n"
+	puts "CDTEXT: "+cd.cdtext.to_s
+	puts "Cddb: "+cd.cddb_id
+		begin
+			cd.cddb_fetch(1)
+			puts "Artist:"+cd.artist
+			puts "Title:"+cd.title
+			cdda=true
+		rescue =>e
+			puts "ERROR - Can't get cddb info : "+e.to_s
+		end
 	end
-	cd.get_tracks.each {|track|
+	cd.tracks.each {|track|
 	puts "=========\nTrack number "+track.number.to_s
 	puts CdIo.track_format_describe(track.format);
 	
 	if(cd.discmode==CdIo::CDIO_DISC_MODE_CD_DA) 
-	puts "CDTEXT"
-	p track.get_cdtext
+	puts "CDTEXT:"+track.cdtext.to_s
 	end
 	puts "Format:  "+CdIo.track_format_describe(track.format);
 	puts "Type: "+CdIo.track_type_describe(track);
-	puts track.msf
+	puts "Mfs: "+track.msf
+	if(cdda) 
+		puts "Title:"+track.title
+	end
 	}
 }
 

data/rb_cdio.def.rb

@@ -1,6 +1,9 @@
 #!/bin/env ruby
 # = rb_cdio
-# This package create bindings to the library libcdio
+# Create bindings to the library libcdio and libcddb(optional).
+# You can retrieve information about Cd and images. If you have
+# library libcddb installed, you can retrieve information like artist and titles
+# for CD-DA.
 #
 # == Version
 # :include:VERSION
@@ -8,6 +11,43 @@
 # == Changelog
 # :include:ChangeLog.txt
 #
+# == Download
+# 
+# http://rb-cdio.rubyforge.org
+# 
+# == Example of use
+#  CdIo.devices
+#  ==>["/dev/cdrom", "/dev/dvd"]
+#  cd=CdIo.default_device
+#  ==>"/dev/cdrom"
+#  CdIo.drive_cap_dev(cd)
+#  ==>{"misc"=>{"close_tray"=>true, "media_changed"=>false, "select_disk"=>false, "lock"=>true, "multi_session"=>true, "eject"=>true, "reset"=>false, "select_speed"=>false, "file"=>false}, "read"=>{"mode2_form1"=>true, "dvd-rw"=>false, "audio"=>true, "mode2_form2"=>true, "c2_errs"=>false, "dvd-r"=>false, "mcn"=>true, "cd-da"=>true, "dvd-rom"=>false, "isrc"=>true, "cd-r"=>true, "dvd-ram"=>false, "dvr+r"=>false, "cd+g"=>false, "dvd+rw"=>false, "cd-rw"=>true}, "write"=>{"dvd-rw"=>false, "cd"=>false, "dvd-r"=>false, "burn_proof"=>false, "dvd+r"=>false, "cd-r"=>false, "dvd"=>false, "dvd-ram"=>false, "dvd+rw"=>false, "mount_rainier"=>false, "cd-rw"=>false}}
+#  CdIo.driver_describe(CdIo::DRIVER_LINUX)
+#  ==>"GNU/Linux ioctl and MMC driver"
+#  CdIo.discmode_describe(CdIo::CDIO_DISC_MODE_CD_DA)
+#  ==>"CD-DA"
+#  CdIo.track_format_describe(CdIo::TRACK_FORMAT_XA)
+#  ==>"XA"
+#  cdo=CdIo.open(cd)
+#  ==>#<CdIo::Cd:0xb7d2a91c>
+#  cdo.cdtext
+#  ==>nil
+#  cdo.tracks.each do |track|
+#  track.number
+#  track
+#  end
+#  ==>[#<CdIo::TrackIso9660:0xb7cde440 @leadout=false, @min=0, @cd=#<CdIo::Cd:0xb7d2a91c>, @sec_count=311872, @frames=0, @lsn=0, @format=3, @track_type=3, @msf="00:02:00", @number=1, @sec=2, @lba=150>]
+#  cdo.tracks[CdIo::CDIO_CDROM_LEADOUT_TRACK];
+#  cdo.is_cd?
+#  ==>true
+#  cdo.is_dvd?
+#  ==>false
+#  cdo.drive_cap
+#  ==>{"misc"=>{"close_tray"=>true, "media_changed"=>false, "select_disk"=>false, "lock"=>true, "multi_session"=>true, "eject"=>true, "reset"=>false, "select_speed"=>false, "file"=>false}, "read"=>{"mode2_form1"=>true, "dvd-rw"=>false, "audio"=>true, "mode2_form2"=>true, "c2_errs"=>false, "dvd-r"=>false, "mcn"=>true, "cd-da"=>true, "dvd-rom"=>false, "isrc"=>true, "cd-r"=>true, "dvd-ram"=>false, "dvr+r"=>false, "cd+g"=>false, "dvd+rw"=>false, "cd-rw"=>true}, "write"=>{"dvd-rw"=>false, "cd"=>false, "dvd-r"=>false, "burn_proof"=>false, "dvd+r"=>false, "cd-r"=>false, "dvd"=>false, "dvd-ram"=>false, "dvd+rw"=>false, "mount_rainier"=>false, "cd-rw"=>false}}
+#  cdo.hwinfo
+#  ==>{"revision"=>"1.00", "vendor"=>"HL-DT-ST", "model"=>"CD-ROM GCR-8520B"}
+#  cdo.joliet_level
+#  ==>0
 
 # = Module CdIo
 # The module CdIo defines constants, classes and methods
@@ -16,9 +56,10 @@
 #
 # 
 # The name of the constants are the same of libcdio, so theirs values
-# can change on different OS and versions of the library
+# can change on different OS and versions of the libcdio library
 
 module CdIo
+	CDIO_CDROM_LEADOUT_TRACK=170
 	CDIO_DISC_MODE_CD_DA=0
 	CDIO_DISC_MODE_CD_DATA=1
 	CDIO_DISC_MODE_CD_MIXED=3
@@ -32,26 +73,22 @@ module CdIo
 	CDIO_DISC_MODE_DVD_RW=7
 	CDIO_DISC_MODE_ERROR=12
 	CDIO_DISC_MODE_NO_INFO=11
-	# Driver for a .bin or .cue file
-	DRIVER_BINCUE=8
-	DRIVER_CDRDAO=7
-	# Driver for a device (cd or dvd)
-	DRIVER_DEVICE=10
-	DRIVER_FREEBSD=2
-	DRIVER_LINUX=3
-	DRIVER_NRG=9
-	DRIVER_OSX=5
-	DRIVER_SOLARIS=4
+	DRIVER_BINCUE=9
+	DRIVER_CDRDAO=8
+	DRIVER_DEVICE=11
+	DRIVER_FREEBSD=3
+	DRIVER_LINUX=4
+	DRIVER_NRG=10
+	DRIVER_OSX=6
+	DRIVER_SOLARIS=5
 	DRIVER_UNKNOWN=0
-	DRIVER_WIN32=6
+	DRIVER_WIN32=7
 	TRACK_FORMAT_AUDIO=0
 	TRACK_FORMAT_CDI=1
 	TRACK_FORMAT_DATA=3
 	TRACK_FORMAT_ERROR=5
 	TRACK_FORMAT_PSX=4
 	TRACK_FORMAT_XA=2
-	# The number for the leadout track of a cd
-	CDIO_CDROM_LEADOUT_TRACK=170
 		# Returns all active devices (with a cd or dvd inside)
 		#
 		# CdIo.get_devices #=> ["/dev/cdrom"]
@@ -101,8 +138,26 @@ module CdIo
 		#
 		def CdIo.open(device=nil,driver=nil,&block)
 		end
+	module Exception
+		class Error < IoError
+		end
+		class Unsupported < IoError
+		end
+		class NotPermitted < IoError
+		end
+		class BadParameter < IoError
+		end
+		class BadPointer < IoError
+		end
+		class NoDriver < IoError
+		end
+		class CddbError < Exception
+		end
+		class CddbConn < IoError
+		end
+	end
 	class Cd
-		attr_reader	:device, :mcn, :driver_name, :driver_id, :first_track_num, :disc_mode, :num_tracks, :stat_size, :cddb_id
+		attr_reader	:device, :mcn, :driver_name, :driver_id, :first_track_num, :disc_mode, :num_tracks, :last_lsn,  :joliet_level
 		# 
 		# Create a new Cd::CdIo object.
 		# The first argument is an String for a device or a cue/bin/toc/nrg file
@@ -144,6 +199,84 @@ module CdIo
 		def close
 		end
 	end
+	# module with extra methods to extends a normal Cd
+	module Cdda
+		# get the volume in an array.
+		#
+		#  	cd.volume 
+		#	==> [255, 255, 0, 0]
+		def volume
+		end
+		# set the volume. You have to put an array
+		#
+		# cd.volume=[255,255,0,0]
+		def volume=(vol_set)
+		end
+		# play cd tracks. Returns an array with the first and the last track to play
+		# Ex.: cd with 11 tracks:
+		#
+		#  	cd.play
+		#	==> [1,11]
+		#  cd.play(1)
+		#	==> [1,1]
+		#  cd.play(2,20)
+		#	==> [2,11]
+		def play
+		end
+		# pause the reproduction of cd
+		def pause
+		end
+		# resume the reproduction of cd after a pause
+		def resume
+		end
+		# stop the reproduction of the cd
+		def stop
+		end
+		# get subchannel information of reproduction of the cd
+		# 
+		#  cd.subchannel 
+		#  ==> {"control"=>0, "rel_addr"=>"00:00:02", "abs_addr"=>"00:02:02", "format"=>212, "audio_status_desc"=>"no_status", "track"=>1, "audio_status"=>21, "index"=>1, "address"=>6}
+		def subchannel
+		end
+		# get the cddb key for the cd, in hex format
+		# 
+		# cd.cddb_id
+		# ==> "9609630b"
+		def cddb_id
+		end
+		# get matches for cddb in an array.
+		# Requires <b>libcddb</b>
+		# 
+ 		#  cd.cddb_matches
+		#  ==> [{"artist"=>"Seru Giran", "category"=>"rock", "title"=>"Peperina", "id"=>"2466865419", "length"=>"2403", "year"=>"0", "genre"=>"rock"}, {"artist"=>"Seru Giran", "category"=>"rock", "title"=>"Peperina", "id"=>"2517197579", "length"=>"2403", "year"=>"0", "genre"=>"rock"}]
+		def cddb_matches
+		end
+		# Get the match number x on cddb. Add information for the cd
+		# and the tracks
+		# Requires <b>libcddb</b>
+		#
+		#  cd.cddb_fetch(1)
+		#  ==> true
+		#  t=cd.tracks[1]
+		#  puts t.number.to_s+"-"+t.artist+"-"+t.title
+		# 	   ==> 1-Seru Giran-Peperina
+		#  
+		#
+		def cddb_fetch(match)
+		end
+		def artist
+		end
+		def title
+		end
+		def category
+		end
+		def genre
+		end
+		def length
+		end
+		def extra_data
+		end
+	end
 	# Provides access to the tracks of a CdIo::Cd object 
 	class Tracks
 	# Returns a CdIo::Tracks object por a given CdIo::Cd
@@ -184,4 +317,12 @@ module CdIo
 	class TrackIso9660 < Track
 		attr_reader :system_id, :volume_id, :volumeset_id, :preparer_id, :publisher_id, :application_id
 	end
+	class TrackCdda < Track
+		def play
+		end
+		def artist
+		end
+		def title
+		end
+	end
 end