![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_play.c b/src/screen_play.c
index f48254c7ae686b3fe810abefceb1b305db8d4266..ceb13616662197b076a0316e9fdfbb3dc735a971 100644 (file)
--- a/src/screen_play.c
+++ b/src/screen_play.c
-/*
- * (c) 2004 by Kalle Wallin <kaw@linux.se>
- *
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2009 The Music Player Daemon Project
+ * Project homepage: http://musicpd.org
+
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "screen_play.h"
+#include "screen_interface.h"
+#include "screen_file.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 bool must_scroll;
#endif
static struct mpdclient_playlist *playlist;
static int current_song_id = -1;
+static int selected_song_id = -1;
static list_window_t *lw = NULL;
static guint timer_hide_cursor_id;
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:
- 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();
}
+#ifndef NCMPC_MINI
+static char *
+format_duration(unsigned duration)
+{
+ if (duration == 0)
+ return NULL;
+
+ return g_strdup_printf("%d:%02d", duration / 60, duration % 60);
+}
+#endif
+
static const char *
-list_callback(unsigned idx, bool *highlight, G_GNUC_UNUSED void *data)
+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 (options.scroll && (unsigned)song->pos == lw->selected &&
- utf8_width(songname) > (unsigned)COLS) {
- static unsigned current_song;
- char *tmp;
+ if(second_column)
+ *second_column = format_duration(mpd_song_get_duration(song));
+
+ if (idx == lw->selected)
+ {
+ int second_column_len = 0;
+ 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) )
+ {
+ static unsigned current_song;
+ char *tmp;
+
+ must_scroll = true;
+
+ if (current_song != lw->selected) {
+ st.offset = 0;
+ current_song = lw->selected;
+ }
- if (current_song != lw->selected) {
- st.offset = 0;
- current_song = lw->selected;
+ tmp = strscroll(songname, options.scroll_sep,
+ MAX_SONG_LENGTH, &st);
+ g_strlcpy(songname, tmp, MAX_SONG_LENGTH);
+ g_free(tmp);
}
-
- tmp = strscroll(songname, options.scroll_sep,
- MAX_SONG_LENGTH, &st);
- g_strlcpy(songname, tmp, MAX_SONG_LENGTH);
- g_free(tmp);
- } else if ((unsigned)song->pos == lw->selected)
- st.offset = 0;
+ else
+ st.offset = 0;
+ }
+#else
+ (void)second_column;
#endif
return songname;
}
static void
-center_playing_item(mpdclient_t *c)
+center_playing_item(struct mpdclient *c, bool center_cursor)
{
+ const struct mpd_song *song;
unsigned length = c->playlist.list->len;
- unsigned offset = lw->selected - lw->start;
int idx;
- if (!c->song || length < lw->rows ||
- 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;
+ if (length < lw->rows)
+ {
+ if (center_cursor)
+ list_window_set_selected(lw, idx);
+ return;
+ }
+
list_window_center(lw, length, idx);
+ if (center_cursor) {
+ list_window_set_selected(lw, idx);
+ return;
+ }
+
/* make sure the cursor is in the window */
- lw->selected = lw->start+offset;
- list_window_check_selected(lw, length);
+ if (lw->selected < lw->start + options.scroll_offset) {
+ if (lw->start > 0)
+ lw->selected = lw->start + options.scroll_offset;
+ if (lw->range_selection) {
+ lw->selected_start = lw->range_base;
+ lw->selected_end = lw->selected;
+ } else {
+ lw->selected_start = lw->selected;
+ lw->selected_end = lw->selected;
+ }
+ } else if (lw->selected > lw->start + lw->rows - 1 - options.scroll_offset) {
+ if (lw->start + lw->rows < length)
+ lw->selected = lw->start + lw->rows - 1 - options.scroll_offset;
+ if (lw->range_selection) {
+ lw->selected_start = lw->selected;
+ lw->selected_end = lw->range_base;
+ } else {
+ lw->selected_start = lw->selected;
+ lw->selected_end = lw->selected;
+ }
+ }
}
#ifndef NCMPC_MINI
{
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)
{
gchar *filename, *filename_utf8;
gint error;
/* 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);
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) {
+ if (code == MPD_SERVER_ERROR_EXIST) {
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);
+ g_free(filename);
+ screen_status_printf(_("Aborted"));
+ return -1;
+ }
- if (error) {
- g_free(filename);
- return -1;
- }
+ error = mpdclient_cmd_delete_playlist(c, filename_utf8);
+ if (error) {
+ g_free(filename_utf8);
+ g_free(filename);
+ return -1;
+ }
- error = playlist_save(c, filename, NULL);
+ error = mpdclient_cmd_save_playlist(c, filename_utf8);
+ if (error) {
+ g_free(filename_utf8);
g_free(filename);
return error;
}
-
- screen_status_printf(_("Aborted"));
+ } else {
+ g_free(filename_utf8);
+ g_free(filename);
+ return -1;
}
-
- g_free(filename);
- return -1;
}
+ 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
/* 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)
+play_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
static const char *
play_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)
{
+#ifndef NCMPC_MINI
+ must_scroll = false;
+#endif
+
list_window_paint(lw, list_callback, NULL);
}
static void
-play_update(mpdclient_t *c)
+play_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 &&
+ !IS_STOPPED(mpd_status_get_state(c->status))
+ ? (int)mpd_status_get_song_id(c->status) : -1;
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);
+ if (options.auto_center && current_song_id != -1 && ! lw->range_selection)
+ center_playing_item(c, false);
playlist_repaint();
#ifndef NCMPC_MINI
- } else if (options.scroll) {
+ } else if (options.scroll && must_scroll) {
/* always repaint if horizontal scrolling is
enabled */
playlist_repaint();
#endif
+ } else if (c->events & MPD_IDLE_PLAYLIST) {
+ /* the playlist has changed, we must paint the new
+ version */
+ playlist_repaint();
}
}
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)
+play_cmd(struct mpdclient *c, command_t cmd)
{
+ static command_t cached_cmd = CMD_NONE;
+ command_t prev_cmd = cached_cmd;
+ cached_cmd = cmd;
+
lw->hide_cursor = false;
if (options.hide_cursor > 0) {
}
if (list_window_cmd(lw, playlist_length(&c->playlist), cmd)) {
+ playlist_save_selection();
playlist_repaint();
return true;
}
mpdclient_cmd_play(c, lw->selected);
return true;
case CMD_DELETE:
- mpdclient_cmd_delete(c, lw->selected);
+ 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;
handle_add_to_playlist(c);
return true;
case CMD_SCREEN_UPDATE:
- center_playing_item(c);
+ 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();
+ 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)
+ screen_status_message(_("Shuffled playlist"));
+ return true;
+ }
case CMD_LIST_MOVE_UP:
- mpdclient_cmd_move(c, lw->selected, lw->selected-1);
+ if(lw->selected_start == 0)
+ return false;
+ if(lw->range_selection)
+ {
+ unsigned i = lw->selected_start;
+ unsigned last_selected = lw->selected;
+ for(; i <= lw->selected_end; ++i)
+ mpdclient_cmd_move(c, i, i-1);
+ lw->selected_start--;
+ lw->selected_end--;
+ lw->selected = last_selected - 1;
+ lw->range_base--;
+ }
+ else
+ {
+ mpdclient_cmd_move(c, lw->selected, lw->selected-1);
+ lw->selected--;
+ lw->selected_start--;
+ lw->selected_end--;
+ }
+
+ playlist_save_selection();
return true;
case CMD_LIST_MOVE_DOWN:
- mpdclient_cmd_move(c, lw->selected, lw->selected+1);
+ if(lw->selected_end+1 >= playlist_length(&c->playlist))
+ return false;
+ if(lw->range_selection)
+ {
+ int i = lw->selected_end;
+ unsigned last_selected = lw->selected;
+ for(; i >= (int)lw->selected_start; --i)
+ mpdclient_cmd_move(c, i, i+1);
+ lw->selected_start++;
+ lw->selected_end++;
+ lw->selected = last_selected + 1;
+ lw->range_base++;
+ }
+ else
+ {
+ mpdclient_cmd_move(c, lw->selected, lw->selected+1);
+ lw->selected++;
+ lw->selected_start++;
+ lw->selected_end++;
+ }
+
+ playlist_save_selection();
return true;
case CMD_LIST_FIND:
case CMD_LIST_RFIND:
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;
#endif
#ifdef ENABLE_SONG_SCREEN
- case CMD_VIEW:
- if (lw->selected < playlist_length(&c->playlist)) {
- screen_song_switch(c, playlist_get(&c->playlist, lw->selected));
+ case CMD_SCREEN_SONG:
+ if (playlist_selected_song()) {
+ screen_song_switch(c, playlist_selected_song());
return true;
}
#endif
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;
}
#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));
+ 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;