![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_play.c b/src/screen_play.c
index 3aaff229dbdaadfbe7f407ef5539679f336bb3da..58bf65a545c988d1df68412fa644df30b2c51d8a 100644 (file)
--- a/src/screen_play.c
+++ b/src/screen_play.c
*/
#include "config.h"
-#include "ncmpc.h"
+#include "i18n.h"
#include "options.h"
#include "support.h"
#include "mpdclient.h"
#include <string.h>
#include <time.h>
#include <glib.h>
-#include <ncurses.h>
#define MAX_SONG_LENGTH 512
+#ifndef NCMPC_MINI
typedef struct
{
GList **list;
GList **dir_list;
- screen_t *screen;
mpdclient_t *c;
} completion_callback_data_t;
+#endif
-static GTime input_timestamp;
+static struct mpdclient_playlist *playlist;
+static int current_song_id = -1;
static list_window_t *lw = NULL;
-static long long playlist_id;
+static guint timer_hide_cursor_id;
+
+static void
+play_paint(void);
+
+static void
+playlist_repaint(void)
+{
+ play_paint();
+ wrefresh(lw->w);
+}
+
+static void
+playlist_repaint_if_active(void)
+{
+ if (screen_is_visible(&screen_playlist))
+ playlist_repaint();
+}
static void
playlist_changed_callback(mpdclient_t *c, int event, gpointer data)
{
- D("screen_play.c> playlist_callback() [%d]\n", event);
switch (event) {
case PLAYLIST_EVENT_DELETE:
break;
}
list_window_check_selected(lw, c->playlist.list->len);
+ playlist_repaint_if_active();
}
static const char *
-list_callback(unsigned idx, int *highlight, void *data)
+list_callback(unsigned idx, int *highlight, mpd_unused void *data)
{
static char songname[MAX_SONG_LENGTH];
- mpdclient_t *c = (mpdclient_t *) data;
mpd_Song *song;
- if (idx >= playlist_length(&c->playlist))
+ if (playlist == NULL || idx >= playlist_length(playlist))
return NULL;
- song = playlist_get(&c->playlist, idx);
-
- if (c->song != NULL && song->id == c->song->id &&
- c->status != NULL && !IS_STOPPED(c->status->state))
+ song = playlist_get(playlist, idx);
+ if (song->id == current_song_id)
*highlight = 1;
- strfsong(songname, MAX_SONG_LENGTH, LIST_FORMAT, song);
+ strfsong(songname, MAX_SONG_LENGTH, options.list_format, song);
return songname;
}
/* try to center the song that are playing */
idx = playlist_get_index(c, c->song);
- D("Autocenter song id:%d pos:%d index:%d\n", c->song->id,c->song->pos,idx);
if (idx < 0)
return;
/* make sure the cursor is in the window */
lw->selected = lw->start+offset;
list_window_check_selected(lw, length);
-
- return;
}
+#ifndef NCMPC_MINI
static void
save_pre_completion_cb(GCompletion *gcmp, mpd_unused gchar *line, void *data)
{
static void
save_post_completion_cb(mpd_unused GCompletion *gcmp, mpd_unused gchar *line,
- GList *items, void *data)
+ GList *items, mpd_unused void *data)
{
- completion_callback_data_t *tmp = (completion_callback_data_t *)data;
- screen_t *screen = tmp->screen;
-
if (g_list_length(items) >= 1)
- screen_display_completion_list(screen, items);
+ screen_display_completion_list(items);
}
+#endif
int
-playlist_save(screen_t *screen, mpdclient_t *c, char *name, char *defaultname)
+playlist_save(mpdclient_t *c, char *name, char *defaultname)
{
gchar *filename;
gint error;
+#ifndef NCMPC_MINI
GCompletion *gcmp;
GList *list = NULL;
completion_callback_data_t data;
+#endif
+#ifdef NCMPC_MINI
+ (void)defaultname;
+#endif
+
+#ifndef NCMPC_MINI
if (name == NULL) {
/* initialize completion support */
gcmp = g_completion_new(NULL);
g_completion_set_compare(gcmp, strncmp);
data.list = &list;
data.dir_list = NULL;
- data.screen = screen;
data.c = c;
wrln_completion_callback_data = &data;
wrln_pre_completion_callback = save_pre_completion_cb;
/* query the user for a filename */
- filename = screen_readln(screen->status_window.w,
+ filename = screen_readln(screen.status_window.w,
_("Save playlist as: "),
defaultname,
NULL,
@@ -180,13 +197,13 @@ playlist_save(screen_t *screen, mpdclient_t *c, char *name, char *defaultname)
if( filename )
filename=g_strstrip(filename);
} else
+#endif
filename=g_strdup(name);
if (filename == NULL || filename[0] == '\0')
return -1;
/* send save command to mpd */
- D("Saving playlist as \'%s \'...\n", filename);
if ((error = mpdclient_cmd_save_playlist(c, filename))) {
gint code = GET_ACK_ERROR_CODE(error);
buf = g_strdup_printf(_("Replace %s [%s/%s] ? "),
filename, YES, NO);
- key = tolower(screen_getch(screen->status_window.w,
+ key = tolower(screen_getch(screen.status_window.w,
buf));
g_free(buf);
return -1;
}
- error = playlist_save(screen, c, filename, NULL);
+ error = playlist_save(c, filename, NULL);
g_free(filename);
return error;
}
return 0;
}
+#ifndef NCMPC_MINI
static void add_dir(GCompletion *gcmp, gchar *dir, GList **dir_list,
GList **list, mpdclient_t *c)
{
GList **list = tmp->list;
mpdclient_t *c = tmp->c;
- D("pre_completion()...\n");
if (*list == NULL) {
/* create initial list */
*list = gcmp_list_from_path(c, "", NULL, GCMP_TYPE_RFILE);
GList **dir_list = tmp->dir_list;
GList **list = tmp->list;
mpdclient_t *c = tmp->c;
- screen_t *screen = tmp->screen;
- D("post_completion()...\n");
if (g_list_length(items) >= 1)
- screen_display_completion_list(screen, items);
+ screen_display_completion_list(items);
if (line && line[0] && line[strlen(line) - 1] == '/' &&
string_list_find(*dir_list, line) == NULL) {
add_dir(gcmp, line, dir_list, list, c);
}
}
+#endif
static int
-handle_add_to_playlist(screen_t *screen, mpdclient_t *c)
+handle_add_to_playlist(mpdclient_t *c)
{
gchar *path;
+#ifndef NCMPC_MINI
GCompletion *gcmp;
GList *list = NULL;
GList *dir_list = NULL;
g_completion_set_compare(gcmp, strncmp);
data.list = &list;
data.dir_list = &dir_list;
- data.screen = screen;
data.c = c;
wrln_completion_callback_data = &data;
wrln_pre_completion_callback = add_pre_completion_cb;
wrln_post_completion_callback = add_post_completion_cb;
+#endif
/* get path */
- path = screen_readln(screen->status_window.w,
+ path = screen_readln(screen.status_window.w,
_("Add: "),
NULL,
NULL,
- gcmp);
+#ifdef NCMPC_MINI
+ NULL
+#else
+ gcmp
+#endif
+ );
/* destroy completion data */
+#ifndef NCMPC_MINI
wrln_completion_callback_data = NULL;
wrln_pre_completion_callback = NULL;
wrln_post_completion_callback = NULL;
g_completion_free(gcmp);
string_list_free(list);
string_list_free(dir_list);
+#endif
/* add the path to the playlist */
if (path && path[0])
lw = list_window_init(w, cols, rows);
}
+static gboolean
+timer_hide_cursor(gpointer data)
+{
+ struct mpdclient *c = data;
+
+ assert(options.hide_cursor > 0);
+ assert(timer_hide_cursor_id != 0);
+
+ timer_hide_cursor_id = 0;
+
+ /* hide the cursor when mpd is playing and the user is inactive */
+
+ if (c->status != NULL && c->status->state == MPD_STATUS_STATE_PLAY) {
+ lw->flags |= LW_HIDE_CURSOR;
+ playlist_repaint();
+ } else
+ timer_hide_cursor_id = g_timeout_add(options.hide_cursor * 1000,
+ timer_hide_cursor, c);
+
+ return FALSE;
+}
+
static void
-play_open(mpd_unused screen_t *screen, mpdclient_t *c)
+play_open(mpdclient_t *c)
{
static gboolean install_cb = TRUE;
- input_timestamp = time(NULL);
+ playlist = &c->playlist;
+
+ assert(timer_hide_cursor_id == 0);
+ if (options.hide_cursor > 0) {
+ lw->flags &= ~LW_HIDE_CURSOR;
+ timer_hide_cursor_id = g_timeout_add(options.hide_cursor * 1000,
+ timer_hide_cursor, c);
+ }
if (install_cb) {
mpdclient_install_playlist_callback(c, playlist_changed_callback);
}
}
+static void
+play_close(void)
+{
+ if (timer_hide_cursor_id != 0) {
+ g_source_remove(timer_hide_cursor_id);
+ timer_hide_cursor_id = 0;
+ }
+}
+
static void
play_resize(int cols, int rows)
{
}
static void
-play_paint(mpdclient_t *c)
+play_paint(void)
{
- list_window_paint(lw, list_callback, (void *) c);
+ list_window_paint(lw, list_callback, NULL);
}
static void
-play_update(mpd_unused screen_t *screen, mpdclient_t *c)
+play_update(mpdclient_t *c)
{
- /* hide the cursor when mpd are playing and the user are inactive */
- if (options.hide_cursor > 0 &&
- (c->status != NULL && c->status->state == MPD_STATUS_STATE_PLAY) &&
- time(NULL) - input_timestamp >= options.hide_cursor ) {
- lw->flags |= LW_HIDE_CURSOR;
- } else {
- lw->flags &= ~LW_HIDE_CURSOR;
- }
+ static int prev_song_id = -1;
- /* center the cursor */
- if (options.auto_center) {
- static int prev_song_id = 0;
+ current_song_id = c->song != NULL && c->status != NULL &&
+ !IS_STOPPED(c->status->state) ? c->song->id : -1;
- if (c->song && prev_song_id != c->song->id) {
+ if (current_song_id != prev_song_id) {
+ prev_song_id = current_song_id;
+
+ /* center the cursor */
+ if (options.auto_center && current_song_id != -1)
center_playing_item(c);
- prev_song_id = c->song->id;
- }
- }
- if (c->playlist.id != playlist_id) {
- list_window_check_selected(lw, playlist_length(&c->playlist));
- play_paint(c);
- playlist_id = c->playlist.id;
- } else {
- list_window_paint(lw, list_callback, (void *) c);
+ playlist_repaint();
}
}
#ifdef HAVE_GETMOUSE
static int
-handle_mouse_event(mpd_unused screen_t *screen, mpdclient_t *c)
+handle_mouse_event(struct mpdclient *c)
{
int row;
unsigned selected;
unsigned long bstate;
if (screen_get_mouse_event(c, &bstate, &row) ||
- list_window_mouse(lw, c->playlist.list->len, bstate, row))
+ list_window_mouse(lw, playlist_length(playlist), bstate, row)) {
+ playlist_repaint();
return 1;
+ }
if (bstate & BUTTON1_DOUBLE_CLICKED) {
/* stop */
if (bstate & BUTTON1_CLICKED) {
/* play */
- if (lw->start + row < c->playlist.list->len)
+ if (lw->start + row < playlist_length(playlist))
mpdclient_cmd_play(c, lw->start + row);
} else if (bstate & BUTTON3_CLICKED) {
/* delete */
}
lw->selected = selected;
- list_window_check_selected(lw, c->playlist.list->len);
+ list_window_check_selected(lw, playlist_length(playlist));
+ playlist_repaint();
return 1;
}
-#else
-#define handle_mouse_event(s,c) (0)
#endif
static int
-play_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
+play_cmd(mpdclient_t *c, command_t cmd)
{
- input_timestamp = time(NULL);
+ lw->flags &= ~LW_HIDE_CURSOR;
+
+ if (options.hide_cursor > 0) {
+ if (timer_hide_cursor_id != 0)
+ g_source_remove(timer_hide_cursor_id);
+ timer_hide_cursor_id = g_timeout_add(options.hide_cursor * 1000,
+ timer_hide_cursor, c);
+ }
+
+ if (list_window_cmd(lw, playlist_length(&c->playlist), cmd)) {
+ playlist_repaint();
+ return 1;
+ }
switch(cmd) {
case CMD_PLAY:
mpdclient_cmd_delete(c, lw->selected);
return 1;
case CMD_SAVE_PLAYLIST:
- playlist_save(screen, c, NULL, NULL);
+ playlist_save(c, NULL, NULL);
return 1;
case CMD_ADD:
- handle_add_to_playlist(screen, c);
+ handle_add_to_playlist(c);
return 1;
case CMD_SCREEN_UPDATE:
center_playing_item(c);
+ playlist_repaint();
return 0;
case CMD_LIST_MOVE_UP:
case CMD_LIST_RFIND:
case CMD_LIST_FIND_NEXT:
case CMD_LIST_RFIND_NEXT:
- return screen_find(screen,
- lw, c->playlist.list->len,
- cmd, list_callback, (void *) c);
+ screen_find(lw, playlist_length(&c->playlist),
+ cmd, list_callback, NULL);
+ playlist_repaint();
+ return 1;
+
+#ifdef HAVE_GETMOUSE
case CMD_MOUSE_EVENT:
- return handle_mouse_event(screen,c);
+ return handle_mouse_event(c);
+#endif
+
+#ifdef ENABLE_LYRICS_SCREEN
+ case CMD_SCREEN_LYRICS:
+ if (lw->selected < playlist_length(&c->playlist)) {
+ screen_lyrics_switch(c, playlist_get(&c->playlist, lw->selected));
+ return 1;
+ }
+
+ break;
+#endif
+
default:
break;
}
- return list_window_cmd(lw, c->playlist.list->len, cmd);
+
+ return 0;
}
const struct screen_functions screen_playlist = {
.init = play_init,
.exit = play_exit,
.open = play_open,
- .close = NULL,
+ .close = play_close,
.resize = play_resize,
.paint = play_paint,
.update = play_update,