rbpod 0.0.5 → 0.0.6

data/README.md

@@ -104,10 +104,21 @@ playlist.podcast? # => false
 
 playlist.tracks # => #<RbPod::TrackCollection:0xdeadbeef>
 ```
+### RbPod::TrackCollection
 
-### RbPod::Track
+All playlists contain a `tracks` method which returns an `RbPod::TrackCollection`:
+
+```ruby
+tracks = database.playlists.master.tracks
+
+tracks.playlist # => #<RbPod::Playlist:0xdeadbeef>
+tracks.length   # => 400
 
-Tracks also can do a lot, but not complete:
+tracks.first # => #<RbPod::Track:0xdeadbeef>
+tracks[0]    # => #<RbPod::Track:0xdeadbeef>
+```
+
+### RbPod::Track
 
 ```ruby
 track = database.playlists.master.tracks.first

data/ext/rbpod/collection.c

@@ -1,7 +1,6 @@
 /* collection.c */
 
 #include "rbpod.h"
-#include "collection.h"
 
 /*
  * call-seq:

data/ext/rbpod/database.c

@@ -1,12 +1,6 @@
 /* database.c */
 
 #include "rbpod.h"
-#include "error.h"
-#include "device.h"
-#include "database.h"
-#include "playlist.h"
-#include "track_collection.h"
-#include "playlist_collection.h"
 
 /*
  * call-seq:
@@ -71,7 +65,9 @@ static VALUE rbpod_database_tracks_get(VALUE self)
  */
 static VALUE rbpod_database_device_get(VALUE self)
 {
-    return rb_class_new_instance(1, &self, cRbPodDevice);
+    Itdb_iTunesDB *database = TYPED_DATA_PTR(self, Itdb_iTunesDB);
+    VALUE mount_point = rb_str_new2(itdb_get_mountpoint(database));
+    return rb_class_new_instance(1, &mount_point, cRbPodDevice);
 }
 
 /*
@@ -203,34 +199,35 @@ static VALUE rbpod_database_create(int argc, VALUE *argv, VALUE self)
         return Qnil;
     }
 
-    /* If we didn't specify a device name, default to 'iPod'. */
-    if (RTEST(device_name) == FALSE) {
-        device_name = rb_str_new2("iPod");
-    }
+    /* If a device name was given, ensure it's a string. */
+    if (RTEST(device_name)) {
+        Check_Type(device_name, T_STRING);
 
-    /* Ensure it's a valid device name, if it was given. */
-    if (TYPE(device_name) == T_STRING && RSTRING_LEN(device_name) == 0) {
-        rb_raise(eRbPodError, "Device name must not be an empty string.");
-        return Qnil;
+        if (RSTRING_LEN(device_name) < 4) {
+            rb_raise(eRbPodError, "Device name must be a string of at least four characters.");
+            return Qnil;
+        }
     }
 
     /* If a model number was given, ensure it's a string. */
     if (RTEST(model_number)) {
-        Check_Type(device_name, T_STRING);
+        Check_Type(model_number, T_STRING);
 
-        model_matcher = rb_str_new2("/x?[A-Z][0-9]{3}/");
+        model_matcher = rb_str_new2("/[xM]?[A-Z][0-9]{3}/");
         ignorecase = rb_const_get(rb_cRegexp, rb_intern("IGNORECASE"));
         model_regexp = rb_reg_new_str(model_matcher, ignorecase);
 
         if (RTEST(rb_reg_match(model_regexp, model_number)) == FALSE) {
-            rb_raise(eRbPodError, "Model number must be a string matching: /x?[A-Z][0-9]{3}/i");
+            rb_raise(eRbPodError, "Model number must be a string matching: /[xM]?[A-Z][0-9]{3}/i");
             return Qnil;
         }
     }
 
     /* Extract pointers for glib use. */
     _mount_point  = StringValueCStr(mount_point);
-    _device_name  = StringValueCStr(device_name);
+
+    /* GPod will use 'iPod' as the device name if it wasn't specified. */
+    _device_name  = !NIL_P(device_name) ? StringValueCStr(device_name) : NULL;
 
     /* GPod can function with a NULL model number, however, artwork may not function properly. */
     _model_number = !NIL_P(model_number) ? StringValueCStr(model_number) : NULL;

data/ext/rbpod/device.c

@@ -1,9 +1,6 @@
 /* device.c */
 
 #include "rbpod.h"
-#include "error.h"
-#include "device.h"
-#include "database.h"
 
 /*
  * call-seq:
@@ -189,32 +186,38 @@ static VALUE rbpod_device_sysinfo_save(VALUE self)
 
 /*
  * call-seq:
- *     initialize(database) -> RbPod::Device
+ *     initialize(mount_point) -> RbPod::Device
  *
- * Creates an RbPod::Device for a given RbPod::Database. You shouldn't have to call this.
+ * Creates an RbPod::Device mapped to a given device mount point.
  */
-static VALUE rbpod_device_initialize(VALUE self, VALUE database)
+static VALUE rbpod_device_initialize(VALUE self, VALUE mount_point)
 {
-    Itdb_iTunesDB *_database = TYPED_DATA_PTR(database, Itdb_iTunesDB);
+    Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
 
-    /* Make sure we were given an instance of a RbPod::Database. */
-    if (rb_obj_is_instance_of(database, cRbPodDatabase) == FALSE) {
-        rb_raise(eRbPodError, "Given database must be an instance of RbPod::Database: %s", StringValueCStr(database));
+    /* Check if the mount point is a directory. */
+    if (rb_file_directory_p(rb_cFile, mount_point) != Qtrue) {
+        rb_raise(eRbPodError, "The mount point must be a directory!");
         return Qnil;
     }
 
-    /* The database pointer and it's device should both be non-NULL. */
-    if (_database == NULL || _database->device == NULL) {
-        rb_raise(eRbPodError, "Given database and/or device was NULL.");
-        return Qnil;
-    }
+    itdb_device_set_mountpoint(device, StringValueCStr(mount_point));
 
-    /* Attach our data pointer to this database's backing device. */
-    DATA_PTR(self) = _database->device;
+    DATA_PTR(self) = device;
 
     return self;
 }
 
+static void rbpod_device_deallocate(void *handle)
+{
+    itdb_device_free((Itdb_Device *) handle);
+}
+
+static VALUE rbpod_device_allocate(VALUE self)
+{
+    Itdb_Device *device = itdb_device_new();
+    return Data_Wrap_Struct(cRbPodDevice, NULL, rbpod_device_deallocate, (void *) device);
+}
+
 void Init_rbpod_device(void)
 {
 #if RDOC_CAN_PARSE_DOCUMENTATION
@@ -222,6 +225,8 @@ void Init_rbpod_device(void)
 #endif
     cRbPodDevice = rb_define_class_under(mRbPod, "Device", rb_cObject);
 
+    rb_define_alloc_func(cRbPodDevice, rbpod_device_allocate);
+
     rb_define_method(cRbPodDevice, "initialize", rbpod_device_initialize, 1);
 
     rb_define_method(cRbPodDevice, "[]", rbpod_device_sysinfo_get, 1);

data/ext/rbpod/error.c

@@ -1,7 +1,6 @@
 /* error.c */
 
 #include "rbpod.h"
-#include "error.h"
 
 inline VALUE rbpod_raise_error(GError *error)
 {

data/ext/rbpod/extconf.rb

@@ -1,10 +1,15 @@
-#!/usr/bin/env ruby
-
 require 'mkmf'
 
+# Fail immediately if we don't have libgpod-1.0 installed here.
 abort "Please install libgpod-1.0" unless pkg_config('libgpod-1.0')
 
 # Unfortunately, rdoc isn't capable of a lot of things.
 $defs.push("-DRDOC_CAN_PARSE_DOCUMENTATION=0")
 
+# Provide HAVE_STDDEF_H to the pre-processor.
+have_header('stddef.h')
+
+# Provide HAVE_GPOD_ITDB_H to the pre-processor.
+have_header('gpod/itdb.h')
+
 create_makefile('rbpod/rbpod')

data/ext/rbpod/macros.h

@@ -0,0 +1,99 @@
+/* macros.h */
+
+#ifndef RBPOD_MACROS_H
+#define RBPOD_MACROS_H
+
+#define BooleanValue(value) (value) ? Qtrue : Qfalse
+
+#define TYPED_DATA_PTR(self, type) ((type *) DATA_PTR(self))
+
+#define DEF_ATTR_READER_STRING(c_type, prefix, field) \
+    static VALUE rbpod_##prefix##_##field##_get(VALUE self) \
+    { \
+        c_type *ptr = TYPED_DATA_PTR(self, c_type); \
+        return (ptr->field == NULL) ? Qnil : rb_str_new2(ptr->field); \
+    }
+
+#define DEF_ATTR_WRITER_STRING(c_type, prefix, field) \
+    static VALUE rbpod_##prefix##_##field##_set(VALUE self, VALUE value) \
+    { \
+        c_type *ptr = TYPED_DATA_PTR(self, c_type); \
+        gchar *previous = (gchar *) ptr->field; \
+        ptr->field = StringValueCStr(value); \
+        if (previous != NULL) { \
+            g_free(previous); \
+        } \
+        return Qnil; \
+    }
+
+#define DEF_ATTR_READER_FIXNUM(c_type, prefix, field) \
+    static VALUE rbpod_##prefix##_##field##_get(VALUE self) \
+    { \
+        c_type *ptr = TYPED_DATA_PTR(self, c_type); \
+        return INT2NUM(ptr->field); \
+    }
+
+#define DEF_ATTR_WRITER_FIXNUM(c_type, prefix, field) \
+    static VALUE rbpod_##prefix##_##field##_set(VALUE self, VALUE value) \
+    { \
+        c_type *ptr = TYPED_DATA_PTR(self, c_type); \
+        ptr->field = NUM2INT(value); \
+        return Qnil; \
+    }
+
+#define DEF_ATTR_READER_BOOLEAN(c_type, prefix, field) \
+    static VALUE rbpod_##prefix##_##field##_get(VALUE self) \
+    { \
+        c_type *ptr = TYPED_DATA_PTR(self, c_type); \
+        return (ptr->field == 0) ? Qfalse : Qtrue; \
+    }
+
+#define DEF_ATTR_WRITER_BOOLEAN(c_type, prefix, field) \
+    static VALUE rbpod_##prefix##_##field##_set(VALUE self, VALUE value) \
+    { \
+        c_type *ptr = TYPED_DATA_PTR(self, c_type); \
+        ptr->field = (RTEST(value)) ? 1 : 0; \
+        return Qnil; \
+    }
+
+#define DEF_ATTR_READER_DATETIME(c_type, prefix, field) \
+    static VALUE rbpod_##prefix##_##field##_get(VALUE self) \
+    { \
+        c_type *ptr = TYPED_DATA_PTR(self, c_type); \
+        VALUE timestamp = INT2NUM(ptr->field); \
+        if (ptr->field == 0) { \
+            return Qnil; \
+        } \
+        return rb_funcall(rb_cTime, rb_intern("at"), 1, timestamp); \
+    }
+
+#define DEF_ATTR_WRITER_DATETIME(c_type, prefix, field) \
+    static VALUE rbpod_##prefix##_##field##_set(VALUE self, VALUE value) \
+    { \
+        c_type *ptr = TYPED_DATA_PTR(self, c_type); \
+        ptr->field = rb_funcall(value, rb_intern("to_i"), 0); \
+        return Qnil; \
+    }
+
+#define DEF_ATTR_ACCESSOR(c_type, prefix, ruby_type, field) \
+    DEF_ATTR_READER_##ruby_type(c_type, prefix, field); \
+    DEF_ATTR_WRITER_##ruby_type(c_type, prefix, field)
+
+#define DCL_ATTR_WRITER(ruby_class, prefix, name, field) \
+    rb_define_method(ruby_class, #name "=", rbpod_##prefix##_##field##_set, 1)
+
+#define DCL_ATTR_PREDICATE(ruby_class, prefix, name, field) \
+    rb_define_method(ruby_class, #name "?", rbpod_##prefix##_##field##_get, 0)
+
+#define DCL_ATTR_READER(ruby_class, prefix, name, field) \
+    rb_define_method(ruby_class, #name, rbpod_##prefix##_##field##_get, 0)
+
+#define DCL_ATTR_P(ruby_class, prefix, name, field) \
+    DCL_ATTR_PREDICATE(ruby_class, prefix, name, field); \
+    DCL_ATTR_WRITER(ruby_class, prefix, name, field)
+
+#define DCL_ATTR(ruby_class, prefix, name, field) \
+    DCL_ATTR_READER(ruby_class, prefix, name, field); \
+    DCL_ATTR_WRITER(ruby_class, prefix, name, field)
+
+#endif /* RBPOD_MACROS_H */

data/ext/rbpod/playlist.c

@@ -1,8 +1,6 @@
 /* playlist.c */
 
 #include "rbpod.h"
-#include "playlist.h"
-#include "track_collection.h"
 
 /*
  * call-seq:
@@ -42,7 +40,21 @@ static VALUE rbpod_playlist_smart_p(VALUE self)
 
 /*
  * call-seq:
- *     timestamp() -> Time
+ *     smart=(flag) -> nil
+ *
+ * Set this playlist to a smart playlist.
+ */
+static VALUE rbpod_playlist_smart_set(VALUE self, VALUE flag)
+{
+    Itdb_Playlist *playlist = TYPED_DATA_PTR(self, Itdb_Playlist);
+
+    playlist->is_spl = (RTEST(flag)) ? TRUE : FALSE;
+
+    return Qnil;
+}
+
+/*
+ * call-seq:
  *     created_on() -> Time
  *
  * Returns a Time object representing the time that this playlist was created.
@@ -89,6 +101,27 @@ static VALUE rbpod_playlist_length_get(VALUE self)
     return INT2NUM(itdb_playlist_tracks_number(playlist));
 }
 
+/*
+ * call-seq:
+ *     name=(string) -> nil
+ *
+ * Sets the name of this playlist.
+ */
+static VALUE rbpod_playlist_name_set(VALUE self, VALUE name)
+{
+    Itdb_Playlist *playlist = TYPED_DATA_PTR(self, Itdb_Playlist);
+    gchar *new_name = StringValueCStr(name);
+    gchar *old_name = playlist->name;
+
+    /* Free up the old name. */
+    g_free(old_name);
+
+    /* Attach the new name. */
+    playlist->name = new_name;
+
+    return Qnil;
+}
+
 /*
  * call-seq:
  *     name() -> String
@@ -116,24 +149,23 @@ static VALUE rbpod_playlist_compare(VALUE self, VALUE other)
         return Qnil;
     }
 
+    /* If this is the master playlist, it always comes first. */
+    if (rbpod_playlist_master_p(self) == Qtrue) {
+        return NUM2INT(-1);
+    }
+
+    /* If we're comparing against the master playlist, it comes first. */
+    if (rbpod_playlist_master_p(other) == Qtrue) {
+        return NUM2INT(1);
+    }
+
     this_playlist_name  = rbpod_playlist_name_get(self);
     other_playlist_name = rbpod_playlist_name_get(other);
 
+    /* Otherwise, compare by playlist name. */
     return rb_str_cmp(this_playlist_name, other_playlist_name);
 }
 
-/*
- * call-seq:
- *     id() -> Fixnum
- *
- * Returns the internal ID number for this playlist. Do not use this method.
- */
-static VALUE rbpod_playlist_id_get(VALUE self)
-{
-    Itdb_Playlist *playlist = TYPED_DATA_PTR(self, Itdb_Playlist);
-    return INT2NUM(playlist->id);
-}
-
 /*
  * call-seq:
  *     initialize() -> RbPod::Playlist
@@ -175,23 +207,22 @@ void Init_rbpod_playlist(void)
 
     rb_define_method(cRbPodPlaylist, "initialize", rbpod_playlist_initialize, 0);
 
-    rb_define_private_method(cRbPodPlaylist, "id", rbpod_playlist_id_get, 0);
-
     rb_define_method(cRbPodPlaylist, "<=>", rbpod_playlist_compare, 1);
 
     rb_define_method(cRbPodPlaylist, "name", rbpod_playlist_name_get, 0);
     rb_define_method(cRbPodPlaylist, "length", rbpod_playlist_length_get, 0);
     rb_define_method(cRbPodPlaylist, "tracks", rbpod_playlist_tracks_get, 0);
-    rb_define_method(cRbPodPlaylist, "shuffle!", rbpod_playlist_shuffle_bang, 0);
-    rb_define_method(cRbPodPlaylist, "timestamp", rbpod_playlist_timestamp_get, 0);
+    rb_define_method(cRbPodPlaylist, "created_on", rbpod_playlist_timestamp_get, 0);
 
-    /* :nodoc */
-    rb_define_alias(cRbPodPlaylist, "created_on", "timestamp");
+    rb_define_method(cRbPodPlaylist, "name=", rbpod_playlist_name_set, 1);
+    rb_define_method(cRbPodPlaylist, "smart=", rbpod_playlist_smart_set, 1);
 
     rb_define_method(cRbPodPlaylist, "smart?", rbpod_playlist_smart_p, 0);
     rb_define_method(cRbPodPlaylist, "master?", rbpod_playlist_master_p, 0);
     rb_define_method(cRbPodPlaylist, "podcast?", rbpod_playlist_podcast_p, 0);
 
+    rb_define_method(cRbPodPlaylist, "shuffle!", rbpod_playlist_shuffle_bang, 0);
+
     return;
 }
 

data/ext/rbpod/playlist_collection.c

@@ -1,10 +1,6 @@
 /* playlist_collection.c */
 
 #include "rbpod.h"
-#include "database.h"
-#include "playlist.h"
-#include "collection.h"
-#include "playlist_collection.h"
 
 /*
  * call-seq:
@@ -19,24 +15,106 @@ static VALUE rbpod_playlist_collection_database(VALUE self)
 
 /*
  * call-seq:
- *     include?(playlist) -> Boolean
+ *     insert(playlist, position = -1) -> nil
+ *
+ * Adds the given RbPod::Playlist +playlist+ to the database.
+ */
+static VALUE rbpod_playlist_collection_insert(int argc, VALUE *argv, VALUE self)
+{
+    VALUE database = rbpod_playlist_collection_database(self);
+    VALUE playlist = Qnil, position = Qnil;
+    Itdb_iTunesDB *_database = NULL;
+    Itdb_Playlist *_playlist = NULL;
+    gint32 _position = 0;
+
+    if (rb_scan_args(argc, argv, "11", &playlist, &position) < 1) {
+        rb_raise(eRbPodError, "Invalid arguments: Expected >= 1 argument!");
+        return Qnil;
+    }
+
+    _database = TYPED_DATA_PTR(database, Itdb_iTunesDB);
+    _playlist = TYPED_DATA_PTR(playlist, Itdb_Playlist);
+    _position = NIL_P(position) ? -1 : NUM2INT(position);
+
+    /* We we given a playlist? */
+    if (rb_obj_is_instance_of(playlist, cRbPodPlaylist) == FALSE) {
+        rb_raise(eRbPodError, "Invalid argument: expected RbPod::Playlist, got %s", StringValueCStr(playlist));
+        return Qnil;
+    }
+
+    /* Does this playlist already exist in the database? */
+    if (itdb_playlist_exists(_database, _playlist) == TRUE) {
+        rb_raise(eRbPodError, "Invalid argument: this playlist already exists in the database!");
+        return Qnil;
+    }
+
+    itdb_playlist_add(_database, _playlist, _position);
+
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *     remove(playlist) -> nil
+ *
+ * Removes the given RbPod::Playlist +playlist+ from the database.
+ */
+static VALUE rbpod_playlist_collection_remove(VALUE self, VALUE playlist)
+{
+    VALUE database = rbpod_playlist_collection_database(self);
+    Itdb_iTunesDB *_database = TYPED_DATA_PTR(database, Itdb_iTunesDB);
+    Itdb_Playlist *_playlist = TYPED_DATA_PTR(playlist, Itdb_Playlist);
+
+    /* We we given a playlist? */
+    if (rb_obj_is_instance_of(playlist, cRbPodPlaylist) == FALSE) {
+        rb_raise(eRbPodError, "Invalid argument: Expected RbPod::Playlist, got %s", StringValueCStr(playlist));
+        return Qnil;
+    }
+
+    /* Does this playlist already exist in the database? */
+    if (itdb_playlist_exists(_database, _playlist) == FALSE) {
+        rb_raise(eRbPodError, "Invalid argument: This playlist does not exist in the database!");
+        return Qnil;
+    }
+
+    itdb_playlist_remove(_playlist);
+
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *     include?(playlist) -> boolean
  *
  * Returns true or false if the given RbPod::Playlist +playlist+ exists within the database.
  */
-static VALUE rbpod_playlist_collection_include_p(VALUE self, VALUE playlist)
+static VALUE rbpod_playlist_collection_include(VALUE self, VALUE playlist)
 {
     VALUE database = rbpod_playlist_collection_database(self);
     Itdb_iTunesDB *_database = TYPED_DATA_PTR(database, Itdb_iTunesDB);
     Itdb_Playlist *_playlist = TYPED_DATA_PTR(playlist, Itdb_Playlist);
 
     if (rb_obj_is_instance_of(playlist, cRbPodPlaylist) == FALSE) {
-        rb_raise(eRbPodError, "Invalid argument: expected RbPod::Playlist, got %s", StringValueCStr(playlist));
+        rb_raise(eRbPodError, "Invalid argument: Expected RbPod::Playlist, got %s", StringValueCStr(playlist));
         return Qfalse;
     }
 
     return BooleanValue(itdb_playlist_exists(_database, _playlist));
 }
 
+/*
+ * call-seq:
+ *     size() -> integer
+ *
+ * Returns the total number of playlists in this database.
+ */
+static VALUE rbpod_playlist_collection_size(VALUE self)
+{
+    VALUE database = rbpod_playlist_collection_database(self);
+    Itdb_iTunesDB *_database = TYPED_DATA_PTR(database, Itdb_iTunesDB);
+    return INT2NUM(itdb_playlists_number(_database));
+}
+
 /*
  * call-seq:
  *     master() -> RbPod::Playlist
@@ -122,11 +200,19 @@ void Init_rbpod_playlist_collection(void)
 
     rb_define_method(cRbPodPlaylistCollection, "database", rbpod_playlist_collection_database, 0);
 
-    rb_define_method(cRbPodPlaylistCollection, "include?", rbpod_playlist_collection_include_p, 1);
+    rb_define_method(cRbPodPlaylistCollection, "include?", rbpod_playlist_collection_include, 1);
 
     rb_define_method(cRbPodPlaylistCollection, "master", rbpod_playlist_collection_master, 0);
     rb_define_method(cRbPodPlaylistCollection, "podcast", rbpod_playlist_collection_podcast, 0);
 
+    rb_define_method(cRbPodPlaylistCollection, "size", rbpod_playlist_collection_size, 0);
+
+    rb_define_method(cRbPodPlaylistCollection, "insert", rbpod_playlist_collection_insert, -1);
+    rb_define_method(cRbPodPlaylistCollection, "remove", rbpod_playlist_collection_remove, 1);
+
+    /* Syntactic sugar for adding a playlist. */
+    rb_define_alias(cRbPodPlaylistCollection, "<<", "insert");
+
     return;
 }
 

data/ext/rbpod/rbpod.c

@@ -1,14 +1,6 @@
 /* rbpod.c */
 
 #include "rbpod.h"
-#include "error.h"
-#include "track.h"
-#include "device.h"
-#include "playlist.h"
-#include "database.h"
-#include "collection.h"
-#include "track_collection.h"
-#include "playlist_collection.h"
 
 VALUE mRbPod;
 VALUE eRbPodError;
@@ -38,32 +30,6 @@ static VALUE rbpod_load_database(VALUE self, VALUE mount_point)
     return rb_class_new_instance(1, &mount_point, cRbPodDatabase);
 }
 
-/*
- * This is a hack used to inject a pointer from the data of one class instance into another.
- */
-inline VALUE rb_class_new_instance_with_data(int argc, VALUE *argv, VALUE class, void *handle)
-{
-    /* Create a new instance of this class. */
-    VALUE instance = rb_class_new_instance(argc, argv, class);
-
-    /* Assign it's DATA pointer to the given handle. */
-    DATA_PTR(instance) = handle;
-
-    return instance;
-}
-
-/*
- * This is a hack so that including a module will trigger the +included+ singleton method.
- */
-inline void rb_real_include_module(VALUE klass, VALUE module)
-{
-    ID included = rb_intern("included");
-
-    rb_include_module(klass, module);
-
-    rb_funcall(mRbPodCollection, included, 1, klass);
-}
-
 void Init_rbpod(void)
 {
     /* This is the wrapper for all RbPod related classes. */

data/ext/rbpod/rbpod.h

@@ -4,19 +4,45 @@
 #define RBPOD_H
 
 #include <ruby.h>
-#include <gpod/itdb.h>
-
-#define BooleanValue(value) (value) ? Qtrue : Qfalse
 
-#define TYPED_DATA_PTR(self, type) ((type *) DATA_PTR(self))
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
 
-RUBY_EXTERN VALUE mRbPod;
-RUBY_EXTERN VALUE eRbPodError;
+#ifdef HAVE_GPOD_ITDB_H
+#include <gpod/itdb.h>
+#endif
+
+/* Pre-processor macros. */
+#include "macros.h"
+
+/* Initialization function prototypes. */
+RUBY_EXTERN void Init_rbpod(void);                       /* rbpod.c */
+RUBY_EXTERN void Init_rbpod_error(void);                 /* error.c */
+RUBY_EXTERN void Init_rbpod_database(void);              /* database.c */
+RUBY_EXTERN void Init_rbpod_device(void);                /* device.c */
+RUBY_EXTERN void Init_rbpod_track(void);                 /* track.c */
+RUBY_EXTERN void Init_rbpod_playlist(void);              /* playlist.c */
+RUBY_EXTERN void Init_rbpod_collection(void);            /* collection.c */
+RUBY_EXTERN void Init_rbpod_track_collection(void);      /* track_collection.c */
+RUBY_EXTERN void Init_rbpod_playlist_collection(void);   /* playlist_collection.c */
+
+/* Helper function prototypes. */
+RUBY_EXTERN inline VALUE rbpod_raise_error(GError *error);
+RUBY_EXTERN inline VALUE rb_class_new_instance_with_data(int argc, VALUE *argv, VALUE class, void *handle);
+RUBY_EXTERN inline void rb_real_include_module(VALUE klass, VALUE module);
+
+/* Global variables. */
+RUBY_EXTERN VALUE mRbPod;                   /* rbpod.c */
+RUBY_EXTERN VALUE eRbPodError;              /* error.c */
+RUBY_EXTERN VALUE cRbPodDatabase;           /* database.c */
+RUBY_EXTERN VALUE cRbPodDevice;             /* device.c */
+RUBY_EXTERN VALUE cRbPodTrack;              /* track.c */
+RUBY_EXTERN VALUE cRbPodPlaylist;           /* playlist.c */
+RUBY_EXTERN VALUE mRbPodCollection;         /* collection.c */
+RUBY_EXTERN VALUE cRbPodTrackCollection;    /* track_collection.c */
+RUBY_EXTERN VALUE cRbPodPlaylistCollection; /* playlist_collection.c */
 
 RUBY_EXTERN VALUE rb_cPathname;
 
-inline VALUE rb_class_new_instance_with_data(int argc, VALUE *argv, VALUE class, void *handle);
-
-inline void rb_real_include_module(VALUE klass, VALUE module);
-
 #endif /* RBPOD_H */