diff --git a/src/screen_file.c b/src/screen_file.c
index 43c28c264de50909c8587bf909852793d04b06d1..1387cee519fc066f0bc96bf0b02d8627de5d187c 100644 (file)
--- a/src/screen_file.c
+++ b/src/screen_file.c
#include "screen_browser.h"
#include "screen_interface.h"
#include "screen_message.h"
+#include "screen_queue.h"
#include "screen.h"
#include "config.h"
#include "i18n.h"
#include "mpdclient.h"
#include "filelist.h"
#include "screen_utils.h"
-#include "screen_play.h"
#include "screen_client.h"
#include <mpd/client.h>
}
static void
-screen_file_reload(struct mpdclient *c)
+screen_file_load_list(struct mpdclient *c, struct filelist *filelist)
{
struct mpd_connection *connection;
- if (browser.filelist != NULL)
- filelist_free(browser.filelist);
-
- browser.filelist = filelist_new();
- if (*current_path != 0)
- /* add a dummy entry for ./.. */
- filelist_append(browser.filelist, NULL);
-
if (!mpdclient_is_connected(c))
return;
- connection = c->connection;
+ connection = mpdclient_get_connection(c);
mpd_send_list_meta(connection, current_path);
- filelist_recv(browser.filelist, connection);
+ filelist_recv(filelist, connection);
if (mpd_response_finish(connection))
- filelist_sort_dir_play(browser.filelist,
- compare_filelist_entry_path);
+ filelist_sort_dir_play(filelist, compare_filelist_entry_path);
else
mpdclient_handle_error(c);
}
+static void
+screen_file_reload(struct mpdclient *c)
+{
+ if (browser.filelist != NULL)
+ filelist_free(browser.filelist);
+
+ browser.filelist = filelist_new();
+ if (*current_path != 0)
+ /* add a dummy entry for ./.. */
+ filelist_append(browser.filelist, NULL);
+
+ screen_file_load_list(c, browser.filelist);
+
+ list_window_set_length(browser.lw,
+ filelist_length(browser.filelist));
+}
+
/**
* Change to the specified absolute directory.
*/
if (success && idx >= 0) {
/* set the cursor on the previous working directory */
- list_window_set_selected(browser.lw, idx);
- list_window_center(browser.lw,
- filelist_length(browser.filelist), idx);
+ list_window_set_cursor(browser.lw, idx);
+ list_window_center(browser.lw, idx);
}
return success;
static int
handle_save(struct mpdclient *c)
{
- struct filelist_entry *entry;
+ struct list_window_range range;
const char *defaultname = NULL;
char *defaultname_utf8 = NULL;
int ret;
- unsigned selected;
- if (browser.lw->selected >= filelist_length(browser.filelist))
+ list_window_get_range(browser.lw, &range);
+ if (range.start == range.end)
return -1;
- for(selected = browser.lw->selected_start; selected <= browser.lw->selected_end; ++selected)
- {
- entry = filelist_get(browser.filelist, selected);
+ for (unsigned i = range.start; i < range.end; ++i) {
+ struct filelist_entry *entry =
+ filelist_get(browser.filelist, i);
if( entry && entry->entity ) {
struct mpd_entity *entity = entry->entity;
if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_PLAYLIST) {
static int
handle_delete(struct mpdclient *c)
{
- struct filelist_entry *entry;
+ struct mpd_connection *connection = mpdclient_get_connection(c);
+ struct list_window_range range;
struct mpd_entity *entity;
const struct mpd_playlist *playlist;
char *str, *buf;
int key;
- unsigned selected;
-
- for(selected = browser.lw->selected_start; selected <= browser.lw->selected_end; ++selected)
- {
- if (selected >= filelist_length(browser.filelist))
- return -1;
- entry = filelist_get(browser.filelist, selected);
+ list_window_get_range(browser.lw, &range);
+ for (unsigned i = range.start; i < range.end; ++i) {
+ struct filelist_entry *entry =
+ filelist_get(browser.filelist, i);
if( entry==NULL || entry->entity==NULL )
continue;
return 0;
}
- if (!mpd_run_rm(c->connection, mpd_playlist_get_path(playlist))) {
+ if (!mpd_run_rm(connection, mpd_playlist_get_path(playlist))) {
mpdclient_handle_error(c);
break;
}
static void
screen_file_resize(int cols, int rows)
{
- browser.lw->cols = cols;
- browser.lw->rows = rows;
+ list_window_resize(browser.lw, cols, rows);
}
static void
static void
screen_file_paint(void)
{
- list_window_paint(browser.lw, browser_lw_callback, browser.filelist);
+ screen_browser_paint(&browser);
}
static void
if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_STORED_PLAYLIST)) {
/* the db has changed -> update the filelist */
screen_file_reload(c);
- list_window_check_selected(browser.lw,
- filelist_length(browser.filelist));
}
#ifndef NCMPC_MINI
#ifndef NCMPC_MINI
screen_browser_sync_highlights(browser.filelist, &c->playlist);
#endif
- list_window_check_selected(browser.lw,
- filelist_length(browser.filelist));
screen_file_repaint();
return false;
if (i < 0)
i = 0;
- list_window_set_selected(browser.lw, i);
+ list_window_set_cursor(browser.lw, i);
/* finally, switch to the file screen */
screen_switch(&screen_browse, c);