![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_play.c b/src/screen_play.c
index 8683ee013d7c1ef6e53de4d888778c90ff40f091..256ea36d2b9e5f03b5d593586cf4637c88e511a9 100644 (file)
--- a/src/screen_play.c
+++ b/src/screen_play.c
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include "screen_play.h"
+#include "screen_interface.h"
+#include "screen_file.h"
+#include "screen_message.h"
+#include "screen_find.h"
#include "config.h"
#include "i18n.h"
#include "charset.h"
#include "utils.h"
#include "strfsong.h"
#include "wreadln.h"
-#include "command.h"
#include "colors.h"
#include "screen.h"
#include "screen_utils.h"
-#include "screen_play.h"
+#include "screen_song.h"
+#include "screen_lyrics.h"
#ifndef NCMPC_MINI
#include "hscroll.h"
#endif
+#include <mpd/client.h>
+
#include <ctype.h>
-#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include <glib.h>
#define MAX_SONG_LENGTH 512
{
GList **list;
GList **dir_list;
- mpdclient_t *c;
+ struct mpdclient *c;
} completion_callback_data_t;
+
+static struct hscroll hscroll;
+static guint scroll_source_id;
#endif
static struct mpdclient_playlist *playlist;
static int current_song_id = -1;
-static list_window_t *lw = NULL;
+static int selected_song_id = -1;
+static struct list_window *lw;
static guint timer_hide_cursor_id;
static void
-play_paint(void);
+screen_playlist_paint(void);
static void
playlist_repaint(void)
{
- play_paint();
+ screen_playlist_paint();
wrefresh(lw->w);
}
+static const struct mpd_song *
+playlist_selected_song(void)
+{
+ return !lw->range_selection &&
+ lw->selected < playlist_length(playlist)
+ ? playlist_get(playlist, lw->selected)
+ : NULL;
+}
+
static void
-playlist_repaint_if_active(void)
+playlist_save_selection(void)
{
- if (screen_is_visible(&screen_playlist))
- playlist_repaint();
+ selected_song_id = playlist_selected_song() != NULL
+ ? (int)mpd_song_get_id(playlist_selected_song())
+ : -1;
}
static void
-playlist_changed_callback(mpdclient_t *c, int event, gpointer data)
+playlist_restore_selection(void)
{
- switch (event) {
- case PLAYLIST_EVENT_DELETE:
- break;
- case PLAYLIST_EVENT_MOVE:
- if(lw->range_selection < 0)
- {
- lw->selected = *((int *) data);
- if (lw->selected < lw->start)
- lw->start--;
- }
- break;
- default:
- break;
- }
+ const struct mpd_song *song;
+ int pos;
+
+ if (selected_song_id < 0)
+ /* there was no selection */
+ return;
+
+ song = playlist_selected_song();
+ if (song != NULL &&
+ mpd_song_get_id(song) == (unsigned)selected_song_id)
+ /* selection is still valid */
+ return;
+
+ pos = playlist_get_index_from_id(playlist, selected_song_id);
+ if (pos >= 0)
+ lw->selected = pos;
- list_window_check_selected(lw, c->playlist.list->len);
- playlist_repaint_if_active();
+ list_window_check_selected(lw, playlist_length(playlist));
+ playlist_save_selection();
}
-static char *
-format_duration(int duration)
+#ifndef NCMPC_MINI
+static gboolean
+scroll_timer_callback(G_GNUC_UNUSED gpointer data)
{
- if (duration == MPD_SONG_NO_TIME)
- return NULL;
+ scroll_source_id = 0;
- return g_strdup_printf("%d:%02d", duration / 60, duration % 60);
+ hscroll_step(&hscroll);
+ playlist_repaint();
+ return false;
}
+#endif
static const char *
list_callback(unsigned idx, bool *highlight, char **second_column, G_GNUC_UNUSED void *data)
{
static char songname[MAX_SONG_LENGTH];
-#ifndef NCMPC_MINI
- static scroll_state_t st;
-#endif
- mpd_Song *song;
+ struct mpd_song *song;
if (playlist == NULL || idx >= playlist_length(playlist))
return NULL;
song = playlist_get(playlist, idx);
- if (song->id == current_song_id)
+ if ((int)mpd_song_get_id(song) == current_song_id)
*highlight = true;
strfsong(songname, MAX_SONG_LENGTH, options.list_format, song);
#ifndef NCMPC_MINI
- if(second_column)
- *second_column = format_duration(song->time);
+ if (second_column != NULL && mpd_song_get_duration(song) > 0) {
+ char duration[32];
+ format_duration_short(duration, sizeof(duration),
+ mpd_song_get_duration(song));
+ *second_column = g_strdup(duration);
+ }
if (idx == lw->selected)
{
int second_column_len = 0;
- if (second_column)
+ if (second_column != NULL && *second_column != NULL)
second_column_len = strlen(*second_column);
if (options.scroll && utf8_width(songname) > (unsigned)(COLS - second_column_len - 1) )
{
@@ -138,17 +163,28 @@ list_callback(unsigned idx, bool *highlight, char **second_column, G_GNUC_UNUSED
char *tmp;
if (current_song != lw->selected) {
- st.offset = 0;
+ hscroll_reset(&hscroll);
current_song = lw->selected;
}
- tmp = strscroll(songname, options.scroll_sep,
- MAX_SONG_LENGTH, &st);
+ tmp = strscroll(&hscroll, songname, options.scroll_sep,
+ MAX_SONG_LENGTH);
g_strlcpy(songname, tmp, MAX_SONG_LENGTH);
g_free(tmp);
+
+ if (scroll_source_id == 0)
+ scroll_source_id =
+ g_timeout_add(1000,
+ scroll_timer_callback,
+ NULL);
+ } else {
+ hscroll_reset(&hscroll);
+
+ if (scroll_source_id != 0) {
+ g_source_remove(scroll_source_id);
+ scroll_source_id = 0;
+ }
}
- else
- st.offset = 0;
}
#else
(void)second_column;
@@ -158,17 +194,18 @@ list_callback(unsigned idx, bool *highlight, char **second_column, G_GNUC_UNUSED
}
static void
-center_playing_item(mpdclient_t *c, bool center_cursor)
+center_playing_item(struct mpdclient *c, bool center_cursor)
{
+ const struct mpd_song *song;
unsigned length = c->playlist.list->len;
int idx;
- if (!c->song || c->status == NULL ||
- IS_STOPPED(c->status->state))
+ song = mpdclient_get_current_song(c);
+ if (song == NULL)
return;
/* try to center the song that are playing */
- idx = playlist_get_index(c, c->song);
+ idx = playlist_get_index(&c->playlist, c->song);
if (idx < 0)
return;
{
completion_callback_data_t *tmp = (completion_callback_data_t *)data;
GList **list = tmp->list;
- mpdclient_t *c = tmp->c;
+ struct mpdclient *c = tmp->c;
if( *list == NULL ) {
/* create completion list */
#endif
int
-playlist_save(mpdclient_t *c, char *name, char *defaultname)
+playlist_save(struct mpdclient *c, char *name, char *defaultname)
{
+ struct mpd_connection *connection;
gchar *filename, *filename_utf8;
- gint error;
#ifndef NCMPC_MINI
GCompletion *gcmp;
GList *list = NULL;
/* query the user for a filename */
- filename = screen_readln(screen.status_window.w,
- _("Save playlist as"),
+ filename = screen_readln(_("Save playlist as"),
defaultname,
NULL,
gcmp);
/* send save command to mpd */
filename_utf8 = locale_to_utf8(filename);
- error = mpdclient_cmd_save_playlist(c, filename_utf8);
- g_free(filename_utf8);
- if (error) {
- gint code = GET_ACK_ERROR_CODE(error);
-
- if (code == MPD_ACK_ERROR_EXIST) {
+ connection = mpdclient_get_connection(c);
+ if (!mpd_run_save(connection, filename_utf8)) {
+ if (mpd_connection_get_error(connection) == MPD_ERROR_SERVER &&
+ mpd_connection_get_server_error(connection) == MPD_SERVER_ERROR_EXIST &&
+ mpd_connection_clear_error(connection)) {
char *buf;
int key;
buf = g_strdup_printf(_("Replace %s [%s/%s] ? "),
filename, YES, NO);
- key = tolower(screen_getch(screen.status_window.w,
- buf));
+ key = tolower(screen_getch(buf));
g_free(buf);
- if (key == YES[0]) {
- filename_utf8 = locale_to_utf8(filename);
- error = mpdclient_cmd_delete_playlist(c, filename_utf8);
+ if (key != YES[0]) {
g_free(filename_utf8);
-
- if (error) {
- g_free(filename);
- return -1;
- }
-
- error = playlist_save(c, filename, NULL);
g_free(filename);
- return error;
+ screen_status_printf(_("Aborted"));
+ return -1;
}
- screen_status_printf(_("Aborted"));
+ if (!mpd_run_rm(connection, filename_utf8) ||
+ !mpd_run_save(connection, filename_utf8)) {
+ mpdclient_handle_error(c);
+ g_free(filename_utf8);
+ g_free(filename);
+ return -1;
+ }
+ } else {
+ mpdclient_handle_error(c);
+ g_free(filename_utf8);
+ g_free(filename);
+ return -1;
}
-
- g_free(filename);
- return -1;
}
+ c->events |= MPD_IDLE_STORED_PLAYLIST;
+
+ g_free(filename_utf8);
+
/* success */
screen_status_printf(_("Saved %s"), filename);
g_free(filename);
#ifndef NCMPC_MINI
static void add_dir(GCompletion *gcmp, gchar *dir, GList **dir_list,
- GList **list, mpdclient_t *c)
+ GList **list, struct mpdclient *c)
{
g_completion_remove_items(gcmp, *list);
*list = string_list_remove(*list, dir);
completion_callback_data_t *tmp = (completion_callback_data_t *)data;
GList **dir_list = tmp->dir_list;
GList **list = tmp->list;
- mpdclient_t *c = tmp->c;
+ struct mpdclient *c = tmp->c;
if (*list == NULL) {
/* create initial list */
completion_callback_data_t *tmp = (completion_callback_data_t *)data;
GList **dir_list = tmp->dir_list;
GList **list = tmp->list;
- mpdclient_t *c = tmp->c;
+ struct mpdclient *c = tmp->c;
if (g_list_length(items) >= 1)
screen_display_completion_list(items);
#endif
static int
-handle_add_to_playlist(mpdclient_t *c)
+handle_add_to_playlist(struct mpdclient *c)
{
gchar *path;
#ifndef NCMPC_MINI
#endif
/* get path */
- path = screen_readln(screen.status_window.w,
- _("Add"),
+ path = screen_readln(_("Add"),
NULL,
NULL,
#ifdef NCMPC_MINI
}
static void
-play_init(WINDOW *w, int cols, int rows)
+screen_playlist_init(WINDOW *w, int cols, int rows)
{
lw = list_window_init(w, cols, rows);
}
/* hide the cursor when mpd is playing and the user is inactive */
- if (c->status != NULL && c->status->state == MPD_STATUS_STATE_PLAY) {
+ if (c->status != NULL &&
+ mpd_status_get_state(c->status) == MPD_STATE_PLAY) {
lw->hide_cursor = true;
playlist_repaint();
} else
}
static void
-play_open(mpdclient_t *c)
+screen_playlist_open(struct mpdclient *c)
{
- static gboolean install_cb = TRUE;
-
playlist = &c->playlist;
assert(timer_hide_cursor_id == 0);
timer_hide_cursor, c);
}
- if (install_cb) {
- mpdclient_install_playlist_callback(c, playlist_changed_callback);
- install_cb = FALSE;
- }
+ playlist_restore_selection();
}
static void
-play_close(void)
+screen_playlist_close(void)
{
if (timer_hide_cursor_id != 0) {
g_source_remove(timer_hide_cursor_id);
}
static void
-play_resize(int cols, int rows)
+screen_playlist_resize(int cols, int rows)
{
lw->cols = cols;
lw->rows = rows;
static void
-play_exit(void)
+screen_playlist_exit(void)
{
list_window_free(lw);
}
static const char *
-play_title(char *str, size_t size)
+screen_playlist_title(char *str, size_t size)
{
- if( strcmp(options.host, "localhost") == 0 )
+ if (options.host == NULL)
return _("Playlist");
g_snprintf(str, size, _("Playlist on %s"), options.host);
}
static void
-play_paint(void)
+screen_playlist_paint(void)
{
list_window_paint(lw, list_callback, NULL);
}
static void
-play_update(mpdclient_t *c)
+screen_playlist_update(struct mpdclient *c)
{
static int prev_song_id = -1;
- current_song_id = c->song != NULL && c->status != NULL &&
- !IS_STOPPED(c->status->state) ? c->song->id : -1;
+ if (c->events & MPD_IDLE_PLAYLIST)
+ playlist_restore_selection();
+
+ current_song_id = c->status != NULL &&
+ (mpd_status_get_state(c->status) == MPD_STATE_PLAY ||
+ mpd_status_get_state(c->status) == MPD_STATE_PAUSE)
+ ? (int)mpd_status_get_song_id(c->status) : -1;
if (current_song_id != prev_song_id) {
prev_song_id = current_song_id;
center_playing_item(c, false);
playlist_repaint();
-#ifndef NCMPC_MINI
- } else if (options.scroll) {
- /* always repaint if horizontal scrolling is
- enabled */
+ } else if (c->events & MPD_IDLE_PLAYLIST) {
+ /* the playlist has changed, we must paint the new
+ version */
playlist_repaint();
-#endif
}
}
lw->selected = selected;
list_window_check_selected(lw, playlist_length(playlist));
+ playlist_save_selection();
playlist_repaint();
return true;
#endif
static bool
-play_cmd(mpdclient_t *c, command_t cmd)
+screen_playlist_cmd(struct mpdclient *c, command_t cmd)
{
+ struct mpd_connection *connection;
static command_t cached_cmd = CMD_NONE;
command_t prev_cmd = cached_cmd;
cached_cmd = cmd;
}
if (list_window_cmd(lw, playlist_length(&c->playlist), cmd)) {
+ playlist_save_selection();
playlist_repaint();
return true;
}
+ switch(cmd) {
+ case CMD_SCREEN_UPDATE:
+ center_playing_item(c, prev_cmd == CMD_SCREEN_UPDATE);
+ playlist_repaint();
+ return false;
+ case CMD_SELECT_PLAYING:
+ list_window_set_selected(lw, playlist_get_index(&c->playlist,
+ c->song));
+ playlist_save_selection();
+ playlist_repaint();
+ return true;
+
+ case CMD_LIST_FIND:
+ case CMD_LIST_RFIND:
+ case CMD_LIST_FIND_NEXT:
+ case CMD_LIST_RFIND_NEXT:
+ screen_find(lw, playlist_length(&c->playlist),
+ cmd, list_callback, NULL);
+ playlist_save_selection();
+ playlist_repaint();
+ return true;
+ case CMD_LIST_JUMP:
+ screen_jump(lw, list_callback, NULL);
+ playlist_save_selection();
+ playlist_repaint();
+ return true;
+
+#ifdef HAVE_GETMOUSE
+ case CMD_MOUSE_EVENT:
+ return handle_mouse_event(c);
+#endif
+
+#ifdef ENABLE_SONG_SCREEN
+ case CMD_SCREEN_SONG:
+ if (playlist_selected_song()) {
+ screen_song_switch(c, playlist_selected_song());
+ return true;
+ }
+
+ break;
+#endif
+
+#ifdef ENABLE_LYRICS_SCREEN
+ case CMD_SCREEN_LYRICS:
+ if (lw->selected < playlist_length(&c->playlist)) {
+ struct mpd_song *selected = playlist_get(&c->playlist, lw->selected);
+ bool follow = false;
+
+ if (c->song && selected &&
+ !strcmp(mpd_song_get_uri(selected),
+ mpd_song_get_uri(c->song)))
+ follow = true;
+
+ screen_lyrics_switch(c, selected, follow);
+ return true;
+ }
+
+ break;
+#endif
+ case CMD_SCREEN_SWAP:
+ screen_swap(c, playlist_get(&c->playlist, lw->selected));
+ return true;
+
+ default:
+ break;
+ }
+
+ if (!mpdclient_is_connected(c))
+ return false;
+
switch(cmd) {
case CMD_PLAY:
mpdclient_cmd_play(c, lw->selected);
return true;
+
case CMD_DELETE:
- {
- int i = lw->selected_end, start = lw->selected_start;
- for(; i >= start; --i)
- mpdclient_cmd_delete(c, i);
-
- i++;
- if(i >= (int)playlist_length(&c->playlist))
- i--;
- lw->selected = i;
- lw->selected_start = i;
- lw->selected_end = i;
- lw->range_selection = false;
+ if (lw->range_selection) {
+ mpdclient_cmd_delete_range(c, lw->selected_start,
+ lw->selected_end + 1);
+ } else {
+ mpdclient_cmd_delete(c, lw->selected);
+ }
+ lw->selected = lw->selected_end = lw->selected_start;
+ lw->range_selection = false;
return true;
- }
+
case CMD_SAVE_PLAYLIST:
playlist_save(c, NULL, NULL);
return true;
+
case CMD_ADD:
handle_add_to_playlist(c);
return true;
- case CMD_SCREEN_UPDATE:
- center_playing_item(c, prev_cmd == CMD_SCREEN_UPDATE);
- playlist_repaint();
- return false;
- case CMD_SELECT_PLAYING:
- list_window_set_selected(lw, playlist_get_index(c, c->song));
- return true;
+
case CMD_SHUFFLE:
- {
if(!lw->range_selection)
/* No range selection, shuffle all list. */
break;
- if (mpdclient_cmd_shuffle_range(c, lw->selected_start, lw->selected_end+1) == 0)
+ connection = mpdclient_get_connection(c);
+ if (mpd_run_shuffle_range(connection, lw->selected_start,
+ lw->selected_end + 1))
screen_status_message(_("Shuffled playlist"));
-
+ else
+ mpdclient_handle_error(c);
return true;
- }
+
case CMD_LIST_MOVE_UP:
if(lw->selected_start == 0)
return false;
lw->selected_start--;
lw->selected_end--;
}
+
+ playlist_save_selection();
return true;
+
case CMD_LIST_MOVE_DOWN:
if(lw->selected_end+1 >= playlist_length(&c->playlist))
return false;
lw->selected_start++;
lw->selected_end++;
}
- return true;
- case CMD_LIST_FIND:
- case CMD_LIST_RFIND:
- case CMD_LIST_FIND_NEXT:
- case CMD_LIST_RFIND_NEXT:
- screen_find(lw, playlist_length(&c->playlist),
- cmd, list_callback, NULL);
- playlist_repaint();
- return true;
- case CMD_LIST_JUMP:
- screen_jump(lw, list_callback, NULL);
- playlist_repaint();
- return true;
-
-#ifdef HAVE_GETMOUSE
- case CMD_MOUSE_EVENT:
- return handle_mouse_event(c);
-#endif
-
-#ifdef ENABLE_SONG_SCREEN
- case CMD_SCREEN_SONG:
- if (lw->selected < playlist_length(&c->playlist)) {
- screen_song_switch(c, playlist_get(&c->playlist, lw->selected));
- return true;
- }
- break;
-#endif
+ playlist_save_selection();
+ return true;
case CMD_LOCATE:
- if (lw->selected < playlist_length(&c->playlist)) {
- screen_file_goto_song(c, playlist_get(&c->playlist, lw->selected));
+ if (playlist_selected_song()) {
+ screen_file_goto_song(c, playlist_selected_song());
return true;
}
break;
-#ifdef ENABLE_LYRICS_SCREEN
- case CMD_SCREEN_LYRICS:
- if (lw->selected < playlist_length(&c->playlist)) {
- struct mpd_song *selected = playlist_get(&c->playlist, lw->selected);
- bool follow = false;
-
- if (c->song && selected &&
- !strcmp(selected->file, c->song->file))
- follow = true;
-
- screen_lyrics_switch(c, selected, follow);
- return true;
- }
-
- break;
-#endif
- case CMD_SCREEN_SWAP:
- screen_swap(c, playlist_get(&c->playlist, lw->selected));
- return true;
-
default:
break;
}
}
const struct screen_functions screen_playlist = {
- .init = play_init,
- .exit = play_exit,
- .open = play_open,
- .close = play_close,
- .resize = play_resize,
- .paint = play_paint,
- .update = play_update,
- .cmd = play_cmd,
- .get_title = play_title,
+ .init = screen_playlist_init,
+ .exit = screen_playlist_exit,
+ .open = screen_playlist_open,
+ .close = screen_playlist_close,
+ .resize = screen_playlist_resize,
+ .paint = screen_playlist_paint,
+ .update = screen_playlist_update,
+ .cmd = screen_playlist_cmd,
+ .get_title = screen_playlist_title,
};