![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen.c b/src/screen.c
index 14ffffe6b5828dff9bf4177ad58945bc5cd27925..2a5d6416f4d04adca020188dffb2488afc377545 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
#define SCREEN_ARTIST_ID 2
#define SCREEN_HELP_ID 100
#define SCREEN_KEYDEF_ID 101
-#define SCREEN_CLOCK_ID 102
#define SCREEN_SEARCH_ID 103
#define SCREEN_LYRICS_ID 104
#ifdef ENABLE_KEYDEF_SCREEN
extern const struct screen_functions screen_keydef;
#endif
-#ifdef ENABLE_CLOCK_SCREEN
-extern const struct screen_functions screen_clock;
-#endif
extern const struct screen_functions screen_lyrics;
typedef struct screen_functions * (*screen_get_mode_functions_fn_t) (void);
#ifdef ENABLE_KEYDEF_SCREEN
{ SCREEN_KEYDEF_ID, "keydef", &screen_keydef },
#endif
-#ifdef ENABLE_CLOCK_SCREEN
- { SCREEN_CLOCK_ID, "clock", &screen_clock },
-#endif
#ifdef ENABLE_LYRICS_SCREEN
{ SCREEN_LYRICS_ID, "lyrics", &screen_lyrics },
#endif
waddstr(w, _(":Lyrics "));
#endif
}
- if (c->status->volume==MPD_STATUS_NO_VOLUME) {
+ if (c->status == NULL || c->status->volume == MPD_STATUS_NO_VOLUME) {
g_snprintf(buf, 32, _("Volume n/a "));
} else {
g_snprintf(buf, 32, _(" Volume %d%%"), c->status->volume);
mvwaddstr(w, 0, screen.top_window.cols-my_strlen(buf), buf);
flags[0] = 0;
- if( c->status->repeat )
- g_strlcat(flags, "r", sizeof(flags));
- if( c->status->random )
- g_strlcat(flags, "z", sizeof(flags));;
- if( c->status->crossfade )
- g_strlcat(flags, "x", sizeof(flags));
- if( c->status->updatingDb )
- g_strlcat(flags, "U", sizeof(flags));
+ if (c->status != NULL) {
+ if (c->status->repeat)
+ g_strlcat(flags, "r", sizeof(flags));
+ if (c->status->random)
+ g_strlcat(flags, "z", sizeof(flags));;
+ if (c->status->crossfade)
+ g_strlcat(flags, "x", sizeof(flags));
+ if (c->status->updatingDb)
+ g_strlcat(flags, "U", sizeof(flags));
+ }
+
colors_use(w, COLOR_LINE);
mvwhline(w, 1, 0, ACS_HLINE, screen.top_window.cols);
if (flags[0]) {
wclrtoeol(w);
}
- if (prev_volume!=c->status->volume || full_repaint)
+ if ((c->status != NULL && prev_volume != c->status->volume) ||
+ full_repaint)
paint_top_window2(header, c);
}
{
double p;
int width;
- int elapsedTime = c->status->elapsedTime;
+ int elapsedTime;
if (c->status==NULL || IS_STOPPED(c->status->state)) {
mvwhline(screen.progress_window.w, 0, 0, ACS_HLINE,
if (c->song && seek_id == c->song->id)
elapsedTime = seek_target_time;
+ else
+ elapsedTime = c->status->elapsedTime;
p = ((double) elapsedTime) / ((double) c->status->totalTime);
wclrtoeol(w);
colors_use(w, COLOR_STATUS_BOLD);
- switch(status->state) {
+ switch (status == NULL ? MPD_STATUS_STATE_STOP : status->state) {
case MPD_STATUS_STATE_PLAY:
str = _("Playing:");
break;
/* create time string */
memset(screen.buf, 0, screen.buf_size);
- if (IS_PLAYING(status->state) || IS_PAUSED(status->state)) {
+ if (status != NULL && (IS_PLAYING(status->state) ||
+ IS_PAUSED(status->state))) {
if (status->totalTime > 0) {
/*checks the conf to see whether to display elapsed or remaining time */
if(!strcmp(options.timedisplay_type,"elapsed"))
}
/* display song */
- if (IS_PLAYING(status->state) || IS_PAUSED(status->state)) {
+ if (status != NULL && (IS_PLAYING(status->state) ||
+ IS_PAUSED(status->state))) {
char songname[MAX_SONGNAME_LENGTH];
int width = COLS-x-my_strlen(screen.buf);
curs_set(0);
/* enable extra keys */
keypad(stdscr, TRUE);
- /* return from getch() without blocking */
- timeout(SCREEN_TIMEOUT);
/* initialize mouse support */
#ifdef HAVE_GETMOUSE
if (options.enable_mouse)
return screen_paint(c);
/* print a message if mpd status has changed */
- if (repeat < 0) {
- repeat = c->status->repeat;
- random_enabled = c->status->random;
- crossfade = c->status->crossfade;
- dbupdate = c->status->updatingDb;
- }
+ if (c->status != NULL) {
+ if (repeat < 0) {
+ repeat = c->status->repeat;
+ random_enabled = c->status->random;
+ crossfade = c->status->crossfade;
+ dbupdate = c->status->updatingDb;
+ }
- if (repeat != c->status->repeat)
- screen_status_printf(c->status->repeat ?
- _("Repeat is on") :
- _("Repeat is off"));
+ if (repeat != c->status->repeat)
+ screen_status_printf(c->status->repeat ?
+ _("Repeat is on") :
+ _("Repeat is off"));
- if (random_enabled != c->status->random)
- screen_status_printf(c->status->random ?
- _("Random is on") :
- _("Random is off"));
+ if (random_enabled != c->status->random)
+ screen_status_printf(c->status->random ?
+ _("Random is on") :
+ _("Random is off"));
- if (crossfade != c->status->crossfade)
- screen_status_printf(_("Crossfade %d seconds"), c->status->crossfade);
+ if (crossfade != c->status->crossfade)
+ screen_status_printf(_("Crossfade %d seconds"), c->status->crossfade);
- if (dbupdate && dbupdate != c->status->updatingDb) {
- screen_status_printf(_("Database updated!"));
- mpdclient_browse_callback(c, BROWSE_DB_UPDATED, NULL);
- }
+ if (dbupdate && dbupdate != c->status->updatingDb) {
+ screen_status_printf(_("Database updated!"));
+ mpdclient_browse_callback(c, BROWSE_DB_UPDATED, NULL);
+ }
- repeat = c->status->repeat;
- random_enabled = c->status->random;
- crossfade = c->status->crossfade;
- dbupdate = c->status->updatingDb;
+ repeat = c->status->repeat;
+ random_enabled = c->status->random;
+ crossfade = c->status->crossfade;
+ dbupdate = c->status->updatingDb;
+ }
/* update title/header window */
if (welcome && screen.last_cmd==CMD_NONE &&
static int
screen_client_cmd(mpdclient_t *c, command_t cmd)
{
+ if (c->connection == NULL || c->status == NULL)
+ return 0;
+
switch(cmd) {
+ /*
case CMD_PLAY:
mpdclient_cmd_play(c, MPD_PLAY_AT_BEGINNING);
break;
+ */
case CMD_PAUSE:
mpdclient_cmd_pause(c, !IS_PAUSED(c->status->state));
break;
case CMD_STOP:
mpdclient_cmd_stop(c);
break;
+ case CMD_CROP:
+ mpdclient_cmd_crop(c);
+ break;
case CMD_SEEK_FORWARD:
if (!IS_STOPPED(c->status->state)) {
if (c->song && seek_id != c->song->id) {
case CMD_SCREEN_KEYDEF:
switch_screen_mode(SCREEN_KEYDEF_ID, c);
break;
- case CMD_SCREEN_CLOCK:
- switch_screen_mode(SCREEN_CLOCK_ID, c);
- break;
case CMD_SCREEN_LYRICS:
switch_screen_mode(SCREEN_LYRICS_ID, c);
break;
- case CMD_QUIT:
- exit(EXIT_SUCCESS);
default:
break;
}