On Mar 9, 2012, at 2:24 , Tony Miller wrote:

> I couldn't get this to compile on my machine. I have yajl 2.0.4-1 installed. 

Sorry, I got distracted. The following (untested) patch should make the plugin 
work with yajl 2.

Cheers
Robert

diff --git a/src/playlist/soundcloud_playlist_plugin.c 
b/src/playlist/soundcloud_playlist_plugin.c
index b987de9..cf50bd0 100644
--- a/src/playlist/soundcloud_playlist_plugin.c
+++ b/src/playlist/soundcloud_playlist_plugin.c
@@ -272,12 +272,11 @@ soundcloud_parse_json(const char *url, yajl_handle hand, 
GMutex* mutex, GCond* c
                }
 
                if (done)
-                       stat = yajl_parse_complete(hand);
+                       stat = yajl_complete_parse(hand);
                else
                        stat = yajl_parse(hand, ubuffer, nbytes);
 
-               if (stat != yajl_status_ok &&
-                       stat != yajl_status_insufficient_data)
+               if (stat != yajl_status_ok)
                {
                        unsigned char *str = yajl_get_error(hand, 1, ubuffer, 
nbytes);
                        g_warning("%s", str);
@@ -358,7 +357,7 @@ soundcloud_open_uri(const char *uri, GMutex *mutex, GCond 
*cond)
        data.songs = NULL;
        data.title = NULL;
        data.stream_url = NULL;
-       hand = yajl_alloc(&parse_callbacks, NULL, NULL, (void *) &data);
+       hand = yajl_alloc(&parse_callbacks, NULL, (void *) &data);
 
        int ret = soundcloud_parse_json(u, hand, mutex, cond);


------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing 
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team

Reply via email to