rb_cdio 0.1.1 → 0.2.0

data/doc/fr_class_index.html

@@ -22,7 +22,18 @@
   <div id="index-entries">
     <a href="classes/CdIo.html">CdIo</a><br />
     <a href="classes/CdIo/Cd.html">CdIo::Cd</a><br />
+    <a href="classes/CdIo/Cdda.html">CdIo::Cdda</a><br />
+    <a href="classes/CdIo/Exception.html">CdIo::Exception</a><br />
+    <a href="classes/CdIo/Exception/BadParameter.html">CdIo::Exception::BadParameter</a><br />
+    <a href="classes/CdIo/Exception/BadPointer.html">CdIo::Exception::BadPointer</a><br />
+    <a href="classes/CdIo/Exception/CddbConn.html">CdIo::Exception::CddbConn</a><br />
+    <a href="classes/CdIo/Exception/CddbError.html">CdIo::Exception::CddbError</a><br />
+    <a href="classes/CdIo/Exception/Error.html">CdIo::Exception::Error</a><br />
+    <a href="classes/CdIo/Exception/NoDriver.html">CdIo::Exception::NoDriver</a><br />
+    <a href="classes/CdIo/Exception/NotPermitted.html">CdIo::Exception::NotPermitted</a><br />
+    <a href="classes/CdIo/Exception/Unsupported.html">CdIo::Exception::Unsupported</a><br />
     <a href="classes/CdIo/Track.html">CdIo::Track</a><br />
+    <a href="classes/CdIo/TrackCdda.html">CdIo::TrackCdda</a><br />
     <a href="classes/CdIo/TrackIso9660.html">CdIo::TrackIso9660</a><br />
     <a href="classes/CdIo/Tracks.html">CdIo::Tracks</a><br />
   </div>

data/doc/fr_method_index.html

@@ -20,28 +20,47 @@
 <div id="index">
   <h1 class="section-bar">Methods</h1>
   <div id="index-entries">
-    <a href="classes/CdIo/Tracks.html#M000022">[] (CdIo::Tracks)</a><br />
-    <a href="classes/CdIo/Cd.html#M000013">cdtext (CdIo::Cd)</a><br />
-    <a href="classes/CdIo/Track.html#M000011">cdtext (CdIo::Track)</a><br />
-    <a href="classes/CdIo/Cd.html#M000019">close (CdIo::Cd)</a><br />
+    <a href="classes/CdIo/Tracks.html#M000038">[] (CdIo::Tracks)</a><br />
+    <a href="classes/CdIo/Cdda.html#M000019">artist (CdIo::Cdda)</a><br />
+    <a href="classes/CdIo/TrackCdda.html#M000040">artist (CdIo::TrackCdda)</a><br />
+    <a href="classes/CdIo/Cdda.html#M000021">category (CdIo::Cdda)</a><br />
+    <a href="classes/CdIo/Cdda.html#M000018">cddb_fetch (CdIo::Cdda)</a><br />
+    <a href="classes/CdIo/Cdda.html#M000016">cddb_id (CdIo::Cdda)</a><br />
+    <a href="classes/CdIo/Cdda.html#M000017">cddb_matches (CdIo::Cdda)</a><br />
+    <a href="classes/CdIo/Track.html#M000027">cdtext (CdIo::Track)</a><br />
+    <a href="classes/CdIo/Cd.html#M000029">cdtext (CdIo::Cd)</a><br />
+    <a href="classes/CdIo/Cd.html#M000035">close (CdIo::Cd)</a><br />
     <a href="classes/CdIo.html#M000002">default_device (CdIo)</a><br />
     <a href="classes/CdIo.html#M000001">devices (CdIo)</a><br />
     <a href="classes/CdIo.html#M000005">discmode_describe (CdIo)</a><br />
