-# -----------------------------------------------------------------------------
-# BEGIN MPD_SONG
-/^in:MPD_SONG +OK +/\
-{
- delete db["mpd_song_curr_file"]
- delete db["mpd_song_curr_title"]
- delete db["mpd_song_curr_name"]
-}
-
-/^in:MPD_SONG +file:/\
-{
- fields_shift()
- fields_shift()
- db["mpd_song_curr_file"] = $0
-}
-
-/^in:MPD_SONG +Title:/\
-{
- fields_shift()
- fields_shift()
- db["mpd_song_curr_title"] = $0
-}
-
-/^in:MPD_SONG +Name:/\
-{
- fields_shift()
- fields_shift()
- db["mpd_song_curr_name"] = $0
-}
-
-/^in:MPD_SONG +OK$/\
-{
- set_mpd_playing()
-}
-# END MPD_SONG
-# -----------------------------------------------------------------------------
+/^in:MPD_SONG OK +MPD/ { delete db_mpd_song; next }
+/^in:MPD_SONG OK$/ { set_mpd_playing() ; next }
+/^in:MPD_SONG / { set_mpd_song() ; next }