From 6d3b7cdd62d798521d73ac58d57bd67061d64ba5 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 15 Sep 2008 12:27:26 +0200 Subject: code style, indent with tabs Follow the same code style als MPD itself. This patch only fixes parts of the code which are going to be touched in the following bunch of patches, i.e. there will be more "code style" patches in the future. --- src/screen_play.c | 392 +++++++++++++++++++++++++----------------------------- 1 file changed, 184 insertions(+), 208 deletions(-) (limited to 'src/screen_play.c') diff --git a/src/screen_play.c b/src/screen_play.c index c9bc84e19..f94b5fbfe 100644 --- a/src/screen_play.c +++ b/src/screen_play.c @@ -50,109 +50,102 @@ typedef struct static list_window_t *lw = NULL; -static void +static void playlist_changed_callback(mpdclient_t *c, int event, gpointer data) { - D("screen_play.c> playlist_callback() [%d]\n", event); - switch(event) - { - case PLAYLIST_EVENT_DELETE: - break; - case PLAYLIST_EVENT_MOVE: - lw->selected = *((int *) data); - if( lw->selectedstart ) - lw->start--; - break; - default: - break; - } - /* make shure the playlist is repainted */ - lw->clear = 1; - lw->repaint = 1; - list_window_check_selected(lw, c->playlist.length); + D("screen_play.c> playlist_callback() [%d]\n", event); + switch(event) { + case PLAYLIST_EVENT_DELETE: + break; + case PLAYLIST_EVENT_MOVE: + lw->selected = *((int *) data); + if( lw->selectedstart ) + lw->start--; + break; + default: + break; + } + /* make shure the playlist is repainted */ + lw->clear = 1; + lw->repaint = 1; + list_window_check_selected(lw, c->playlist.length); } static char * list_callback(int index, int *highlight, void *data) { - static char songname[MAX_SONG_LENGTH]; - mpdclient_t *c = (mpdclient_t *) data; - mpd_Song *song; + static char songname[MAX_SONG_LENGTH]; + mpdclient_t *c = (mpdclient_t *) data; + mpd_Song *song; - *highlight = 0; - if( (song=playlist_get_song(c, index)) == NULL ) - { - return NULL; - } + *highlight = 0; + if( (song=playlist_get_song(c, index)) == NULL ) { + return NULL; + } - if( c->song && song->id==c->song->id && !IS_STOPPED(c->status->state) ) - { - *highlight = 1; - } - strfsong(songname, MAX_SONG_LENGTH, LIST_FORMAT, song); - return songname; + if( c->song && song->id==c->song->id && !IS_STOPPED(c->status->state) ) { + *highlight = 1; + } + strfsong(songname, MAX_SONG_LENGTH, LIST_FORMAT, song); + return songname; } static int center_playing_item(screen_t *screen, mpdclient_t *c) { - int length = c->playlist.length; - int offset = lw->selected-lw->start; - int index; - - if( !lw || !c->song || lengthrows || IS_STOPPED(c->status->state) ) - return 0; - - /* try to center the song that are playing */ - index = playlist_get_index(c, c->song); - D("Autocenter song id:%d pos:%d index:%d\n", c->song->id,c->song->pos,index); - lw->start = index-(lw->rows/2); - if( lw->start+lw->rows > length ) - lw->start = length-lw->rows; - if( lw->start<0 ) - lw->start=0; - - /* make sure the cursor is in the window */ - lw->selected = lw->start+offset; - list_window_check_selected(lw, length); - - lw->clear = 1; - lw->repaint = 1; - - return 0; + int length = c->playlist.length; + int offset = lw->selected - lw->start; + int index; + + if (!lw || !c->song || lengthrows || + IS_STOPPED(c->status->state)) + return 0; + + /* try to center the song that are playing */ + index = playlist_get_index(c, c->song); + D("Autocenter song id:%d pos:%d index:%d\n", c->song->id,c->song->pos,index); + lw->start = index - (lw->rows / 2); + if (lw->start + lw->rows > length) + lw->start = length - lw->rows; + if (lw->start < 0) + lw->start = 0; + + /* make sure the cursor is in the window */ + lw->selected = lw->start+offset; + list_window_check_selected(lw, length); + + lw->clear = 1; + lw->repaint = 1; + + return 0; } +void save_pre_completion_cb(GCompletion *gcmp, gchar *line, void *data) +{ + completion_callback_data_t *tmp = (completion_callback_data_t *)data; + GList **list = tmp->list; + mpdclient_t *c = tmp->c; + + if( *list == NULL ) { + /* create completion list */ + *list = gcmp_list_from_path(c, "", NULL, GCMP_TYPE_PLAYLIST); + g_completion_add_items(gcmp, *list); + } +} +void save_post_completion_cb(GCompletion *gcmp, gchar *line, GList *items, + void *data) +{ + completion_callback_data_t *tmp = (completion_callback_data_t *)data; + screen_t *screen = tmp->screen; + if( g_list_length(items)>=1 ) { + screen_display_completion_list(screen, items); + lw->clear = 1; + lw->repaint = 1; + } +} - -void save_pre_completion_cb(GCompletion *gcmp, gchar *line, void *data) - { - completion_callback_data_t *tmp = (completion_callback_data_t *)data; - GList **list = tmp->list; - mpdclient_t *c = tmp->c; - - if( *list == NULL ) - { - /* create completion list */ - *list = gcmp_list_from_path(c, "", NULL, GCMP_TYPE_PLAYLIST); - g_completion_add_items(gcmp, *list); - } - } - - void save_post_completion_cb(GCompletion *gcmp, gchar *line, GList *items, - void *data) - { - completion_callback_data_t *tmp = (completion_callback_data_t *)data; - screen_t *screen = tmp->screen; - - if( g_list_length(items)>=1 ) - { - screen_display_completion_list(screen, items); - lw->clear = 1; - lw->repaint = 1; - } - } int playlist_save(screen_t *screen, mpdclient_t *c, char *name, char *defaultname) { @@ -335,135 +328,122 @@ handle_add_to_playlist(screen_t *screen, mpdclient_t *c) static void play_init(WINDOW *w, int cols, int rows) { - lw = list_window_init(w, cols, rows); + lw = list_window_init(w, cols, rows); } static void play_open(screen_t *screen, mpdclient_t *c) { - static gboolean install_cb = TRUE; + static gboolean install_cb = TRUE; - if( install_cb ) - { - mpdclient_install_playlist_callback(c, playlist_changed_callback); - install_cb = FALSE; - } + if (install_cb) { + mpdclient_install_playlist_callback(c, playlist_changed_callback); + install_cb = FALSE; + } } static void play_resize(int cols, int rows) { - lw->cols = cols; - lw->rows = rows; + lw->cols = cols; + lw->rows = rows; } static void play_exit(void) { - list_window_free(lw); + list_window_free(lw); } static char * play_title(char *str, size_t size) { - if( strcmp(options.host, "localhost") == 0 ) - return _("Playlist"); - - g_snprintf(str, size, _("Playlist on %s"), options.host); + if( strcmp(options.host, "localhost") == 0 ) + return _("Playlist"); - return str; + g_snprintf(str, size, _("Playlist on %s"), options.host); + return str; } static void play_paint(screen_t *screen, mpdclient_t *c) -{ - lw->clear = 1; +{ + lw->clear = 1; - list_window_paint(lw, list_callback, (void *) c); - wnoutrefresh(lw->w); + list_window_paint(lw, list_callback, (void *) c); + wnoutrefresh(lw->w); } static void play_update(screen_t *screen, mpdclient_t *c) { - /* hide the cursor when mpd are playing and the user are inactive */ - if( options.hide_cursor>0 && c->status->state == MPD_STATUS_STATE_PLAY && - time(NULL)-screen->input_timestamp >= options.hide_cursor ) - { - lw->flags |= LW_HIDE_CURSOR; - } - else - { - lw->flags &= ~LW_HIDE_CURSOR; - } - - /* center the cursor */ - if( options.auto_center ) - { - static int prev_song_id = 0; - - if( c->song && prev_song_id != c->song->id ) - { - center_playing_item(screen, c); - prev_song_id = c->song->id; + /* hide the cursor when mpd are playing and the user are inactive */ + if( options.hide_cursor>0 && c->status->state == MPD_STATUS_STATE_PLAY && + time(NULL)-screen->input_timestamp >= options.hide_cursor ) { + lw->flags |= LW_HIDE_CURSOR; + } else { + lw->flags &= ~LW_HIDE_CURSOR; } - } - if( c->playlist.updated ) - { - if( lw->selected >= c->playlist.length ) - lw->selected = c->playlist.length-1; - if( lw->start >= c->playlist.length ) - list_window_reset(lw); + /* center the cursor */ + if( options.auto_center ) { + static int prev_song_id = 0; - play_paint(screen, c); - c->playlist.updated = FALSE; - } - else if( lw->repaint || 1) - { - list_window_paint(lw, list_callback, (void *) c); - wnoutrefresh(lw->w); - lw->repaint = 0; - } + if( c->song && prev_song_id != c->song->id ) { + center_playing_item(screen, c); + prev_song_id = c->song->id; + } + } + + if( c->playlist.updated ) { + if( lw->selected >= c->playlist.length ) + lw->selected = c->playlist.length-1; + if( lw->start >= c->playlist.length ) + list_window_reset(lw); + + play_paint(screen, c); + c->playlist.updated = FALSE; + } else if( lw->repaint || 1) { + list_window_paint(lw, list_callback, (void *) c); + wnoutrefresh(lw->w); + lw->repaint = 0; + } } #ifdef HAVE_GETMOUSE static int handle_mouse_event(screen_t *screen, mpdclient_t *c) { - int row; - int selected; - unsigned long bstate; + int row; + int selected; + unsigned long bstate; - if( screen_get_mouse_event(c, lw, c->playlist.length, &bstate, &row) ) - return 1; + if (screen_get_mouse_event(c, lw, c->playlist.length, &bstate, &row)) + return 1; - if( bstate & BUTTON1_DOUBLE_CLICKED ) - { - /* stop */ - screen_cmd(c, CMD_STOP); - return 1; - } + if (bstate & BUTTON1_DOUBLE_CLICKED) { + /* stop */ + screen_cmd(c, CMD_STOP); + return 1; + } - selected = lw->start+row; + selected = lw->start + row; - if( bstate & BUTTON1_CLICKED ) - { - /* play */ - if( lw->start+row < c->playlist.length ) - mpdclient_cmd_play(c, lw->start+row); - } - else if( bstate & BUTTON3_CLICKED ) - { - /* delete */ - if( selected == lw->selected ) - mpdclient_cmd_delete(c, lw->selected); - } - lw->selected = selected; - list_window_check_selected(lw, c->playlist.length); + if (bstate & BUTTON1_CLICKED) { + /* play */ + if (lw->start + row < c->playlist.length) + mpdclient_cmd_play(c, lw->start + row); + } else if (bstate & BUTTON3_CLICKED) { + /* delete */ + if (selected == lw->selected) + mpdclient_cmd_delete(c, lw->selected); + } + + lw->selected = selected; + list_window_check_selected(lw, c->playlist.length); - return 1; + return 1; } #else #define handle_mouse_event(s,c) (0) @@ -472,56 +452,52 @@ handle_mouse_event(screen_t *screen, mpdclient_t *c) static int play_cmd(screen_t *screen, mpdclient_t *c, command_t cmd) { - switch(cmd) - { - case CMD_PLAY: - mpdclient_cmd_play(c, lw->selected); - return 1; - case CMD_DELETE: - mpdclient_cmd_delete(c, lw->selected); - return 1; - case CMD_SAVE_PLAYLIST: - playlist_save(screen, c, NULL, NULL); - return 1; - case CMD_ADD: - handle_add_to_playlist(screen, c); - return 1; - case CMD_SCREEN_UPDATE: - screen->painted = 0; - lw->clear = 1; - lw->repaint = 1; - center_playing_item(screen, c); - return 1; - case CMD_LIST_MOVE_UP: - mpdclient_cmd_move(c, lw->selected, lw->selected-1); - return 1; - case CMD_LIST_MOVE_DOWN: - mpdclient_cmd_move(c, lw->selected, lw->selected+1); - return 1; - case CMD_LIST_FIND: - case CMD_LIST_RFIND: - case CMD_LIST_FIND_NEXT: - case CMD_LIST_RFIND_NEXT: - return screen_find(screen, - lw, c->playlist.length, - cmd, list_callback, (void *) c); - case CMD_MOUSE_EVENT: - return handle_mouse_event(screen,c); - default: - break; - } - return list_window_cmd(lw, c->playlist.length, cmd) ; + switch(cmd) { + case CMD_PLAY: + mpdclient_cmd_play(c, lw->selected); + return 1; + case CMD_DELETE: + mpdclient_cmd_delete(c, lw->selected); + return 1; + case CMD_SAVE_PLAYLIST: + playlist_save(screen, c, NULL, NULL); + return 1; + case CMD_ADD: + handle_add_to_playlist(screen, c); + return 1; + case CMD_SCREEN_UPDATE: + screen->painted = 0; + lw->clear = 1; + lw->repaint = 1; + center_playing_item(screen, c); + return 1; + case CMD_LIST_MOVE_UP: + mpdclient_cmd_move(c, lw->selected, lw->selected-1); + return 1; + case CMD_LIST_MOVE_DOWN: + mpdclient_cmd_move(c, lw->selected, lw->selected+1); + return 1; + case CMD_LIST_FIND: + case CMD_LIST_RFIND: + case CMD_LIST_FIND_NEXT: + case CMD_LIST_RFIND_NEXT: + return screen_find(screen, + lw, c->playlist.length, + cmd, list_callback, (void *) c); + case CMD_MOUSE_EVENT: + return handle_mouse_event(screen,c); + default: + break; + } + return list_window_cmd(lw, c->playlist.length, cmd) ; } - - static list_window_t * play_lw(void) { return lw; } - screen_functions_t * get_screen_playlist(void) { -- cgit v1.2.3