mockspotify 0.1.6 → 0.1.7

data/lib/mockspotify.rb

@@ -31,7 +31,7 @@ module Spotify
   attach_function :mock_track, :mocksp_track_create, [:string, :int, :array, :pointer, :int, :int, :int, :int, :error, :bool], :track
   attach_function :mock_image, :mocksp_image_create, [:image_id, :imageformat, :size_t, :buffer_in, :error], :image
   attach_function :mock_artist, :mocksp_artist_create, [:string, :bool], :artist
-  attach_function :mock_album, :mocksp_album_create, [:string, :artist, :int, :pointer, :image_id, :albumtype, :bool, :bool], :album
+  attach_function :mock_album, :mocksp_album_create, [:string, :artist, :int, :image_id, :albumtype, :bool, :bool], :album
 
   attach_function :mock_artistbrowse, :mocksp_artistbrowse_create, [:artist, :bool], :artistbrowse
 

data/lib/mockspotify/version.rb

@@ -1,5 +1,5 @@
 module Spotify
   module Mock
-    VERSION = '0.1.6'
+    VERSION = '0.1.7'
   end
 end

data/src/album.c

@@ -13,7 +13,7 @@ mocksp_album_create(const char *name, sp_artist *artist, int year, const byte *c
     strcpy(a->name, name);
     a->artist = artist;
     a->year = year;
-    memcpy(a->cover, cover, 20);
+    if (cover) memcpy(a->cover, cover, 20);
     a->type = type;
     a->loaded = loaded;
     a->available = available;

data/src/libmockspotify.h

@@ -80,7 +80,7 @@ struct sp_search {
 struct sp_track {
     char name[1024];
     int num_artists;
-    sp_artist *artists[16];
+    sp_artist **artists;
     sp_album *album;
     int duration;
     int popularity;

data/src/track.c

@@ -21,11 +21,29 @@ mocksp_track_create(const char *name, int num_artists, sp_artist **artists,
     t->album = album;
     t->starred = 0;
 
+    t->artists = ALLOC_N(sp_artist*, num_artists);
+    MEMCPY_N(t->artists, artists, sp_artist*, num_artists);
+    t->num_artists = num_artists;
+
     return t;
 }
 
 /*** Spotify API ***/
 
+sp_track *
+sp_localtrack_create(const char *artist, const char *title, const char *album, int length)
+{
+  sp_artist *partist = mocksp_artist_create(artist, 1);
+  sp_album  *palbum  = NULL;
+
+  if (strlen(album) > 0)
+  {
+    palbum  = mocksp_album_create(album, partist, 2011, NULL, SP_ALBUMTYPE_UNKNOWN, 1, 1);
+  }
+
+  return mocksp_track_create(title, 1, &partist, palbum, length, 0, 0, 0, 0, 1);
+}
+
 bool
 sp_track_is_available(sp_session *session, sp_track *t)
 {
@@ -47,18 +65,16 @@ sp_track_name(sp_track *track)
 int
 sp_track_num_artists(sp_track *t)
 {
-    return 3;
+    return t->num_artists;
 }
 
 sp_artist *
 sp_track_artist(sp_track *t, int index)
 {
-    static sp_artist *a[3];
+    if (index >= sp_track_num_artists(t))
+      return NULL;
 
-    a[0] = mocksp_artist_create("a1", 1);
-    a[1] = mocksp_artist_create("a2", 1);
-    a[2] = mocksp_artist_create("a3", 1);
-    return a[index];
+    return t->artists[index];
 }
 
 int

data/src/util.h

@@ -5,6 +5,8 @@
 
 #define ALLOC(type) ALLOC_N(type, 1)
 #define ALLOC_N(type, n) ((type*) xmalloc(sizeof(type) * (n)))
+#define MEMCPY(dst, src, type) MEMCPY_N(dst, src, type, 1)
+#define MEMCPY_N(dst, src, type, n) (memcpy((dst), (src), sizeof(type) * (n)))
 void *xmalloc(size_t);
 char *hextoa(const char *, int);
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mockspotify
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-24 00:00:00.000000000Z
+date: 2011-07-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spotify
-  requirement: &2156420020 !ruby/object:Gem::Requirement
+  requirement: &2154623200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156420020
+  version_requirements: *2154623200
 description: 
 email: kim@burgestrand.se
 executables: []