diff --git a/src/screen.c b/src/screen.c
index 58cc492edd69c7b223047cb5947a207cdfa0c34b..9bbfda742ff2a32afd7c82d78ac26cd03e02af86 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 The Music Player Daemon Project
* Project homepage: http://musicpd.org
* This program is free software; you can redistribute it and/or modify
#include "colors.h"
#include "player_command.h"
#include "screen_help.h"
-#include "screen_play.h"
+#include "screen_queue.h"
#include "screen_file.h"
#include "screen_artist.h"
#include "screen_search.h"
/* screens */
struct screen screen;
-static const struct screen_functions *mode_fn = &screen_playlist;
-static const struct screen_functions *mode_fn_prev = &screen_playlist;
+static const struct screen_functions *mode_fn = &screen_queue;
+static const struct screen_functions *mode_fn_prev = &screen_queue;
gboolean
screen_is_visible(const struct screen_functions *sf)
{
unsigned elapsed, duration;
- if (c->song != NULL && seek_id == (int)mpd_song_get_id(c->song))
+ if (c->status == NULL)
+ elapsed = 0;
+ else if (seek_id >= 0 && seek_id == mpd_status_get_song_id(c->status))
elapsed = seek_target_time;
- else if (c->status != NULL)
- elapsed = mpd_status_get_elapsed_time(c->status);
else
- elapsed = 0;
+ elapsed = mpd_status_get_elapsed_time(c->status);
- duration = c->status != NULL &&
- (mpd_status_get_state(c->status) == MPD_STATE_PLAY ||
- mpd_status_get_state(c->status) == MPD_STATE_PAUSE)
+ duration = mpdclient_is_playing(c)
? mpd_status_get_total_time(c->status)
: 0;
screen_next_mode(c, 1);
break;
case CMD_SCREEN_PLAY:
- screen_switch(&screen_playlist, c);
+ screen_switch(&screen_queue, c);
break;
case CMD_SCREEN_FILE:
screen_switch(&screen_browse, c);