![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_browser.c b/src/screen_browser.c
index 52285152b57dd679d13ee1a2fd865606f0c969c5..26dca5285ac533d1f730bb389a3dbe6fed4b3a06 100644 (file)
--- a/src/screen_browser.c
+++ b/src/screen_browser.c
#include "screen_browser.h"
#include "i18n.h"
#include "options.h"
-#include "support.h"
+#include "charset.h"
#include "strfsong.h"
#include "screen_utils.h"
#include "gcc.h"
#include <string.h>
-#define USE_OLD_LAYOUT
#undef USE_OLD_ADD
#define BUFSIZE 1024
+#ifndef NCMPC_MINI
#define HIGHLIGHT (0x01)
+#endif
+
+static const char playlist_format[] = "*%s*";
+
+#ifndef NCMPC_MINI
/* clear the highlight flag for all items in the filelist */
static void
}
}
+#endif
+
/* list_window callback */
const char *
browser_lw_callback(unsigned idx, int *highlight, void *data)
assert(entry != NULL);
entity = entry->entity;
+#ifndef NCMPC_MINI
*highlight = (entry->flags & HIGHLIGHT);
+#else
+ *highlight = false;
+#endif
if( entity == NULL )
return "[..]";
if( entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY ) {
mpd_Directory *dir = entity->info.directory;
- char *directory = utf8_to_locale(basename(dir->path));
+ char *directory = utf8_to_locale(g_basename(dir->path));
g_snprintf(buf, BUFSIZE, "[%s]", directory);
g_free(directory);
return buf;
} else if( entity->type==MPD_INFO_ENTITY_TYPE_PLAYLISTFILE ) {
mpd_PlaylistFile *plf = entity->info.playlistFile;
- char *filename = utf8_to_locale(basename(plf->path));
+ char *filename = utf8_to_locale(g_basename(plf->path));
-#ifdef USE_OLD_LAYOUT
- g_snprintf(buf, BUFSIZE, "*%s*", filename);
-#else
- g_snprintf(buf, BUFSIZE, "<Playlist> %s", filename);
-#endif
+ g_snprintf(buf, BUFSIZE, playlist_format, filename);
g_free(filename);
return buf;
}
{
mpd_InfoEntity *entity = NULL;
gchar *path = NULL;
+ char *old_path;
+ int idx;
if( entry!=NULL )
entity = entry->entity;
if( strcmp(parent, ".") == 0 )
parent[0] = '\0';
path = g_strdup(parent);
- list_window_reset(browser->lw);
- /* restore previous list window state */
- list_window_pop_state(browser->lw_state, browser->lw);
} else {
/* entry==NULL, then new_path ("" is root) */
path = g_strdup(new_path);
- list_window_reset(browser->lw);
- /* restore first list window state (pop while returning true) */
- while(list_window_pop_state(browser->lw_state, browser->lw));
}
} else if( entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY) {
/* enter sub */
mpd_Directory *dir = entity->info.directory;
path = utf8_to_locale(dir->path);
- /* save current list window state */
- list_window_push_state(browser->lw_state, browser->lw);
} else
return -1;
+ old_path = g_strdup(browser->filelist->path);
+
filelist_free(browser->filelist);
browser->filelist = mpdclient_filelist_get(c, path);
+#ifndef NCMPC_MINI
sync_highlights(c, browser->filelist);
- list_window_check_selected(browser->lw, filelist_length(browser->filelist));
+#endif
+
+ idx = filelist_find_directory(browser->filelist, old_path);
+ 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 0;
}
char *filename = utf8_to_locale(plf->path);
if (mpdclient_cmd_load_playlist_utf8(c, plf->path) == 0)
- screen_status_printf(_("Loading playlist %s..."), basename(filename));
+ screen_status_printf(_("Loading playlist %s..."),
+ g_basename(filename));
g_free(filename);
return 0;
}
mpd_InfoEntity *entity = entry->entity;
mpd_Song *song = entity->info.song;
+#ifndef NCMPC_MINI
if (!(entry->flags & HIGHLIGHT)) {
+#endif
if (mpdclient_cmd_add(c, song) == 0) {
char buf[BUFSIZE];
+#ifndef NCMPC_MINI
entry->flags |= HIGHLIGHT;
+#endif
strfsong(buf, BUFSIZE, options.list_format, song);
screen_status_printf(_("Adding \'%s\' to playlist\n"), buf);
mpdclient_update(c); /* get song id */
} else
return -1;
+#ifndef NCMPC_MINI
}
+#endif
idx = playlist_get_index_from_file(c, song->file);
mpdclient_cmd_play(c, idx);
#ifdef USE_OLD_ADD
-/* NOTE - The add_directory functions should move to mpdclient.c */
-extern gint mpdclient_finish_command(mpdclient_t *c);
static int
add_directory(mpdclient_t *c, char *dir)
static int
browser_select_entry(mpdclient_t *c, filelist_entry_t *entry,
- gboolean toggle)
+ mpd_unused gboolean toggle)
{
assert(entry != NULL);
assert(entry->entity != NULL);
assert(entry->entity->info.song != NULL);
- if (!toggle || (entry->flags & HIGHLIGHT) == 0) {
+#ifndef NCMPC_MINI
+ if (!toggle || (entry->flags & HIGHLIGHT) == 0)
+#endif
+ {
mpd_Song *song = entry->entity->info.song;
+#ifndef NCMPC_MINI
entry->flags |= HIGHLIGHT;
+#endif
if (mpdclient_cmd_add(c, song) == 0) {
char buf[BUFSIZE];
strfsong(buf, BUFSIZE, options.list_format, song);
screen_status_printf(_("Adding \'%s\' to playlist\n"), buf);
}
+#ifndef NCMPC_MINI
} else {
/* remove song from playlist */
mpd_Song *song = entry->entity->info.song;
while ((idx = playlist_get_index_from_file(c, song->file)) >=0)
mpdclient_cmd_delete(c, idx);
+#endif
}
return 0;
#endif
bool
-browser_cmd(struct screen_browser *browser, struct screen *screen,
+browser_cmd(struct screen_browser *browser,
struct mpdclient *c, command_t cmd)
{
+#ifdef ENABLE_LYRICS_SCREEN
struct filelist_entry *entry;
+#endif
switch (cmd) {
case CMD_PLAY:
case CMD_LIST_RFIND:
case CMD_LIST_FIND_NEXT:
case CMD_LIST_RFIND_NEXT:
- screen_find(screen,
- browser->lw, filelist_length(browser->filelist),
+ screen_find(browser->lw, filelist_length(browser->filelist),
cmd, browser_lw_callback,
browser->filelist);
return true;