-    <a href="classes/CdIo/Cd.html#M000017">drive_cap (CdIo::Cd)</a><br />
+    <a href="classes/CdIo/Cd.html#M000033">drive_cap (CdIo::Cd)</a><br />
     <a href="classes/CdIo.html#M000003">drive_cap_dev (CdIo)</a><br />
     <a href="classes/CdIo.html#M000004">driver_describe (CdIo)</a><br />
-    <a href="classes/CdIo/Tracks.html#M000021">each (CdIo::Tracks)</a><br />
-    <a href="classes/CdIo/Track.html#M000010">green? (CdIo::Track)</a><br />
-    <a href="classes/CdIo/Cd.html#M000018">hwinfo (CdIo::Cd)</a><br />
-    <a href="classes/CdIo/Cd.html#M000015">is_cd? (CdIo::Cd)</a><br />
-    <a href="classes/CdIo/Cd.html#M000016">is_dvd? (CdIo::Cd)</a><br />
-    <a href="classes/CdIo/Tracks.html#M000020">new (CdIo::Tracks)</a><br />
-    <a href="classes/CdIo/Track.html#M000009">new (CdIo::Track)</a><br />
-    <a href="classes/CdIo/Cd.html#M000012">new (CdIo::Cd)</a><br />
+    <a href="classes/CdIo/Tracks.html#M000037">each (CdIo::Tracks)</a><br />
+    <a href="classes/CdIo/Cdda.html#M000024">extra_data (CdIo::Cdda)</a><br />
+    <a href="classes/CdIo/Cdda.html#M000022">genre (CdIo::Cdda)</a><br />
+    <a href="classes/CdIo/Track.html#M000026">green? (CdIo::Track)</a><br />
+    <a href="classes/CdIo/Cd.html#M000034">hwinfo (CdIo::Cd)</a><br />
+    <a href="classes/CdIo/Cd.html#M000031">is_cd? (CdIo::Cd)</a><br />
+    <a href="classes/CdIo/Cd.html#M000032">is_dvd? (CdIo::Cd)</a><br />
+    <a href="classes/CdIo/Cdda.html#M000023">length (CdIo::Cdda)</a><br />
+    <a href="classes/CdIo/Tracks.html#M000036">new (CdIo::Tracks)</a><br />
+    <a href="classes/CdIo/Track.html#M000025">new (CdIo::Track)</a><br />
+    <a href="classes/CdIo/Cd.html#M000028">new (CdIo::Cd)</a><br />
     <a href="classes/CdIo.html#M000008">open (CdIo)</a><br />
+    <a href="classes/CdIo/Cdda.html#M000012">pause (CdIo::Cdda)</a><br />
+    <a href="classes/CdIo/Cdda.html#M000011">play (CdIo::Cdda)</a><br />
+    <a href="classes/CdIo/TrackCdda.html#M000039">play (CdIo::TrackCdda)</a><br />
+    <a href="classes/CdIo/Cdda.html#M000013">resume (CdIo::Cdda)</a><br />
+    <a href="classes/CdIo/Cdda.html#M000014">stop (CdIo::Cdda)</a><br />
+    <a href="classes/CdIo/Cdda.html#M000015">subchannel (CdIo::Cdda)</a><br />
+    <a href="classes/CdIo/Cdda.html#M000020">title (CdIo::Cdda)</a><br />
+    <a href="classes/CdIo/TrackCdda.html#M000041">title (CdIo::TrackCdda)</a><br />
     <a href="classes/CdIo.html#M000006">track_format_describe (CdIo)</a><br />
     <a href="classes/CdIo.html#M000007">track_type_describe (CdIo)</a><br />
-    <a href="classes/CdIo/Cd.html#M000014">tracks (CdIo::Cd)</a><br />
+    <a href="classes/CdIo/Cd.html#M000030">tracks (CdIo::Cd)</a><br />
+    <a href="classes/CdIo/Cdda.html#M000009">volume (CdIo::Cdda)</a><br />
+    <a href="classes/CdIo/Cdda.html#M000010">volume= (CdIo::Cdda)</a><br />
   </div>
 </div>
 </body>

data/ext/CdIo.c

