rbpod 0.0.2 → 0.0.3

data/ext/rbpod/device.c

@@ -3,67 +3,78 @@
 #include "rbpod.h"
 #include "device.h"
 
-VALUE cRbPodDevice;
-
-inline VALUE rbpod_device_create(Itdb_Device *device) {
+inline VALUE rbpod_device_create(Itdb_Device *device)
+{
     return Data_Wrap_Struct(cRbPodDevice, NULL, NULL, (void *) device);
 }
 
-static VALUE rbpod_device_has_chapter_image_support(VALUE self) {
+static VALUE rbpod_device_chapter_image_support_p(VALUE self)
+{
     Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
     return BooleanValue(itdb_device_supports_chapter_image(device));
 }
 
-static VALUE rbpod_device_has_podcast_support(VALUE self) {
+static VALUE rbpod_device_podcast_support_p(VALUE self)
+{
     Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
     return BooleanValue(itdb_device_supports_podcast(device));
 }
 
-static VALUE rbpod_device_has_artwork_support(VALUE self) {
+static VALUE rbpod_device_artwork_support_p(VALUE self)
+{
     Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
     return BooleanValue(itdb_device_supports_artwork(device));
 }
 
-static VALUE rbpod_device_has_video_support(VALUE self) {
+static VALUE rbpod_device_video_support_p(VALUE self)
+{
     Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
     return BooleanValue(itdb_device_supports_video(device));
 }
 
-static VALUE rbpod_device_has_photo_support(VALUE self) {
+static VALUE rbpod_device_photo_support_p(VALUE self)
+{
     Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
     return BooleanValue(itdb_device_supports_photo(device));
 }
 
-static VALUE rbpod_device_model_name_get(VALUE self) {
+static VALUE rbpod_device_model_name_get(VALUE self)
+{
     Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
     const Itdb_IpodInfo *info = itdb_device_get_ipod_info(device);
     return rb_str_new2(itdb_info_get_ipod_model_name_string(info->ipod_model));
 }
 
-static VALUE rbpod_device_model_number_get(VALUE self) {
+static VALUE rbpod_device_model_number_get(VALUE self)
+{
     Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
     const Itdb_IpodInfo *info = itdb_device_get_ipod_info(device);
     return rb_str_new2(info->model_number);
 }
 
-static VALUE rbpod_device_generation_get(VALUE self) {
+static VALUE rbpod_device_generation_get(VALUE self)
+{
     Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
     const Itdb_IpodInfo *info = itdb_device_get_ipod_info(device);
     return rb_str_new2(itdb_info_get_ipod_generation_string(info->ipod_generation));
 }
 
-static VALUE rbpod_device_capacity_get(VALUE self) {
+static VALUE rbpod_device_capacity_get(VALUE self)
+{
     Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
     const Itdb_IpodInfo *info = itdb_device_get_ipod_info(device);
     return DBL2NUM(info->capacity);
 }
 
-static VALUE rbpod_device_uuid_get(VALUE self) {
+static VALUE rbpod_device_uuid_get(VALUE self)
+{
     Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
-    return rb_str_new2(itdb_device_get_uuid(device));
+    const gchar *uuid = itdb_device_get_uuid(device);
+    return (uuid == NULL) ? Qnil : rb_str_new2(uuid);
 }
 
-static VALUE rbpod_device_sysinfo_get(VALUE self, VALUE key) {
+static VALUE rbpod_device_sysinfo_get(VALUE self, VALUE key)
+{
     Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
     gchar *value = NULL;
     VALUE result;
@@ -76,7 +87,8 @@ static VALUE rbpod_device_sysinfo_get(VALUE self, VALUE key) {
 
 }
 
-static VALUE rbpod_device_sysinfo_set(VALUE self, VALUE key, VALUE value) {
+static VALUE rbpod_device_sysinfo_set(VALUE self, VALUE key, VALUE value)
+{
     Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
     gchar *_value, *_key;
 
@@ -85,29 +97,42 @@ static VALUE rbpod_device_sysinfo_set(VALUE self, VALUE key, VALUE value) {
 
     itdb_device_set_sysinfo(device, _key, _value);
 
-    return rbpod_device_sysinfo_get(self, key);
+    return Qnil;
 }
 
-static VALUE rbpod_device_sysinfo_write(VALUE self) {
+static VALUE rbpod_device_sysinfo_save(VALUE self)
+{
     Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
-    /* TODO: Improve error handling. */
-    return BooleanValue(itdb_device_write_sysinfo(device, NULL));
+    GError *error = NULL;
+
+    if (itdb_device_write_sysinfo(device, &error) == FALSE) {
+        return rbpod_raise_error(error);
+    }
+
+    return Qnil;
 }
 
-static VALUE rbpod_device_initialize(VALUE self) {
+static VALUE rbpod_device_initialize(VALUE self)
+{
     /* Private method, no setup required yet. */
     return self;
 }
 
-static void rbpod_device_deallocate(void *handle) {
+static void rbpod_device_deallocate(void *handle)
+{
     itdb_device_free((Itdb_Device *) handle);
 }
 
-static VALUE rbpod_device_allocate(VALUE self) {
+static VALUE rbpod_device_allocate(VALUE self)
+{
     return Data_Wrap_Struct(cRbPodDevice, NULL, rbpod_device_deallocate, (void *) itdb_device_new());
 }
 
-void Init_rbpod_device(void) {
+void Init_rbpod_device(void)
+{
+#if RDOC_CAN_PARSE_DOCUMENTATION
+    mRbPod = rb_define_module("RbPod");
+#endif
     cRbPodDevice = rb_define_class_under(mRbPod, "Device", rb_cObject);
 
     rb_define_alloc_func(cRbPodDevice, rbpod_device_allocate);
@@ -117,7 +142,7 @@ void Init_rbpod_device(void) {
 
     rb_define_method(cRbPodDevice, "[]", rbpod_device_sysinfo_get, 1);
     rb_define_method(cRbPodDevice, "[]=", rbpod_device_sysinfo_set, 2);
-    rb_define_method(cRbPodDevice, "save!", rbpod_device_sysinfo_write, 0);
+    rb_define_method(cRbPodDevice, "save!", rbpod_device_sysinfo_save, 0);
 
     rb_define_method(cRbPodDevice, "uuid", rbpod_device_uuid_get, 0);
     rb_define_method(cRbPodDevice, "capacity", rbpod_device_capacity_get, 0);
@@ -125,11 +150,11 @@ void Init_rbpod_device(void) {
     rb_define_method(cRbPodDevice, "model_name", rbpod_device_model_name_get, 0);
     rb_define_method(cRbPodDevice, "model_number", rbpod_device_model_number_get, 0);
 
-    rb_define_method(cRbPodDevice, "supports_photos?", rbpod_device_has_photo_support, 0);
-    rb_define_method(cRbPodDevice, "supports_videos?", rbpod_device_has_video_support, 0);
-    rb_define_method(cRbPodDevice, "supports_artwork?", rbpod_device_has_artwork_support, 0);
-    rb_define_method(cRbPodDevice, "supports_podcasts?", rbpod_device_has_podcast_support, 0);
-    rb_define_method(cRbPodDevice, "supports_chapter_images?", rbpod_device_has_chapter_image_support, 0);
+    rb_define_method(cRbPodDevice, "supports_photos?", rbpod_device_photo_support_p, 0);
+    rb_define_method(cRbPodDevice, "supports_videos?", rbpod_device_video_support_p, 0);
+    rb_define_method(cRbPodDevice, "supports_artwork?", rbpod_device_artwork_support_p, 0);
+    rb_define_method(cRbPodDevice, "supports_podcasts?", rbpod_device_podcast_support_p, 0);
+    rb_define_method(cRbPodDevice, "supports_chapter_images?", rbpod_device_chapter_image_support_p, 0);
 
     return;
 }

data/ext/rbpod/device.h

@@ -3,7 +3,7 @@
 #ifndef RBPOD_DEVICE_H
 #define RBPOD_DEVICE_H
 
-extern VALUE cRbPodDevice;
+RUBY_EXTERN VALUE cRbPodDevice;
 
 void Init_rbpod_device(void);
 

data/ext/rbpod/extconf.rb

@@ -4,4 +4,7 @@ require 'mkmf'
 
 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")
+
 create_makefile('rbpod/rbpod')

data/ext/rbpod/playlist.c

@@ -1,86 +1,109 @@
 /* playlist.c */
 
 #include "rbpod.h"
-#include "track.h"
 #include "playlist.h"
-#include "collection.h"
+#include "track_collection.h"
 
-VALUE cRbPodPlaylist;
-VALUE mRbPodPlaylistCollection;
-
-inline VALUE rbpod_playlist_collection_create(VALUE parent, GList *items) {
-    VALUE collection = rbpod_collection_create(items, cRbPodPlaylist);
-    rb_extend_object(collection, mRbPodPlaylistCollection);
-    rb_iv_set(collection, "@parent", parent);
-    return collection;
-}
-
-static VALUE rbpod_playlist_is_podcast(VALUE self) {
+static VALUE rbpod_playlist_podcast_p(VALUE self)
+{
     Itdb_Playlist *playlist = TYPED_DATA_PTR(self, Itdb_Playlist);
     return BooleanValue(itdb_playlist_is_podcasts(playlist));
 }
 
-static VALUE rbpod_playlist_is_master(VALUE self) {
+static VALUE rbpod_playlist_master_p(VALUE self)
+{
     Itdb_Playlist *playlist = TYPED_DATA_PTR(self, Itdb_Playlist);
     return BooleanValue(itdb_playlist_is_mpl(playlist));
 }
 
-static VALUE rbpod_playlist_is_smart(VALUE self) {
+static VALUE rbpod_playlist_smart_p(VALUE self)
+{
     Itdb_Playlist *playlist = TYPED_DATA_PTR(self, Itdb_Playlist);
     return BooleanValue(playlist->is_spl);
 }
 
-static VALUE rbpod_playlist_timestamp_get(VALUE self) {
+static VALUE rbpod_playlist_timestamp_get(VALUE self)
+{
     Itdb_Playlist *playlist = TYPED_DATA_PTR(self, Itdb_Playlist);
     return rb_funcall(rb_cTime, rb_intern("at"), 1, INT2NUM(playlist->timestamp));
 }
 
-static VALUE rbpod_playlist_shuffle(VALUE self) {
+static VALUE rbpod_playlist_shuffle(VALUE self)
+{
     Itdb_Playlist *playlist = TYPED_DATA_PTR(self, Itdb_Playlist);
     itdb_playlist_randomize(playlist);
     return Qnil;
 }
 
-static VALUE rbpod_playlist_tracks_get(VALUE self) {
+static VALUE rbpod_playlist_tracks_get(VALUE self)
+{
     Itdb_Playlist *playlist = TYPED_DATA_PTR(self, Itdb_Playlist);
     return rbpod_track_collection_create(self, playlist->members);
 }
 
-static VALUE rbpod_playlist_length_get(VALUE self) {
+static VALUE rbpod_playlist_length_get(VALUE self)
+{
     Itdb_Playlist *playlist = TYPED_DATA_PTR(self, Itdb_Playlist);
     return INT2NUM(itdb_playlist_tracks_number(playlist));
 }
 
-static VALUE rbpod_playlist_name_get(VALUE self) {
+static VALUE rbpod_playlist_name_get(VALUE self)
+{
     Itdb_Playlist *playlist = TYPED_DATA_PTR(self, Itdb_Playlist);
     return rb_str_new2(playlist->name);
 }
 
-static VALUE rbpod_playlist_id_get(VALUE self) {
+static VALUE rbpod_playlist_id_get(VALUE self)
+{
     Itdb_Playlist *playlist = TYPED_DATA_PTR(self, Itdb_Playlist);
     return INT2NUM(playlist->id);
 }
 
-static VALUE rbpod_playlist_initialize(VALUE self) {
-    /* Nothing to intiialize, yet. */
+static VALUE rbpod_playlist_initialize(VALUE self, VALUE playlist_name, VALUE smart_playlist)
+{
+    Itdb_Playlist *playlist = TYPED_DATA_PTR(self, Itdb_Playlist);
+    gchar *_playlist_name = StringValueCStr(playlist_name);
+
+    /* Kill off the dummy playlist. */
+    itdb_playlist_free(playlist);
+
+    /* Create a new playlist based on the values provided. */
+    playlist = itdb_playlist_new(_playlist_name, (smart_playlist == Qtrue) ? TRUE : FALSE);
+
+    /* Store the new playlist. */
+    DATA_PTR(self) = playlist;
+
     return self;
 }
 
-static void rbpod_playlist_deallocate(void *handle) {
-    itdb_playlist_free((Itdb_Playlist *) handle);
+static void rbpod_playlist_deallocate(void *handle)
+{
+    Itdb_Playlist *playlist = (Itdb_Playlist *) handle;
+
+    /* This playlist was unmanaged, so free it manually. */
+    if (playlist->itdb == NULL || playlist->id == 0) {
+        itdb_playlist_free(playlist);
+    }
+
+    return;
 }
 
-static VALUE rbpod_playlist_allocate(VALUE self) {
-    Itdb_Playlist *playlist = itdb_playlist_new("Untitled Playlist", FALSE);
+static VALUE rbpod_playlist_allocate(VALUE self)
+{
+    Itdb_Playlist *playlist = itdb_playlist_new("KILROY WAS HERE", FALSE);
     return Data_Wrap_Struct(cRbPodPlaylist, NULL, rbpod_playlist_deallocate, (void *) playlist);
 }
 
-void Init_rbpod_playlist(void) {
+void Init_rbpod_playlist(void)
+{
+#if RDOC_CAN_PARSE_DOCUMENTATION
+     mRbPod = rb_define_module("RbPod");
+#endif
     cRbPodPlaylist = rb_define_class_under(mRbPod, "Playlist", rb_cObject);
 
     rb_define_alloc_func(cRbPodPlaylist, rbpod_playlist_allocate);
 
-    rb_define_method(cRbPodPlaylist, "initialize", rbpod_playlist_initialize, 0);
+    rb_define_method(cRbPodPlaylist, "initialize", rbpod_playlist_initialize, 2);
 
     rb_define_method(cRbPodPlaylist, "id", rbpod_playlist_id_get, 0);
     rb_define_method(cRbPodPlaylist, "name", rbpod_playlist_name_get, 0);
@@ -89,11 +112,9 @@ void Init_rbpod_playlist(void) {
     rb_define_method(cRbPodPlaylist, "shuffle!", rbpod_playlist_shuffle, 0);
     rb_define_method(cRbPodPlaylist, "created_on", rbpod_playlist_timestamp_get, 0);
 
-    rb_define_method(cRbPodPlaylist, "smart_playlist?", rbpod_playlist_is_smart, 0);
-    rb_define_method(cRbPodPlaylist, "master_playlist?", rbpod_playlist_is_master, 0);
-    rb_define_method(cRbPodPlaylist, "podcast_playlist?", rbpod_playlist_is_podcast, 0);
-
-    mRbPodPlaylistCollection = rb_define_module_under(cRbPodPlaylist, "Collection");
+    rb_define_method(cRbPodPlaylist, "smart_playlist?", rbpod_playlist_smart_p, 0);
+    rb_define_method(cRbPodPlaylist, "master_playlist?", rbpod_playlist_master_p, 0);
+    rb_define_method(cRbPodPlaylist, "podcast_playlist?", rbpod_playlist_podcast_p, 0);
 
     return;
 }

data/ext/rbpod/playlist.h

@@ -3,11 +3,8 @@
 #ifndef RBPOD_PLAYLIST_H
 #define RBPOD_PLAYLIST_H
 
-extern VALUE cRbPodPlaylist;
-extern VALUE mRbPodPlaylistCollection;
+RUBY_EXTERN VALUE cRbPodPlaylist;
 
 void Init_rbpod_playlist(void);
 
-inline VALUE rbpod_playlist_collection_create(VALUE parent, GList *items);
-
 #endif /* RBPOD_PLAYLIST_H */

data/ext/rbpod/playlist_collection.c

@@ -0,0 +1,77 @@
+/* playlist_collection.c */
+
+#include "rbpod.h"
+#include "playlist.h"
+#include "collection.h"
+#include "playlist_collection.h"
+
+static VALUE rbpod_playlist_collection_parent(VALUE self)
+{
+    return rb_iv_get(self, "@parent");
+}
+
+static VALUE rbpod_playlist_collection_get(VALUE self, VALUE key)
+{
+    VALUE parent = rbpod_playlist_collection_parent(self);
+    Itdb_iTunesDB *database = TYPED_DATA_PTR(parent, Itdb_iTunesDB);
+    Itdb_Playlist *playlist = NULL;
+
+    switch (TYPE(key)) {
+    case T_SYMBOL:
+    case T_STRING:
+        playlist = itdb_playlist_by_name(database, StringValueCStr(key));
+        break;
+    case T_FIXNUM:
+        playlist = itdb_playlist_by_nr(database, FIX2INT(key));
+        break;
+    }
+
+    if (playlist == NULL) {
+        return Qnil;
+    }
+
+    return Data_Wrap_Struct(cRbPodPlaylist, NULL, NULL, (void *) playlist);
+}
+
+static VALUE rbpod_playlist_collection_podcasts_get(VALUE self)
+{
+    VALUE parent = rbpod_playlist_collection_parent(self);
+    Itdb_iTunesDB *database = TYPED_DATA_PTR(parent, Itdb_iTunesDB);
+    Itdb_Playlist *podcasts = itdb_playlist_podcasts(database);
+    return Data_Wrap_Struct(cRbPodPlaylist, NULL, NULL, (void *) podcasts);
+}
+
+static VALUE rbpod_playlist_collection_master_get(VALUE self)
+{
+    VALUE parent = rbpod_playlist_collection_parent(self);
+    Itdb_iTunesDB *database = TYPED_DATA_PTR(parent, Itdb_iTunesDB);
+    Itdb_Playlist *master = itdb_playlist_mpl(database);
+    return Data_Wrap_Struct(cRbPodPlaylist, NULL, NULL, (void *) master);
+}
+
+inline VALUE rbpod_playlist_collection_create(VALUE parent, GList *items)
+{
+    VALUE collection = rbpod_collection_create(items, cRbPodPlaylist);
+    rb_extend_object(collection, mRbPodPlaylistCollection);
+    rb_extend_object(collection, rb_mComparable);
+    rb_iv_set(collection, "@parent", parent);
+    return collection;
+}
+
+void Init_rbpod_playlist_collection(void)
+{
+#if RDOC_CAN_PARSE_DOCUMENTATION
+    mRbPod = rb_define_module("RbPod");
+#endif
+    mRbPodPlaylistCollection = rb_define_module_under(mRbPod, "PlaylistCollection");
+
+    rb_define_private_method(mRbPodPlaylistCollection, "parent", rbpod_playlist_collection_parent, 0);
+
+    rb_define_method(mRbPodPlaylistCollection, "master", rbpod_playlist_collection_master_get, 0);
+    rb_define_method(mRbPodPlaylistCollection, "podcasts", rbpod_playlist_collection_podcasts_get, 0);
+
+    rb_define_method(mRbPodPlaylistCollection, "[]", rbpod_playlist_collection_get, 1);
+
+    return;
+}
+

data/ext/rbpod/playlist_collection.h

@@ -0,0 +1,14 @@
+/* playlist_collection.h */
+
+#ifndef RBPOD_PLAYLIST_COLLECTION_H
+#define RBPOD_PLAYLIST_COLLECTION_H
+
+#include "playlist.h"
+
+RUBY_EXTERN VALUE mRbPodPlaylistCollection;
+
+void Init_rbpod_playlist_collection(void);
+
+inline VALUE rbpod_playlist_collection_create(VALUE parent, GList *items);
+
+#endif /* RBPOD_PLAYLIST_COLLECTION_H */

data/ext/rbpod/rbpod.c

@@ -6,31 +6,50 @@
 #include "playlist.h"
 #include "database.h"
 #include "collection.h"
+#include "track_collection.h"
+#include "playlist_collection.h"
 
 VALUE mRbPod;
 VALUE eRbPodError;
 
-void Init_rbpod(void) {
-    /* Set up the top-level RbPod module. */
+VALUE cRbPodDatabase;
+VALUE cRbPodDevice;
+
+VALUE cRbPodCollection;
+
+VALUE cRbPodPlaylist;
+VALUE mRbPodPlaylistCollection;
+
+VALUE cRbPodTrack;
+VALUE mRbPodTrackCollection;
+
+
+inline VALUE rbpod_raise_error(GError *error)
+{
+    VALUE error_message;
+
+    if (error != NULL) {
+        error_message = rb_str_new2(error->message);
+        g_error_free(error);
+        rb_raise(eRbPodError, "%s", StringValueCStr(error_message));
+    }
+
+    return Qnil;
+}
+
+void Init_rbpod(void)
+{
     mRbPod = rb_define_module("RbPod");
 
-    /* Subclass RuntimeError for ourselves. */
     eRbPodError = rb_define_class_under(mRbPod, "Error", rb_eRuntimeError);
 
-    /* Set up the RbPod::Database class. */
     Init_rbpod_database();
-
-    /* Set up the RbPod::Device class. */
     Init_rbpod_device();
-
-    /* Set up the RbPod::Collection class. */
     Init_rbpod_collection();
-
-    /* Set up the RbPod::Playlist class. */
     Init_rbpod_playlist();
-
-    /* Set up the RbPod::Track class. */
+    Init_rbpod_playlist_collection();
     Init_rbpod_track();
+    Init_rbpod_track_collection();
 
     return;
 }

data/ext/rbpod/rbpod.h

@@ -10,7 +10,9 @@
 
 #define TYPED_DATA_PTR(self, type) ((type *) DATA_PTR(self))
 
-extern VALUE mRbPod;
-extern VALUE eRbPodError;
+RUBY_EXTERN VALUE mRbPod;
+RUBY_EXTERN VALUE eRbPodError;
+
+inline VALUE rbpod_raise_error(GError *error);
 
 #endif /* RBPOD_H */

data/ext/rbpod/track.c

@@ -2,68 +2,71 @@
 
 #include "rbpod.h"
 #include "track.h"
-#include "collection.h"
 
-VALUE cRbPodTrack;
-VALUE mRbPodTrackCollection;
-
-inline VALUE rbpod_track_collection_create(VALUE parent, GList *items) {
-    VALUE collection = rbpod_collection_create(items, cRbPodTrack);
-    rb_extend_object(collection, mRbPodTrackCollection);
-    rb_iv_set(collection, "@parent", parent);
-    return collection;
-}
-
-static VALUE rbpod_track_is_transferred(VALUE self) {
+static VALUE rbpod_track_transferred_p(VALUE self)
+{
     Itdb_Track *track = TYPED_DATA_PTR(self, Itdb_Track);
     return BooleanValue(track->transferred);
 }
 
-static VALUE rbpod_track_ipod_path_get(VALUE self) {
+static VALUE rbpod_track_ipod_path_get(VALUE self)
+{
     Itdb_Track *track = TYPED_DATA_PTR(self, Itdb_Track);
     return rb_str_new2(track->ipod_path);
 }
 
-static VALUE rbpod_track_file_type_get(VALUE self) {
+static VALUE rbpod_track_file_type_get(VALUE self)
+{
     Itdb_Track *track = TYPED_DATA_PTR(self, Itdb_Track);
     return rb_str_new2(track->filetype);
 }
 
-static VALUE rbpod_track_artist_get(VALUE self) {
+static VALUE rbpod_track_artist_get(VALUE self)
+{
     Itdb_Track *track = TYPED_DATA_PTR(self, Itdb_Track);
     return rb_str_new2(track->artist);
 }
 
-static VALUE rbpod_track_album_get(VALUE self) {
+static VALUE rbpod_track_album_get(VALUE self)
+{
     Itdb_Track *track = TYPED_DATA_PTR(self, Itdb_Track);
     return rb_str_new2(track->album);
 }
 
-static VALUE rbpod_track_title_get(VALUE self) {
+static VALUE rbpod_track_title_get(VALUE self)
+{
     Itdb_Track *track = TYPED_DATA_PTR(self, Itdb_Track);
     return rb_str_new2(track->title);
 }
 
-static VALUE rbpod_track_id_get(VALUE self) {
+static VALUE rbpod_track_id_get(VALUE self)
+{
     Itdb_Track *track = TYPED_DATA_PTR(self, Itdb_Track);
     return rb_str_new2(track->filetype);
 }
 
-static VALUE rbpod_track_initialize(VALUE self) {
+static VALUE rbpod_track_initialize(VALUE self)
+{
     return self;
 }
 
-static void rbpod_track_deallocate(void *handle) {
+static void rbpod_track_deallocate(void *handle)
+{
     itdb_track_free((Itdb_Track *) handle);
     return;
 }
 
-static VALUE rbpod_track_allocate(VALUE self) {
+static VALUE rbpod_track_allocate(VALUE self)
+{
     Itdb_Track *track = itdb_track_new();
     return Data_Wrap_Struct(cRbPodTrack, NULL, rbpod_track_deallocate, (void *) track);
 }
 
-void Init_rbpod_track(void) {
+void Init_rbpod_track(void)
+{
+#if RDOC_CAN_PARSE_DOCUMENTATION
+    mRbPod = rb_define_module("RbPod");
+#endif
     cRbPodTrack = rb_define_class_under(mRbPod, "Track", rb_cObject);
 
     rb_define_alloc_func(cRbPodTrack, rbpod_track_allocate);
@@ -77,9 +80,7 @@ void Init_rbpod_track(void) {
     rb_define_method(cRbPodTrack, "file_type", rbpod_track_file_type_get, 0);
     rb_define_method(cRbPodTrack, "ipod_path", rbpod_track_ipod_path_get, 0);
 
-    rb_define_method(cRbPodTrack, "transferred?", rbpod_track_is_transferred, 0);
-
-    mRbPodTrackCollection = rb_define_module_under(cRbPodTrack, "Collection");
+    rb_define_method(cRbPodTrack, "transferred?", rbpod_track_transferred_p, 0);
 
     return;
 }

data/ext/rbpod/track.h

@@ -3,11 +3,8 @@
 #ifndef RBPOD_TRACK_H
 #define RBPOD_TRACK_H
 
-extern VALUE cRbPodTrack;
-extern VALUE mRbPodTrackCollection;
+RUBY_EXTERN VALUE cRbPodTrack;
 
 void Init_rbpod_track(void);
 
-inline VALUE rbpod_track_collection_create(VALUE parent, GList *items);
-
 #endif /* RBPOD_TRACK_H */

data/ext/rbpod/track_collection.c

@@ -0,0 +1,33 @@
+/* track_collection.c */
+
+#include "rbpod.h"
+#include "track.h"
+#include "collection.h"
+#include "track_collection.h"
+
+static VALUE rbpod_track_collection_parent(VALUE self)
+{
+    return rb_iv_get(self, "@parent");
+}
+
+inline VALUE rbpod_track_collection_create(VALUE parent, GList *items)
+{
+    VALUE collection = rbpod_collection_create(items, cRbPodTrack);
+    rb_extend_object(collection, mRbPodTrackCollection);
+    rb_extend_object(collection, rb_mComparable);
+    rb_iv_set(collection, "@parent", parent);
+    return collection;
+}
+
+void Init_rbpod_track_collection(void)
+{
+#if RDOC_CAN_PARSE_DOCUMENTATION
+    mRbPod = rb_define_module("RbPod");
+#endif
+    mRbPodTrackCollection = rb_define_module_under(mRbPod, "TrackCollection");
+
+    rb_define_private_method(mRbPodTrackCollection, "parent", rbpod_track_collection_parent, 0);
+
+    return;
+}
+