![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_browser.c b/src/screen_browser.c
index 6dbb2f817b1da7e8e89281ab1a4fc6d449f78a88..dd97bb22f0f91815dd1e8eda326db64f72ad6dfb 100644 (file)
--- a/src/screen_browser.c
+++ b/src/screen_browser.c
*/
#include "screen_browser.h"
+#include "screen_file.h"
+#include "screen_song.h"
+#include "screen_lyrics.h"
+#include "screen_message.h"
+#include "screen_find.h"
+#include "screen.h"
#include "i18n.h"
#include "options.h"
#include "charset.h"
#include "strfsong.h"
-#include "screen_utils.h"
+#include "mpdclient.h"
+#include "filelist.h"
+
+#include <mpd/client.h>
#include <string.h>
#ifndef NCMPC_MINI
-/* clear the highlight flag for all items in the filelist */
-static void
-clear_highlights(mpdclient_filelist_t *fl)
-{
- guint i;
-
- for (i = 0; i < filelist_length(fl); ++i) {
- struct filelist_entry *entry = filelist_get(fl, i);
-
- entry->flags &= ~HIGHLIGHT;
- }
-}
-
-/* change the highlight flag for a song */
-static void
-set_highlight(mpdclient_filelist_t *fl, mpd_Song *song, int highlight)
-{
- int i = filelist_find_song(fl, song);
- struct filelist_entry *entry;
-
- if (i < 0)
- return;
-
- entry = filelist_get(fl, i);
- if (highlight)
- entry->flags |= HIGHLIGHT;
- else
- entry->flags &= ~HIGHLIGHT;
-}
-
/* sync highlight flags with playlist */
void
-sync_highlights(mpdclient_t *c, mpdclient_filelist_t *fl)
+screen_browser_sync_highlights(struct filelist *fl,
+ const struct mpdclient_playlist *playlist)
{
guint i;
for (i = 0; i < filelist_length(fl); ++i) {
struct filelist_entry *entry = filelist_get(fl, i);
- mpd_InfoEntity *entity = entry->entity;
+ const struct mpd_entity *entity = entry->entity;
- if ( entity && entity->type==MPD_INFO_ENTITY_TYPE_SONG ) {
- mpd_Song *song = entity->info.song;
+ if (entity != NULL && mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_SONG) {
+ const struct mpd_song *song =
+ mpd_entity_get_song(entity);
- if (playlist_get_index_from_same_song(c, song) >= 0)
+ if (playlist_get_index_from_same_song(playlist,
+ song) >= 0)
entry->flags |= HIGHLIGHT;
else
entry->flags &= ~HIGHLIGHT;
}
}
-/* the playlist has been updated -> fix highlights */
-void
-browser_playlist_changed(struct screen_browser *browser, mpdclient_t *c,
- int event, gpointer data)
-{
- if (browser->filelist == NULL)
- return;
-
- switch(event) {
- case PLAYLIST_EVENT_CLEAR:
- clear_highlights(browser->filelist);
- break;
- case PLAYLIST_EVENT_ADD:
- set_highlight(browser->filelist, (mpd_Song *) data, 1);
- break;
- case PLAYLIST_EVENT_DELETE:
- set_highlight(browser->filelist, (mpd_Song *) data, 0);
- break;
- case PLAYLIST_EVENT_MOVE:
- break;
- default:
- sync_highlights(c, browser->filelist);
- break;
- }
-}
-
#endif
/* list_window callback */
const char *
browser_lw_callback(unsigned idx, bool *highlight, G_GNUC_UNUSED char **second_column, void *data)
{
+ const struct filelist *fl = (const struct filelist *) data;
static char buf[BUFSIZE];
- mpdclient_filelist_t *fl = (mpdclient_filelist_t *) data;
- filelist_entry_t *entry;
- mpd_InfoEntity *entity;
+ const struct filelist_entry *entry;
+ const struct mpd_entity *entity;
- if (idx >= filelist_length(fl))
+ if (fl == NULL || idx >= filelist_length(fl))
return NULL;
entry = filelist_get(fl, idx);
@@ -140,21 +96,23 @@ browser_lw_callback(unsigned idx, bool *highlight, G_GNUC_UNUSED char **second_c
if( entity == NULL )
return "[..]";
- if( entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY ) {
- mpd_Directory *dir = entity->info.directory;
- char *directory = utf8_to_locale(g_basename(dir->path));
+ if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_DIRECTORY) {
+ const struct mpd_directory *dir =
+ mpd_entity_get_directory(entity);
+ char *directory = utf8_to_locale(g_basename(mpd_directory_get_path(dir)));
g_snprintf(buf, BUFSIZE, "[%s]", directory);
g_free(directory);
return buf;
- } else if( entity->type==MPD_INFO_ENTITY_TYPE_SONG ) {
- mpd_Song *song = entity->info.song;
+ } else if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_SONG) {
+ const struct mpd_song *song = mpd_entity_get_song(entity);
strfsong(buf, BUFSIZE, options.list_format, song);
return buf;
- } else if( entity->type==MPD_INFO_ENTITY_TYPE_PLAYLISTFILE ) {
- mpd_PlaylistFile *plf = entity->info.playlistFile;
- char *filename = utf8_to_locale(g_basename(plf->path));
+ } else if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_PLAYLIST) {
+ const struct mpd_playlist *playlist =
+ mpd_entity_get_playlist(entity);
+ char *filename = utf8_to_locale(g_basename(mpd_playlist_get_path(playlist)));
g_snprintf(buf, BUFSIZE, playlist_format, filename);
g_free(filename);
@@ -164,111 +122,63 @@ browser_lw_callback(unsigned idx, bool *highlight, G_GNUC_UNUSED char **second_c
return "Error: Unknown entry!";
}
-/* chdir */
-bool
-browser_change_directory(struct screen_browser *browser, mpdclient_t *c,
- filelist_entry_t *entry, const char *new_path)
-{
- mpd_InfoEntity *entity = NULL;
- gchar *path = NULL;
- char *old_path;
- int idx;
-
- if( entry!=NULL )
- entity = entry->entity;
- else if( new_path==NULL )
- return false;
-
- if( entity==NULL ) {
- if( entry || 0==strcmp(new_path, "..") ) {
- /* return to parent */
- char *parent = g_path_get_dirname(browser->filelist->path);
- if( strcmp(parent, ".") == 0 )
- parent[0] = '\0';
- path = g_strdup(parent);
- g_free(parent);
- } else {
- /* entry==NULL, then new_path ("" is root) */
- path = g_strdup(new_path);
- }
- } else if( entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY) {
- /* enter sub */
- mpd_Directory *dir = entity->info.directory;
- path = g_strdup(dir->path);
- } else
- return false;
-
- if (browser->filelist != NULL) {
- old_path = g_strdup(browser->filelist->path);
- filelist_free(browser->filelist);
- } else
- old_path = NULL;
-
- browser->filelist = mpdclient_filelist_get(c, path);
-#ifndef NCMPC_MINI
- sync_highlights(c, browser->filelist);
-#endif
-
- idx = old_path != NULL
- ? filelist_find_directory(browser->filelist, old_path)
- : -1;
- g_free(old_path);
-
- list_window_reset(browser->lw);
- if (idx >= 0) {
- list_window_set_selected(browser->lw, idx);
- list_window_center(browser->lw,
- filelist_length(browser->filelist), idx);
- }
-
- g_free(path);
- return true;
-}
-
static bool
-load_playlist(mpdclient_t *c, const mpd_PlaylistFile *plf)
+load_playlist(struct mpdclient *c, const struct mpd_playlist *playlist)
{
- char *filename = utf8_to_locale(plf->path);
+ struct mpd_connection *connection = mpdclient_get_connection(c);
+ char *filename = utf8_to_locale(mpd_playlist_get_path(playlist));
- if (mpdclient_cmd_load_playlist(c, plf->path) == 0)
+ if (mpd_run_load(connection, mpd_playlist_get_path(playlist))) {
screen_status_printf(_("Loading playlist %s..."),
g_basename(filename));
+ c->events |= MPD_IDLE_QUEUE;
+ } else
+ mpdclient_handle_error(c);
+
g_free(filename);
return true;
}
static bool
-enqueue_and_play(mpdclient_t *c, filelist_entry_t *entry)
+enqueue_and_play(struct mpdclient *c, struct filelist_entry *entry)
{
- int idx;
- mpd_InfoEntity *entity = entry->entity;
- mpd_Song *song = entity->info.song;
+ struct mpd_connection *connection = mpdclient_get_connection(c);
+ const struct mpd_song *song = mpd_entity_get_song(entry->entity);
+ int id;
#ifndef NCMPC_MINI
- if (!(entry->flags & HIGHLIGHT)) {
+ if (!(entry->flags & HIGHLIGHT))
+ id = -1;
+ else
#endif
- if (mpdclient_cmd_add(c, song) == 0) {
- char buf[BUFSIZE];
+ id = playlist_get_id_from_same_song(&c->playlist, song);
-#ifndef NCMPC_MINI
- entry->flags |= HIGHLIGHT;
-#endif
- strfsong(buf, BUFSIZE, options.list_format, song);
- screen_status_printf(_("Adding \'%s\' to playlist"), buf);
- mpdclient_update(c); /* get song id */
- } else
+ if (id < 0) {
+ char buf[BUFSIZE];
+
+ id = mpd_run_add_id(connection, mpd_song_get_uri(song));
+ if (id < 0) {
+ mpdclient_handle_error(c);
return false;
+ }
+
#ifndef NCMPC_MINI
- }
+ entry->flags |= HIGHLIGHT;
#endif
+ strfsong(buf, BUFSIZE, options.list_format, song);
+ screen_status_printf(_("Adding \'%s\' to playlist"), buf);
+ }
+
+ if (!mpd_run_play_id(connection, id)) {
+ mpdclient_handle_error(c);
+ return false;
+ }
- idx = playlist_get_index_from_same_song(c, song);
- mpdclient_cmd_play(c, idx);
return true;
}
-static struct filelist_entry *
-browser_get_selected(const struct screen_browser *browser)
+struct filelist_entry *
+browser_get_selected_entry(const struct screen_browser *browser)
{
if (browser->filelist == NULL ||
browser->lw->selected_start < browser->lw->selected_end ||
return filelist_get(browser->filelist, browser->lw->selected);
}
-static struct mpd_InfoEntity *
+static const struct mpd_entity *
browser_get_selected_entity(const struct screen_browser *browser)
{
- struct filelist_entry *entry = browser_get_selected(browser);
+ const struct filelist_entry *entry = browser_get_selected_entry(browser);
return entry != NULL
? entry->entity
: NULL;
}
-static struct mpd_song *
+static const struct mpd_song *
browser_get_selected_song(const struct screen_browser *browser)
{
- struct mpd_InfoEntity *entity = browser_get_selected_entity(browser);
+ const struct mpd_entity *entity = browser_get_selected_entity(browser);
- return entity != NULL && entity->type == MPD_INFO_ENTITY_TYPE_SONG
- ? entity->info.song
+ return entity != NULL &&
+ mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_SONG
+ ? mpd_entity_get_song(entity)
: NULL;
}
}
static bool
-browser_handle_enter(struct screen_browser *browser, mpdclient_t *c)
+browser_handle_enter(struct screen_browser *browser, struct mpdclient *c)
{
- struct filelist_entry *entry = browser_get_selected(browser);
- mpd_InfoEntity *entity;
+ struct filelist_entry *entry = browser_get_selected_entry(browser);
+ struct mpd_entity *entity;
if (entry == NULL)
return false;
entity = entry->entity;
- if (entity == NULL || entity->type == MPD_INFO_ENTITY_TYPE_DIRECTORY)
- return browser_change_directory(browser, c, entry, NULL);
- else if (entity->type == MPD_INFO_ENTITY_TYPE_PLAYLISTFILE)
- return load_playlist(c, entity->info.playlistFile);
- else if (entity->type == MPD_INFO_ENTITY_TYPE_SONG)
+ if (entity == NULL)
+ return false;
+
+ if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_PLAYLIST)
+ return load_playlist(c, mpd_entity_get_playlist(entity));
+ else if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_SONG)
return enqueue_and_play(c, entry);
return false;
}
static bool
-browser_select_entry(mpdclient_t *c, filelist_entry_t *entry,
+browser_select_entry(struct mpdclient *c, struct filelist_entry *entry,
G_GNUC_UNUSED gboolean toggle)
{
assert(entry != NULL);
assert(entry->entity != NULL);
- if (entry->entity->type == MPD_INFO_ENTITY_TYPE_PLAYLISTFILE)
- return load_playlist(c, entry->entity->info.playlistFile);
+ if (mpd_entity_get_type(entry->entity) == MPD_ENTITY_TYPE_PLAYLIST)
+ return load_playlist(c, mpd_entity_get_playlist(entry->entity));
- if (entry->entity->type == MPD_INFO_ENTITY_TYPE_DIRECTORY) {
- mpd_Directory *dir = entry->entity->info.directory;
+ if (mpd_entity_get_type(entry->entity) == MPD_ENTITY_TYPE_DIRECTORY) {
+ const struct mpd_directory *dir =
+ mpd_entity_get_directory(entry->entity);
- if (mpdclient_cmd_add_path(c, dir->path) == 0) {
- char *tmp = utf8_to_locale(dir->path);
+ if (mpdclient_cmd_add_path(c, mpd_directory_get_path(dir))) {
+ char *tmp = utf8_to_locale(mpd_directory_get_path(dir));
screen_status_printf(_("Adding \'%s\' to playlist"), tmp);
g_free(tmp);
return true;
}
- if (entry->entity->type != MPD_INFO_ENTITY_TYPE_SONG)
+ if (mpd_entity_get_type(entry->entity) != MPD_ENTITY_TYPE_SONG)
return false;
- assert(entry->entity->info.song != NULL);
-
#ifndef NCMPC_MINI
if (!toggle || (entry->flags & HIGHLIGHT) == 0)
#endif
{
- mpd_Song *song = entry->entity->info.song;
+ const struct mpd_song *song =
+ mpd_entity_get_song(entry->entity);
#ifndef NCMPC_MINI
entry->flags |= HIGHLIGHT;
#endif
- if (mpdclient_cmd_add(c, song) == 0) {
+ if (mpdclient_cmd_add(c, song)) {
char buf[BUFSIZE];
strfsong(buf, BUFSIZE, options.list_format, song);
#ifndef NCMPC_MINI
} else {
/* remove song from playlist */
- mpd_Song *song = entry->entity->info.song;
+ const struct mpd_song *song =
+ mpd_entity_get_song(entry->entity);
int idx;
entry->flags &= ~HIGHLIGHT;
- while ((idx = playlist_get_index_from_same_song(c, song)) >= 0)
+ while ((idx = playlist_get_index_from_same_song(&c->playlist,
+ song)) >= 0)
mpdclient_cmd_delete(c, idx);
#endif
}
}
static bool
-browser_handle_select(struct screen_browser *browser, mpdclient_t *c)
+browser_handle_select(struct screen_browser *browser, struct mpdclient *c)
{
struct filelist_entry *entry;
}
return false;
} else {
- entry = browser_get_selected(browser);
+ entry = browser_get_selected_entry(browser);
if (entry == NULL || entry->entity == NULL)
return false;
}
static bool
-browser_handle_add(struct screen_browser *browser, mpdclient_t *c)
+browser_handle_add(struct screen_browser *browser, struct mpdclient *c)
{
struct filelist_entry *entry;
}
return false;
} else {
- entry = browser_get_selected(browser);
+ entry = browser_get_selected_entry(browser);
if (entry == NULL || entry->entity == NULL)
return false;
}
static void
-browser_handle_select_all(struct screen_browser *browser, mpdclient_t *c)
+browser_handle_select_all(struct screen_browser *browser, struct mpdclient *c)
{
guint i;
#ifdef HAVE_GETMOUSE
static int
-browser_handle_mouse_event(struct screen_browser *browser, mpdclient_t *c)
+browser_handle_mouse_event(struct screen_browser *browser, struct mpdclient *c)
{
int row;
unsigned prev_selected = browser->lw->selected;
unsigned long bstate;
- int length;
-
- if (browser->filelist)
- length = filelist_length(browser->filelist);
- else
- length = 0;
if (screen_get_mouse_event(c, &bstate, &row) ||
- list_window_mouse(browser->lw, length, bstate, row))
+ list_window_mouse(browser->lw, bstate, row))
return 1;
- browser->lw->selected = browser->lw->start + row;
- list_window_check_selected(browser->lw, length);
+ list_window_set_cursor(browser->lw, browser->lw->start + row);
if( bstate & BUTTON1_CLICKED ) {
if (prev_selected == browser->lw->selected)
browser_cmd(struct screen_browser *browser,
struct mpdclient *c, command_t cmd)
{
- struct mpd_song *song;
-
- switch (cmd) {
- case CMD_PLAY:
- browser_handle_enter(browser, c);
- return true;
+ const struct mpd_song *song;
- case CMD_SELECT:
- if (browser_handle_select(browser, c))
- /* continue and select next item... */
- cmd = CMD_LIST_NEXT;
-
- /* call list_window_cmd to go to the next item */
- break;
-
- case CMD_ADD:
- if (browser_handle_add(browser, c))
- /* continue and select next item... */
- cmd = CMD_LIST_NEXT;
-
- /* call list_window_cmd to go to the next item */
- break;
+ if (browser->filelist == NULL)
+ return false;
- case CMD_SELECT_ALL:
- browser_handle_select_all(browser, c);
+ if (list_window_cmd(browser->lw, cmd))
return true;
+ switch (cmd) {
case CMD_LIST_FIND:
case CMD_LIST_RFIND:
case CMD_LIST_FIND_NEXT:
case CMD_LIST_RFIND_NEXT:
- screen_find(browser->lw, filelist_length(browser->filelist),
- cmd, browser_lw_callback,
+ screen_find(browser->lw, cmd, browser_lw_callback,
browser->filelist);
return true;
case CMD_LIST_JUMP:
return true;
#endif
- case CMD_LOCATE:
- song = browser_get_selected_song(browser);
- if (song == NULL)
- return false;
-
- screen_file_goto_song(c, song);
- return true;
-
#ifdef ENABLE_LYRICS_SCREEN
case CMD_SCREEN_LYRICS:
song = browser_get_selected_song(browser);
break;
}
- if (list_window_cmd(browser->lw, filelist_length(browser->filelist),
- cmd))
+ if (!mpdclient_is_connected(c))
+ return false;
+
+ switch (cmd) {
+ case CMD_PLAY:
+ browser_handle_enter(browser, c);
+ return true;
+
+ case CMD_SELECT:
+ if (browser_handle_select(browser, c))
+ list_window_cmd(browser->lw, CMD_LIST_NEXT);
+ return true;
+
+ case CMD_ADD:
+ if (browser_handle_add(browser, c))
+ list_window_cmd(browser->lw, CMD_LIST_NEXT);
+ return true;
+
+ case CMD_SELECT_ALL:
+ browser_handle_select_all(browser, c);
return true;
+ case CMD_LOCATE:
+ song = browser_get_selected_song(browser);
+ if (song == NULL)
+ return false;
+
+ screen_file_goto_song(c, song);
+ return true;
+
+ default:
+ break;
+ }
+
return false;
}