Update to libspotify 0.0.6 (closes #4)

Burgestrand · Nov 25, 2010 · 2cee7ae · 2cee7ae
1 parent 6469fdb
commit 2cee7ae
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 12 deletions.
diff --git a/ext/extconf.rb b/ext/extconf.rb
@@ -9,7 +9,7 @@
 end
 
 # check for libspotify
-unless have_func 'sp_session_init' or have_library 'spotify', 'sp_session_init'
+unless have_func 'sp_session_release' or have_library 'spotify', 'sp_session_release'
   abort 'error: libspotify not installed'
 end
 

diff --git a/ext/hallon.c b/ext/hallon.c
@@ -209,10 +209,21 @@ static sp_playlist_callbacks g_playlist_callbacks = {
  */
 static VALUE ciSession_alloc(VALUE self)
 {
-  sp_session **psession;
+  sp_session **psession = xmalloc(sizeof (void*));
   return Data_Make_Struct(self, sp_session*, 0, -1, psession);
 }
 
+/**
+ * Internal method: release an allocated spotify session.
+ */
+static void ciSession_free(VALUE self)
+{
+  sp_session **psession;
+  Data_Get_Struct(self, sp_session*, psession);
+  sp_session_release(DATA_PPTR(self, sp_session));
+  xfree(psession);
+}
+
 /**
  * call-seq:
  *   login(username, password) -> Session
@@ -384,7 +395,7 @@ static VALUE cSession_initialize(int argc, VALUE *argv, VALUE self)
 
   sp_session **psession;
   Data_Get_Struct(self, sp_session*, psession);
-  sp_error error = sp_session_init(&config, &(*psession));
+  sp_error error = sp_session_create(&config, &(*psession));
 
   if (error != SP_ERROR_OK)
   {
@@ -950,9 +961,12 @@ static VALUE cTrack_loaded(VALUE self)
  * 
  * True if the track is available for playback.
  */
-static VALUE cTrack_available(VALUE self)
+static VALUE cTrack_available(VALUE self, VALUE session)
 {
-  return sp_track_is_available(DATA_PPTR(self, sp_track)) ? Qtrue : Qfalse;
+  return sp_track_is_available(
+    DATA_PPTR(session, sp_session), 
+    DATA_PPTR(self, sp_track)
+  ) ? Qtrue : Qfalse;
 }
 
 /**
@@ -972,9 +986,12 @@ static VALUE cTrack_to_link(VALUE self)
  * 
  * True if the track is starred.
  */
-static VALUE cTrack_starred(VALUE self)
+static VALUE cTrack_starred(VALUE self, VALUE session)
 {
-  return sp_track_is_starred(DATA_PPTR(self, sp_track)) ? Qtrue : Qfalse;
+  return sp_track_is_starred(
+    DATA_PPTR(session, sp_session),
+    DATA_PPTR(self, sp_track)
+  ) ? Qtrue : Qfalse;
 }
 
 /**
@@ -1121,9 +1138,9 @@ void Init_hallon()
   rb_define_method(cTrack, "initialize", cTrack_initialize, 0);
   rb_define_method(cTrack, "name", cTrack_name, 0);
   rb_define_method(cTrack, "loaded?", cTrack_loaded, 0);
-  rb_define_method(cTrack, "available?", cTrack_available, 0);
+  rb_define_method(cTrack, "available?", cTrack_available, 1);
   rb_define_method(cTrack, "to_link", cTrack_to_link, 0);
-  rb_define_method(cTrack, "starred?", cTrack_starred, 0);
+  rb_define_method(cTrack, "starred?", cTrack_starred, 1);
   rb_define_method(cTrack, "duration", cTrack_duration, 0);
   rb_define_method(cTrack, "error", cTrack_error, 0);
   rb_define_method(cTrack, "popularity", cTrack_popularity, 0);

diff --git a/spec/hallon_spec.rb b/spec/hallon_spec.rb
@@ -1,6 +1,6 @@
 describe Hallon do
   describe "API version" do
-    specify { Hallon::API_VERSION.should equal 4 }
+    specify { Hallon::API_VERSION.should equal 6 }
   end
 
   describe "URI" do

diff --git a/spec/track_spec.rb b/spec/track_spec.rb
@@ -1,4 +1,3 @@
-
 describe Hallon::Track do
   before :all do
     @track = Hallon::Link.new(TRACK_URI).to_obj
@@ -19,7 +18,11 @@
   end
 
   it "should not be starred" do
-    @track.starred?.should equal false
+    @track.starred?(Hallon::Session.instance).should equal false
+  end
+
+  it "should be available" do
+    @track.available?(Hallon::Session.instance).should equal true
   end
 
   it "should have a duration" do