oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

playlist/soundcloud: make variables more local

Browse Source
This commit is contained in:
Max Kellermann 2013-12-14 21:25:07 +01:00
parent 527a6003e2
commit 73d917b76e
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/playlist/SoundCloudPlaylistPlugin.cxx
View File

@ -207,12 +207,9 @@ static int handle_end_map(void *ctx)
/* got_url == 1, track finished, make it into a song */ /* got_url == 1, track finished, make it into a song */
data->got_url = 0; data->got_url = 0;
Song *s; char *u = g_strconcat(data->stream_url, "?client_id=",
char *u; soundcloud_config.apikey.c_str(), nullptr);
Song *s = Song::NewRemote(u);
u = g_strconcat(data->stream_url, "?client_id=",
soundcloud_config.apikey.c_str(), nullptr);
s = Song::NewRemote(u);
g_free(u); g_free(u);
TagBuilder tag; TagBuilder tag;
@ -250,9 +247,6 @@ static int
soundcloud_parse_json(const char *url, yajl_handle hand, soundcloud_parse_json(const char *url, yajl_handle hand,
Mutex &mutex, Cond &cond) Mutex &mutex, Cond &cond)
{ {
char buffer[4096];
unsigned char *ubuffer = (unsigned char *)buffer;
Error error; Error error;
InputStream *input_stream = InputStream::Open(url, mutex, cond, InputStream *input_stream = InputStream::Open(url, mutex, cond,
error); error);
@ -269,6 +263,8 @@ soundcloud_parse_json(const char *url, yajl_handle hand,
int done = 0; int done = 0;
while (!done) { while (!done) {
char buffer[4096];
unsigned char *ubuffer = (unsigned char *)buffer;
const size_t nbytes = const size_t nbytes =
input_stream->Read(buffer, sizeof(buffer), error); input_stream->Read(buffer, sizeof(buffer), error);
if (nbytes == 0) { if (nbytes == 0) {
@ -319,22 +315,22 @@ soundcloud_parse_json(const char *url, yajl_handle hand,
* soundcloud://playlist/<playlist-id> * soundcloud://playlist/<playlist-id>
* soundcloud://url/<url or path of soundcloud page> * soundcloud://url/<url or path of soundcloud page>
*/ */
static SongEnumerator * static SongEnumerator *
soundcloud_open_uri(const char *uri, Mutex &mutex, Cond &cond) soundcloud_open_uri(const char *uri, Mutex &mutex, Cond &cond)
{ {
char *s, *p; char *s = g_strdup(uri);
char *scheme, *arg, *rest; char *scheme = s;
s = g_strdup(uri);
scheme = s; char *p = s;
for (p = s; *p; p++) { for (; *p; p++) {
if (*p == ':' && *(p+1) == '/' && *(p+2) == '/') { if (*p == ':' && *(p+1) == '/' && *(p+2) == '/') {
*p = 0; *p = 0;
p += 3; p += 3;
break; break;
} }
} }
arg = p;
char *arg = p;
for (; *p; p++) { for (; *p; p++) {
if (*p == '/') { if (*p == '/') {
*p = 0; *p = 0;
@ -342,7 +338,8 @@ soundcloud_open_uri(const char *uri, Mutex &mutex, Cond &cond)
break; break;
} }
} }
rest = p;
char *rest = p;
if (strcmp(scheme, "soundcloud") != 0) { if (strcmp(scheme, "soundcloud") != 0) {
FormatWarning(soundcloud_domain, FormatWarning(soundcloud_domain,
@ -373,16 +370,15 @@ soundcloud_open_uri(const char *uri, Mutex &mutex, Cond &cond)
return nullptr; return nullptr;
} }
yajl_handle hand;
struct parse_data data; struct parse_data data;
data.got_url = 0; data.got_url = 0;
data.title = nullptr; data.title = nullptr;
data.stream_url = nullptr; data.stream_url = nullptr;
#ifdef HAVE_YAJL1 #ifdef HAVE_YAJL1
hand = yajl_alloc(&parse_callbacks, nullptr, nullptr, (void *) &data); yajl_handle hand = yajl_alloc(&parse_callbacks, nullptr, nullptr,
&data);
#else #else
hand = yajl_alloc(&parse_callbacks, nullptr, (void *) &data); yajl_handle hand = yajl_alloc(&parse_callbacks, nullptr, &data);
#endif #endif
int ret = soundcloud_parse_json(u, hand, mutex, cond); int ret = soundcloud_parse_json(u, hand, mutex, cond);