From: Max Kellermann <max@duempel.org>
Date: Tue, 29 Sep 2009 16:37:19 +0000 (+0200)
Subject: mpdclient: removed the deprecated !ENABLE_SONG_ID code
X-Git-Tag: release-0.16~313
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=570921379836bea6d0be298e1f46eb3a0cc93074;p=ncmpc.git

mpdclient: removed the deprecated !ENABLE_SONG_ID code

The ENABLE_SONG_ID option has been enabled for ages.
---

diff --git a/src/mpdclient.c b/src/mpdclient.c
index a688162..22a1d82 100644
--- a/src/mpdclient.c
+++ b/src/mpdclient.c
@@ -35,7 +35,6 @@
 #undef  ENABLE_FANCY_PLAYLIST_MANAGMENT_CMD_ADD /* broken with song id's */
 #define ENABLE_FANCY_PLAYLIST_MANAGMENT_CMD_DELETE
 #define ENABLE_FANCY_PLAYLIST_MANAGMENT_CMD_MOVE
-#define ENABLE_SONG_ID
 #define ENABLE_PLCHANGES
 
 #define BUFSIZE 1024
@@ -273,7 +272,6 @@ mpdclient_update(struct mpdclient *c)
 gint
 mpdclient_cmd_play(struct mpdclient *c, gint idx)
 {
-#ifdef ENABLE_SONG_ID
 	struct mpd_song *song = playlist_get_song(c, idx);
 
 	if (MPD_ERROR(c))
@@ -283,12 +281,7 @@ mpdclient_cmd_play(struct mpdclient *c, gint idx)
 		mpd_send_play_id(c->connection, mpd_song_get_id(song));
 	else
 		mpd_send_play(c->connection);
-#else
-	if (MPD_ERROR(c))
-		return -1;
 
-	mpd_sendPlayCommand(c->connection, idx);
-#endif
 	c->need_update = TRUE;
 	return mpdclient_finish_command(c);
 }
@@ -588,11 +581,7 @@ mpdclient_cmd_delete(struct mpdclient *c, gint idx)
 	song = playlist_get(&c->playlist, idx);
 
 	/* send the delete command to mpd */
-#ifdef ENABLE_SONG_ID
 	mpd_send_delete_id(c->connection, mpd_song_get_id(song));
-#else
-	mpd_send_delete(c->connection, idx);
-#endif
 	if( (retval=mpdclient_finish_command(c)) )
 		return retval;
 
@@ -638,12 +627,8 @@ mpdclient_cmd_move(struct mpdclient *c, gint old_index, gint new_index)
 	song2 = playlist_get(&c->playlist, new_index);
 
 	/* send the move command to mpd */
-#ifdef ENABLE_SONG_ID
 	mpd_send_swap_id(c->connection,
 			 mpd_song_get_id(song1), mpd_song_get_id(song2));
-#else
-	mpd_send_move(c->connection, old_index, new_index);
-#endif
 	if( (n=mpdclient_finish_command(c)) )
 		return n;