diff --git a/src/screen_file.c b/src/screen_file.c
index c8468cc810fd665001154e20990446f81c61e041..ab2af071321c506c03d55ff164a58e2f7a421f25 100644 (file)
--- a/src/screen_file.c
+++ b/src/screen_file.c
*
*/
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-#include <ncurses.h>
-
#include "config.h"
#include "ncmpc.h"
#include "options.h"
#include "screen_browse.h"
#include "screen_play.h"
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glib.h>
+#include <ncurses.h>
+
#define USE_OLD_LAYOUT
#undef USE_OLD_ADD
/* clear the highlight flag for all items in the filelist */
void
-clear_highlights(mpdclient_filelist_t *filelist)
+clear_highlights(mpdclient_filelist_t *fl)
{
- GList *list = g_list_first(filelist->list);
+ GList *list = g_list_first(fl->list);
while( list ) {
filelist_entry_t *entry = list->data;
/* change the highlight flag for a song */
void
-set_highlight(mpdclient_filelist_t *filelist, mpd_Song *song, int highlight)
+set_highlight(mpdclient_filelist_t *fl, mpd_Song *song, int highlight)
{
- GList *list = g_list_first(filelist->list);
+ GList *list = g_list_first(fl->list);
if( !song )
return;
/* sync highlight flags with playlist */
void
-sync_highlights(mpdclient_t *c, mpdclient_filelist_t *filelist)
+sync_highlights(mpdclient_t *c, mpdclient_filelist_t *fl)
{
- GList *list = g_list_first(filelist->list);
+ GList *list = g_list_first(fl->list);
while(list) {
filelist_entry_t *entry = list->data;
}
/* list_window callback */
-char *
-browse_lw_callback(int index, int *highlight, void *data)
+const char *
+browse_lw_callback(int idx, int *highlight, void *data)
{
static char buf[BUFSIZE];
- mpdclient_filelist_t *filelist = (mpdclient_filelist_t *) data;
+ mpdclient_filelist_t *fl = (mpdclient_filelist_t *) data;
filelist_entry_t *entry;
mpd_InfoEntity *entity;
*highlight = 0;
- if( (entry=(filelist_entry_t *)g_list_nth_data(filelist->list,index))==NULL )
+ if( (entry=(filelist_entry_t *)g_list_nth_data(fl->list,idx))==NULL )
return NULL;
entity = entry->entity;
if( entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY ) {
mpd_Directory *dir = entity->info.directory;
- char *dirname = utf8_to_locale(basename(dir->path));
+ char *directory = utf8_to_locale(basename(dir->path));
- g_snprintf(buf, BUFSIZE, "[%s]", dirname);
- g_free(dirname);
+ 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;
/* chdir */
static int
change_directory(screen_t *screen, mpdclient_t *c, filelist_entry_t *entry,
- char *new_path)
+ const char *new_path)
{
mpd_InfoEntity *entity = NULL;
gchar *path = NULL;
static int
enqueue_and_play(screen_t *screen, mpdclient_t *c, filelist_entry_t *entry)
{
- int index;
+ int idx;
mpd_InfoEntity *entity = entry->entity;
mpd_Song *song = entity->info.song;
return -1;
}
- index = playlist_get_index_from_file(c, song->file);
- mpdclient_cmd_play(c, index);
+ idx = playlist_get_index_from_file(c, song->file);
+ mpdclient_cmd_play(c, idx);
return 0;
}
int
browse_handle_enter(screen_t *screen,
mpdclient_t *c,
- list_window_t *lw,
- mpdclient_filelist_t *filelist)
+ list_window_t *local_lw,
+ mpdclient_filelist_t *fl)
{
filelist_entry_t *entry;
mpd_InfoEntity *entity;
- if ( filelist==NULL )
+ if ( fl==NULL )
return -1;
- entry = ( filelist_entry_t *) g_list_nth_data(filelist->list, lw->selected);
+ entry = ( filelist_entry_t *) g_list_nth_data(fl->list, local_lw->selected);
if( entry==NULL )
return -1;
int
browse_handle_select(screen_t *screen,
mpdclient_t *c,
- list_window_t *lw,
- mpdclient_filelist_t *filelist)
+ list_window_t *local_lw,
+ mpdclient_filelist_t *fl)
{
filelist_entry_t *entry;
- if ( filelist==NULL )
+ if ( fl==NULL )
return -1;
- entry=( filelist_entry_t *) g_list_nth_data(filelist->list, lw->selected);
+ entry=( filelist_entry_t *) g_list_nth_data(fl->list,
+ local_lw->selected);
if( entry==NULL || entry->entity==NULL)
return -1;
mpd_Song *song = entry->entity->info.song;
if( song ) {
- int index = playlist_get_index_from_file(c, song->file);
+ int idx = playlist_get_index_from_file(c, song->file);
- while( (index=playlist_get_index_from_file(c, song->file))>=0 )
- mpdclient_cmd_delete(c, index);
+ while( (idx=playlist_get_index_from_file(c, song->file))>=0 )
+ mpdclient_cmd_delete(c, idx);
}
}
}
int
browse_handle_select_all (screen_t *screen,
mpdclient_t *c,
- list_window_t *lw,
- mpdclient_filelist_t *filelist)
+ list_window_t *local_lw,
+ mpdclient_filelist_t *fl)
{
filelist_entry_t *entry;
- GList *temp = filelist->list;
+ GList *temp = fl->list;
- if ( filelist==NULL )
+ if ( fl==NULL )
return -1;
- for (filelist->list = g_list_first(filelist->list);
- filelist->list;
- filelist->list = g_list_next(filelist->list)) {
- entry=( filelist_entry_t *) filelist->list->data;
+ for (fl->list = g_list_first(fl->list);
+ fl->list;
+ fl->list = g_list_next(fl->list)) {
+ entry=( filelist_entry_t *) fl->list->data;
if( entry==NULL || entry->entity==NULL)
return -1;
mpd_Song *song = entry->entity->info.song;
if( song ) {
- int index = playlist_get_index_from_file(c, song->file);
+ int idx = playlist_get_index_from_file(c, song->file);
- while( (index=playlist_get_index_from_file(c, song->file))>=0 )
- mpdclient_cmd_delete(c, index);
+ while( (idx=playlist_get_index_from_file(c, song->file))>=0 )
+ mpdclient_cmd_delete(c, idx);
}
}
}
return 0;
}
- filelist->list = temp;
+ fl->list = temp;
return 0;
}
{
}
-static char *
+static const char *
browse_title(char *str, size_t size)
{
char *pathcopy;
int
browse_handle_mouse_event(screen_t *screen,
mpdclient_t *c,
- list_window_t *lw,
- mpdclient_filelist_t *filelist)
+ list_window_t *local_lw,
+ mpdclient_filelist_t *fl)
{
int row;
- int prev_selected = lw->selected;
+ int prev_selected = local_lw->selected;
unsigned long bstate;
int length;
- if ( filelist )
- length = filelist->length;
+ if ( fl )
+ length = fl->length;
else
length = 0;
- if( screen_get_mouse_event(c, lw, length, &bstate, &row) )
+ if( screen_get_mouse_event(c, local_lw, length, &bstate, &row) )
return 1;
- lw->selected = lw->start+row;
- list_window_check_selected(lw, length);
+ local_lw->selected = local_lw->start+row;
+ list_window_check_selected(local_lw, length);
if( bstate & BUTTON1_CLICKED ) {
- if( prev_selected == lw->selected )
- browse_handle_enter(screen, c, lw, filelist);
+ if( prev_selected == local_lw->selected )
+ browse_handle_enter(screen, c, local_lw, fl);
} else if( bstate & BUTTON3_CLICKED ) {
- if( prev_selected == lw->selected )
- browse_handle_select(screen, c, lw, filelist);
+ if( prev_selected == local_lw->selected )
+ browse_handle_select(screen, c, local_lw, fl);
}
return 1;
return list_window_cmd(lw, filelist->length, cmd);
}
-list_window_t *
-get_filelist_window()
+static list_window_t *
+get_filelist_window(void)
{
return lw;
}