@@ -34,7 +34,7 @@ Init_rb_cdio()
     rb_define_module_function(mCdIo, "is_nrg", rb_cdio_is_nrg, 1);
     rb_define_module_function(mCdIo, "is_tocfile", rb_cdio_is_tocfile, 1);
     rb_define_module_function(mCdIo, "is_device", rb_cdio_is_device, -1);
-
+    rb_define_module_function(mCdIo, "close_tray", rb_cdio_close_tray, 1);
     /**
     * class CdIo::Cd 
     */
@@ -45,7 +45,7 @@ Init_rb_cdio()
 #define CDIO_ATTR 9
     const char     *attr[CDIO_ATTR] =
 	{ "device", "mcn", "driver_name", "driver_id", "first_track_num",
-	"discmode", "num_tracks", "stat_size", "cddb_id"
+	"discmode", "num_tracks", "last_lsn", "joliet_level"
     };
     for (i = 0; i < CDIO_ATTR; i++) {
 	rb_define_attr(cCdIoCd, attr[i], 1, 0);
@@ -63,6 +63,28 @@ Init_rb_cdio()
     rb_define_method(cCdIoCd, "drive_cap", rb_cdio_cd_get_drive_cap, 0);
     rb_define_method(cCdIoCd, "hwinfo", rb_cdio_cd_get_hwinfo, 0);
     rb_define_method(cCdIoCd, "close", rb_cdio_cd_close, 0);
+    rb_define_method(cCdIoCd, "eject", rb_cdio_cd_eject, 0);
+    // CdIo::CdDa module
+    mCdIoCdda = rb_define_module_under(mCdIo, "Cdda");
+    rb_define_method(mCdIoCdda, "volume", rb_cdio_cdda_get_volume, 0);
+    rb_define_method(mCdIoCdda, "volume=", rb_cdio_cdda_set_volume, 1);
+    rb_define_method(mCdIoCdda, "play", rb_cdio_cdda_play, -1);
+    rb_define_method(mCdIoCdda, "pause", rb_cdio_cdda_pause, 0);
+    rb_define_method(mCdIoCdda, "resume", rb_cdio_cdda_resume, 0);
+    rb_define_method(mCdIoCdda, "stop", rb_cdio_cdda_stop, 0);
+    rb_define_method(mCdIoCdda, "subchannel", rb_cdio_cdda_subchannel, 0);
+    rb_define_method(mCdIoCdda, "cddb_id", rb_cdio_cdda_cddb_id, 0);
+    rb_define_method(mCdIoCdda, "cddb_matches",rb_cdio_cdda_cddb_matches,0);
+    rb_define_method(mCdIoCdda, "cddb_fetch",rb_cdio_cdda_cddb_fetch,1);
+    
+    rb_define_method(mCdIoCdda,"artist",rb_cdio_cdda_artist,0);
+    rb_define_method(mCdIoCdda,"title",rb_cdio_cdda_title,0);
+    rb_define_method(mCdIoCdda,"year",rb_cdio_cdda_year,0);
+    rb_define_method(mCdIoCdda,"length",rb_cdio_cdda_length,0);
+    rb_define_method(mCdIoCdda,"genre",rb_cdio_cdda_genre,0);
+    rb_define_method(mCdIoCdda,"category",rb_cdio_cdda_category,0);
+    rb_define_method(mCdIoCdda,"extra_data",rb_cdio_cdda_extra_data,0);
+
     /** class CdIo::Tracks */
     cCdIoTracks = rb_define_class_under(mCdIo, "Tracks", rb_cObject);
     rb_include_module(cCdIoTracks, rb_mEnumerable);
@@ -71,7 +93,6 @@ Init_rb_cdio()
     rb_define_method(cCdIoTracks, "<=>", rb_cdio_tracks_diff, 2);
     rb_define_method(cCdIoTracks, "[]", rb_cdio_tracks_index, 1);
     rb_define_attr(cCdIoTracks, "cd", 1, 0);
-    rb_define_attr(cCdIoTracks, "tracks", 1, 0);
 	/** class CdIo::Track */
     cCdIoTrack = rb_define_class_under(mCdIo, "Track", rb_cObject);
     rb_define_method(cCdIoTrack, "initialize", rb_cdio_track_init, 2);
@@ -99,6 +120,33 @@ Init_rb_cdio()
     }
     rb_define_method(cCdIoTrackIso9660, "initialize",
 		     rb_cdio_trackiso9660_init, 2);
