diff options
author | Lars-Dominik Braun <lars@6xq.net> | 2012-06-26 18:17:54 +0200 |
---|---|---|
committer | Lars-Dominik Braun <lars@6xq.net> | 2012-06-26 18:20:18 +0200 |
commit | 845cf4c1bdae57e8ed59bc3bb6fcaa7464c8904e (patch) | |
tree | c2e5d52bbd8899ed001585abae2c336fd06d14da /src/libpiano | |
parent | f2d6dc360a7385dd490832bf9fb391addcb250a0 (diff) | |
download | pianobar-845cf4c1bdae57e8ed59bc3bb6fcaa7464c8904e.tar.gz pianobar-845cf4c1bdae57e8ed59bc3bb6fcaa7464c8904e.tar.bz2 pianobar-845cf4c1bdae57e8ed59bc3bb6fcaa7464c8904e.zip |
piano: Remove move song
Doesn’t work with JSON API. See #280.
Diffstat (limited to 'src/libpiano')
-rw-r--r-- | src/libpiano/piano.h | 8 | ||||
-rw-r--r-- | src/libpiano/request.c | 36 | ||||
-rw-r--r-- | src/libpiano/response.c | 15 |
3 files changed, 0 insertions, 59 deletions
diff --git a/src/libpiano/piano.h b/src/libpiano/piano.h index 167f0f9..e881621 100644 --- a/src/libpiano/piano.h +++ b/src/libpiano/piano.h @@ -147,7 +147,6 @@ typedef enum { PIANO_REQUEST_GET_PLAYLIST = 3, PIANO_REQUEST_RATE_SONG = 4, PIANO_REQUEST_ADD_FEEDBACK = 5, - PIANO_REQUEST_MOVE_SONG = 6, PIANO_REQUEST_RENAME_STATION = 7, PIANO_REQUEST_DELETE_STATION = 8, PIANO_REQUEST_SEARCH = 9, @@ -199,13 +198,6 @@ typedef struct { } PianoRequestDataAddFeedback_t; typedef struct { - PianoSong_t *song; - PianoStation_t *from; - PianoStation_t *to; - unsigned short step; -} PianoRequestDataMoveSong_t; - -typedef struct { PianoStation_t *station; char *newName; } PianoRequestDataRenameStation_t; diff --git a/src/libpiano/request.c b/src/libpiano/request.c index 5619e1b..cb1b30a 100644 --- a/src/libpiano/request.c +++ b/src/libpiano/request.c @@ -403,42 +403,6 @@ PianoReturn_t PianoRequest (PianoHandle_t *ph, PianoRequest_t *req, goto cleanup; break; } - - case PIANO_REQUEST_MOVE_SONG: { - /* move song to a different station, needs two requests */ - PianoRequestDataMoveSong_t *reqData = req->data; - PianoRequestDataAddFeedback_t transformedReqData; - - assert (reqData != NULL); - assert (reqData->song != NULL); - assert (reqData->from != NULL); - assert (reqData->to != NULL); - assert (reqData->step < 2); - - transformedReqData.trackToken = reqData->song->trackToken; - req->data = &transformedReqData; - - switch (reqData->step) { - case 0: - transformedReqData.stationId = reqData->from->id; - transformedReqData.rating = PIANO_RATE_BAN; - break; - - case 1: - transformedReqData.stationId = reqData->to->id; - transformedReqData.rating = PIANO_RATE_LOVE; - break; - } - - /* create request data (url, post data) */ - ret = PianoRequest (ph, req, PIANO_REQUEST_ADD_FEEDBACK); - /* and reset request type/data */ - req->type = PIANO_REQUEST_MOVE_SONG; - req->data = reqData; - - goto cleanup; - break; - } } /* standard parameter */ diff --git a/src/libpiano/response.c b/src/libpiano/response.c index 659ed2d..1b63bee 100644 --- a/src/libpiano/response.c +++ b/src/libpiano/response.c @@ -334,21 +334,6 @@ PianoReturn_t PianoResponse (PianoHandle_t *ph, PianoRequest_t *req) { break; } - case PIANO_REQUEST_MOVE_SONG: { - /* move song to different station */ - PianoRequestDataMoveSong_t *reqData = req->data; - - assert (req->responseData != NULL); - assert (reqData != NULL); - assert (reqData->step < 2); - - if (reqData->step == 0) { - ret = PIANO_RET_CONTINUE_REQUEST; - ++reqData->step; - } - break; - } - case PIANO_REQUEST_DELETE_STATION: { /* delete station from server and station list */ PianoStation_t *station = req->data; |