playlist: use playlist_get() instead of playlist_get_song()

diff --git a/src/mpdclient.c b/src/mpdclient.c
index 2318dcffc4465b2a38578f9235ed7962f3d84581..ae4a7618faf8567d8589ee541936d635d11ebdf5 100644 (file)
--- a/src/mpdclient.c
+++ b/src/mpdclient.c
@@ -439,11 +439,13 @@ gint
 mpdclient_cmd_delete(mpdclient_t *c, gint idx)
 {
        gint retval = 0;
-       struct mpd_song *song = playlist_get_song(c, idx);
+       struct mpd_song *song;
 
-       if( !song )
+       if (idx < 0 || (guint)idx >= playlist_length(&c->playlist))
                return -1;
 
+       song = playlist_get(&c->playlist, idx);
+
        /* send the delete command to mpd */
 #ifdef ENABLE_SONG_ID
        D("Delete id:%d\n", song->id);
@@ -487,8 +489,8 @@ mpdclient_cmd_move(mpdclient_t *c, gint old_index, gint new_index)
            (guint)new_index >= c->playlist.list->len)
                return -1;
 
-       song1 = playlist_get_song(c, old_index);
-       song2 = playlist_get_song(c, new_index);
+       song1 = playlist_get(&c->playlist, old_index);
+       song2 = playlist_get(&c->playlist, new_index);
 
        /* send the move command to mpd */
 #ifdef ENABLE_SONG_ID

diff --git a/src/screen_play.c b/src/screen_play.c
index c59c766cd49b5bd3e25985870233c09558249ea7..d257ec1dbabdb11bf9a42095879840e821d1d905 100644 (file)
--- a/src/screen_play.c
+++ b/src/screen_play.c
@@ -80,9 +80,10 @@ list_callback(unsigned idx, int *highlight, void *data)
        mpdclient_t *c = (mpdclient_t *) data;
        mpd_Song *song;
 
-       if( (song=playlist_get_song(c, idx)) == NULL ) {
+       if (idx >= playlist_length(&c->playlist))
                return NULL;
-       }
+
+       song = playlist_get(&c->playlist, idx);
 
        if( c->song && song->id==c->song->id && !IS_STOPPED(c->status->state) ) {
                *highlight = 1;