+    // class CdIo::TrackCdda
+    cCdIoTrackCdda = rb_define_class_under(mCdIo, "TrackCdda", cCdIoTrack);
+    // rb_define_method(cCdIoTrackCdda, "initialize",
+    // rb_cdio_trackcdda_init, 2);
+    rb_define_method(cCdIoTrackCdda, "play", rb_cdio_trackcdda_play, 0);
+    rb_define_attr(cCdIoTrackCdda,"title",1,0);
+    rb_define_attr(cCdIoTrackCdda,"artist",1,0);
+    rb_define_attr(cCdIoTrackCdda,"extra_data",1,0);
+    
+    // exceptions
+    mCdIoException = rb_define_module_under(mCdIo, "Exception");
+    eCdIoError =
+	rb_define_class_under(mCdIoException, "Error", rb_eIOError);
+    eCdIoUnsupported =
+	rb_define_class_under(mCdIoException, "Unsupported", rb_eIOError);
+    eCdIoUnitit =
+	rb_define_class_under(mCdIoException, "Unitit", rb_eIOError);
+    eCdIoNotPermitted =
+	rb_define_class_under(mCdIoException, "NotPermitted", rb_eIOError);
+    eCdIoBadParameter =
+	rb_define_class_under(mCdIoException, "BadParameter", rb_eIOError);
+    eCdIoBadPointer =
+	rb_define_class_under(mCdIoException, "BadPointer", rb_eNoMemError);
+    eCdIoNoDriver =
+	rb_define_class_under(mCdIoException, "NoDriver", rb_eIOError);
+    eCdIoCddbError = rb_define_class_under(mCdIoException, "CddbError",rb_eException);
+    eCdIoCddbConn = rb_define_class_under(mCdIoException, "CddbConn", rb_eIOError);    
     // const for DRIVER
     rb_define_const(mCdIo, "DRIVER_UNKNOWN", INT2FIX(DRIVER_UNKNOWN));
     rb_define_const(mCdIo, "DRIVER_FREEBSD", INT2FIX(DRIVER_FREEBSD));
@@ -150,4 +198,11 @@ Init_rb_cdio()
     rb_define_const(mCdIo, "TRACK_FORMAT_ERROR", INT2FIX(TRACK_FORMAT_ERROR));	/**< Dunno what is, or some other error. */
     rb_define_const(mCdIo, "CDIO_CDROM_LEADOUT_TRACK",
 		    INT2FIX(CDIO_CDROM_LEADOUT_TRACK));
+    rb_define_const(mCdIoCdda,"SUB_ST_INVALID",INT2FIX(CDIO_MMC_READ_SUB_ST_INVALID));
+    rb_define_const(mCdIoCdda,"SUB_ST_PLAY",INT2FIX(CDIO_MMC_READ_SUB_ST_PLAY));
+    rb_define_const(mCdIoCdda,"SUB_ST_PAUSED",INT2FIX(CDIO_MMC_READ_SUB_ST_PAUSED));
+    rb_define_const(mCdIoCdda,"SUB_ST_COMPLETED",INT2FIX(CDIO_MMC_READ_SUB_ST_COMPLETED));
+    rb_define_const(mCdIoCdda,"SUB_ST_ERROR",INT2FIX(CDIO_MMC_READ_SUB_ST_ERROR));
+    rb_define_const(mCdIoCdda,"SUB_ST_NO_STATUS",INT2FIX(CDIO_MMC_READ_SUB_ST_NO_STATUS));
+          
 }

