summaryrefslogtreecommitdiff
path: root/libwardrobe
diff options
context:
space:
mode:
authorLars-Dominik Braun <PromyLOPh@gmail.com>2008-07-07 21:46:32 +0200
committerLars-Dominik Braun <PromyLOPh@gmail.com>2008-07-07 21:46:32 +0200
commiteb46d942e5ecf50ff9f85ee62ea2fa454aa228fa (patch)
tree4e1d0fab3eff575274f6ec334680d51936675c7e /libwardrobe
parente0b48b5fcc97b4979b32c79fe82c2fab5af89b86 (diff)
downloadpianobar-eb46d942e5ecf50ff9f85ee62ea2fa454aa228fa.tar.gz
pianobar-eb46d942e5ecf50ff9f85ee62ea2fa454aa228fa.tar.bz2
pianobar-eb46d942e5ecf50ff9f85ee62ea2fa454aa228fa.zip
Use album title too (for scrobbling, e.g.)
Diffstat (limited to 'libwardrobe')
-rw-r--r--libwardrobe/src/main.c9
-rw-r--r--libwardrobe/src/wardrobe.h1
2 files changed, 7 insertions, 3 deletions
diff --git a/libwardrobe/src/main.c b/libwardrobe/src/main.c
index cfe9395..0a8a14e 100644
--- a/libwardrobe/src/main.c
+++ b/libwardrobe/src/main.c
@@ -129,6 +129,7 @@ void WardrobeFree (void *ptr, size_t size) {
void WardrobeSongDestroy (WardrobeSong_t *ws) {
WardrobeFree (ws->artist, 0);
WardrobeFree (ws->title, 0);
+ WardrobeFree (ws->album, 0);
memset (ws, 0, sizeof (*ws));
}
@@ -207,16 +208,17 @@ WardrobeReturn_t WardrobeHandshake (WardrobeHandle_t *wh) {
WardrobeReturn_t WardrobeSendSong (WardrobeHandle_t *wh,
WardrobeSong_t *ws) {
char postContent[10000];
- char *urlencArtist, *urlencTitle, *ret;
+ char *urlencArtist, *urlencTitle, *urlencAlbum, *ret;
WardrobeReturn_t fRet = WARDROBE_RET_ERR;
urlencArtist = curl_easy_escape (wh->ch, ws->artist, 0);
urlencTitle = curl_easy_escape (wh->ch, ws->title, 0);
+ urlencAlbum = curl_easy_escape (wh->ch, ws->album, 0);
snprintf (postContent, sizeof (postContent), "s=%s&a[0]=%s&t[0]=%s&"
- "i[0]=%li&o[0]=P&r[0]=&l[0]=%li&b[0]=&n[0]=&m[0]=",
+ "i[0]=%li&o[0]=P&r[0]=&l[0]=%li&b[0]=%s&n[0]=&m[0]=",
wh->authToken, urlencArtist, urlencTitle, ws->started,
- ws->length);
+ ws->length, urlencAlbum);
WardrobeHttpPost (wh->ch, wh->postUrl, postContent, &ret);
if (memcmp (ret, "OK", 2) == 0) {
@@ -227,6 +229,7 @@ WardrobeReturn_t WardrobeSendSong (WardrobeHandle_t *wh,
curl_free (urlencArtist);
curl_free (urlencTitle);
+ curl_free (urlencAlbum);
WardrobeFree (ret, 0);
return fRet;
diff --git a/libwardrobe/src/wardrobe.h b/libwardrobe/src/wardrobe.h
index aeeda87..5662139 100644
--- a/libwardrobe/src/wardrobe.h
+++ b/libwardrobe/src/wardrobe.h
@@ -35,6 +35,7 @@ typedef struct {
typedef struct {
char *artist;
char *title;
+ char *album;
time_t started;
time_t length;
} WardrobeSong_t;