data/ext/CdIo.h

@@ -21,14 +21,42 @@
 #include <string.h>
 #include <cdio/iso9660.h>
 #include <cdio/cdtext.h>
+#include <cdio/audio.h>
 #include <cdio/cd_types.h>
+#include <cdio/mmc.h>
 #include <ruby.h>
 
+// if we got cddb, include the library
+#ifdef HAVE_CDDB_CDDB_H
+	#ifndef HAVE_CDDB
+	#define HAVE_CDDB 1
+	#endif
+	#include <cddb/cddb.h>
+#endif
+
+/** Test **/
+
+#if LIBCDIO_VERSION_NUM < 73
+	#error rb_cdio 0.2.0 needs libcdio>=0.73
+#endif
+
+
+/** End tests **/
+
 #define GET_CDIO(self,p) \
 CdIo* p; \
 Data_Get_Struct(self, CdIo, p); \
 if(NULL==p) {rb_raise(rb_eException,"No pointer to CdIo");}
 
+#define GET_TRACK(obj,p,t) \
+CdIo* p; \
+track_t t; \
+Data_Get_Struct(rb_iv_get(obj, "@cd"), CdIo, p); \
+if(NULL==p) {rb_raise(rb_eException,"No pointer to CdIo");} \
+t=FIX2INT(rb_iv_get(obj,"@number"));
+
+#define HASH_STR(hash,str1,str2) \
+rb_hash_aset(hash,rb_str_new2(str1),rb_str_new2(str2));
 
 #undef CDIO_DRIVE_CAP_WRITE_DVD
 #define CDIO_DRIVE_CAP_WRITE_DVD (               \
@@ -39,11 +67,33 @@ if(NULL==p) {rb_raise(rb_eException,"No pointer to CdIo");}
     | CDIO_DRIVE_CAP_WRITE_DVD_RPW               \
     )
 
+// module CdIo
 VALUE mCdIo;
+// class CdIo::Cd
 VALUE cCdIoCd;
+// module CdIo::CdDa
+VALUE mCdIoCdda;
+// class CdIo::Track
 VALUE cCdIoTrack;
+// class CdIo::TrackIso9660
 VALUE cCdIoTrackIso9660;
+VALUE cCdIoTrackCdda;
+// class CdIo::Tracks
 VALUE cCdIoTracks;
+// module CdIo::Exception
+VALUE mCdIoException;
+// Exceptions
+VALUE eCdIoError;
+VALUE eCdIoUnsupported;
+VALUE eCdIoUnitit;
+VALUE eCdIoNotPermitted;
+VALUE eCdIoBadParameter;
+VALUE eCdIoBadPointer;
+VALUE eCdIoNoDriver;
+VALUE eCdIoCddbError;
+VALUE eCdIoCddbConn;
+
+
 int Init_CdIo();
 // Metodos para el m�dulo CdIo
 
@@ -70,7 +120,7 @@ VALUE rb_cdio_is_cuefile(VALUE module, VALUE name);
 VALUE rb_cdio_is_nrg(VALUE module, VALUE name);
 VALUE rb_cdio_is_tocfile(VALUE module, VALUE name);
 VALUE rb_cdio_is_device(int argc, VALUE * argv, VALUE module);
-
+VALUE rb_cdio_close_tray(VALUE module, VALUE name);
 
 /*
  * M�todos para clase CdIo::Cd 
@@ -87,7 +137,28 @@ VALUE rb_cdio_cd_get_freedb(VALUE obj);
 VALUE rb_cdio_cd_get_drive_cap(VALUE obj);
 VALUE rb_cdio_cd_get_hwinfo(VALUE obj);
 VALUE rb_cdio_cd_close(VALUE obj);
+VALUE rb_cdio_cd_eject(VALUE obj);
 VALUE rb_cdio_cd_get_cdtext(VALUE obj);
+// module functions CdDa
+VALUE rb_cdio_cdda_get_volume(VALUE obj);
+VALUE rb_cdio_cdda_set_volume(VALUE obj,VALUE vol);
+VALUE rb_cdio_cdda_play(int argc,VALUE* argv,VALUE obj);
+VALUE rb_cdio_cdda_pause(VALUE obj);
+VALUE rb_cdio_cdda_resume(VALUE obj);
+VALUE rb_cdio_cdda_stop(VALUE obj);
+VALUE rb_cdio_cdda_subchannel(VALUE obj);
+VALUE rb_cdio_cdda_cddb_id(VALUE obj);
+VALUE rb_cdio_cdda_cddb(VALUE obj);
+VALUE rb_cdio_cdda_cddb_matches(VALUE obj);
+VALUE rb_cdio_cdda_cddb_fetch(VALUE obj,VALUE match);
+
+VALUE rb_cdio_cdda_category(VALUE obj);
+VALUE rb_cdio_cdda_title(VALUE obj);
+VALUE rb_cdio_cdda_artist(VALUE obj);
+VALUE rb_cdio_cdda_year(VALUE obj);
+VALUE rb_cdio_cdda_genre(VALUE obj);
+VALUE rb_cdio_cdda_length(VALUE obj);
+VALUE rb_cdio_cdda_extra_data(VALUE obj);
 /**
 * M�todos para la clase CdIo::Tracks
 */
@@ -107,6 +178,8 @@ VALUE rb_cdio_track_get_cdtext(VALUE obj);
 /* TrackIso9660*/
 
 VALUE rb_cdio_trackiso9660_init(VALUE obj, VALUE oCd, VALUE i_track);
+/* TrackCdda */
+VALUE rb_cdio_trackcdda_play(VALUE obj);
 /*
  * M�todos comunes
  */

data/ext/CdIo_Cd.c

@@ -27,59 +27,6 @@ _cdio_cd_destroy(void *p)
 }
 
 
-
-
-
-
-/**
-* CDDB
-* Extraido desde cd-info.
-**/
-
-static int
-cddb_dec_digit_sum(int n)
-{
-    int             ret = 0;
-
-    for (;;) {
-	ret += n % 10;
-	n = n / 10;
-	if (!n)
-	    return ret;
-    }
-}
-
-/*
- * Return the number of seconds (discarding frame portion) of an MSF 
- */
-static inline unsigned int
-msf_seconds(msf_t * msf)
-{
-    return from_bcd8(msf->m) * 60 + from_bcd8(msf->s);
-}
-
-static unsigned long
-cddb_discid(CdIo * p_cdio, int i_tracks)
-{
-    int             i,
-                    t,
-                    n = 0;
-    msf_t           start_msf;
-    msf_t           msf;
-
-    for (i = 1; i <= i_tracks; i++) {
-	cdio_get_track_msf(p_cdio, i, &msf);
-	n += cddb_dec_digit_sum(msf_seconds(&msf));
-    }
-
-    cdio_get_track_msf(p_cdio, 1, &start_msf);
-    cdio_get_track_msf(p_cdio, CDIO_CDROM_LEADOUT_TRACK, &msf);
-
-    t = msf_seconds(&msf) - msf_seconds(&start_msf);
-
-    return ((n % 0xff) << 24 | t << 8 | i_tracks);
-}
-
 /**
  Create a new Cd::CdIo object.
  The first argument is an String for a device or a cue/bin/toc/nrg file
@@ -117,7 +64,8 @@ rb_cdio_cd_new(int argc, VALUE * argv, VALUE class)
     p_cdio = cdio_open(device, driver);
 
     if (p_cdio == NULL) {
-	rb_raise(rb_eException, "I can't create a pointer");
+	rb_raise(eCdIoError,
+		 "I can't create the object. Please, verify the media");
 	return Qnil;
     } else {
 	VALUE           c_argv[2];
@@ -169,13 +117,16 @@ rb_cdio_cd_init(VALUE self, VALUE device, VALUE driver)
 	}
     }
     // stat_size
-    rb_iv_set(self, "@stat_size", INT2NUM(cdio_stat_size(p_cdio)));
-    // si es un disco de audio, calculo su cddb
+    rb_iv_set(self, "@last_lsn", INT2NUM(cdio_get_disc_last_lsn(p_cdio)));
+    rb_iv_set(self, "@joliet_level",
+	      INT2NUM(cdio_get_joliet_level(p_cdio)));
+
+    // si es un disco de audio, lo extiendo con las funciones
+    // del m�dulo Cdda
     if (CDIO_DISC_MODE_CD_DA == discmode) {
-	char            cddb[8];
-	sprintf(cddb, "%08lx", cddb_discid(p_cdio, nt));
-	rb_iv_set(self, "@cddb_id", rb_str_new2(cddb));
+	rb_extend_object(self, mCdIoCdda);
     }
+
     return self;
 }
 
@@ -186,24 +137,14 @@ rb_cdio_cd_init(VALUE self, VALUE device, VALUE driver)
 VALUE
 rb_cdio_cd_get_tracks(VALUE self)
 {
-    VALUE           argv[1];
-    argv[0] = self;
-    return rb_class_new_instance(1, argv, cCdIoTracks);
-    VALUE           aTracks;
-    aTracks = rb_ary_new();
-    GET_CDIO(self, p_cdio);
-    track_t         first_track_num;
-    track_t         num_tracks;
-    first_track_num = cdio_get_first_track_num(p_cdio);
-    num_tracks = cdio_get_num_tracks(p_cdio);
-    // printf("C->Primera pista: %d\n",first_track_num);
-    // printf("C->Numero pistas: %d\n",num_tracks);
-    int             j,
-                    i = first_track_num;
-    for (j = 0; j < num_tracks; i++, j++) {
-	rb_ary_push(aTracks, get_track(self, i));
+    VALUE           tracks = rb_iv_get(self, "@tracks");
+    if (tracks == Qnil) {
+	VALUE           argv[1];
+	argv[0] = self;
+	tracks = rb_class_new_instance(1, argv, cCdIoTracks);
+	rb_iv_set(self, "@tracks", tracks);
     }
-    return aTracks;
+    return tracks;
 }
 
 /**
@@ -233,7 +174,8 @@ VALUE
 rb_cdio_cd_is_cd(VALUE obj)
 {
     GET_CDIO(obj, p_cdio);
-    return (discmode_is_cd(cdio_get_discmode(p_cdio))) ? Qtrue : Qfalse;
+    return (cdio_is_discmode_cdrom(cdio_get_discmode(p_cdio))) ? Qtrue :
+	Qfalse;
 }
 
 /**
@@ -243,10 +185,11 @@ VALUE
 rb_cdio_cd_is_dvd(VALUE obj)
 {
     GET_CDIO(obj, p_cdio);
-    return (discmode_is_dvd(cdio_get_discmode(p_cdio))) ? Qtrue : Qfalse;
+    return (cdio_is_discmode_dvd(cdio_get_discmode(p_cdio))) ? Qtrue :
+	Qfalse;
 }
 
-static          VALUE
+static VALUE
 _get_freedb(VALUE obj)
 {
     rb_require("freedb");
@@ -256,7 +199,7 @@ _get_freedb(VALUE obj)
 		      rb_iv_get(obj, "@device"));
 }
 
-static          VALUE
+static VALUE
 _get_freedb_error(VALUE obj, VALUE error_info)
 {
     rb_raise(rb_eLoadError,
@@ -326,3 +269,13 @@ rb_cdio_cd_get_cdtext(VALUE obj)
     const cdtext_t *cdtext = cdio_get_cdtext(p_cdio, 0);
     return get_cdtext(cdtext);
 }
+
+VALUE
+rb_cdio_cd_eject(VALUE obj)
+{
+    GET_CDIO(obj, p_cdio);
+    verify_return_code(cdio_eject_media(&p_cdio));
+    rb_gc_start();
+    obj = Qnil;
+    return Qtrue;
+}