replaced get_screen_X() with static screen_functions variable

[ncmpc.git] / src / screen_play.c

diff --git a/src/screen_play.c b/src/screen_play.c
index a1bb369e66cb93e5c3f59e7417126b2701fb6919..22d7198aa7e685f9e7831f3f9fbd3a92f8a3d91e 100644 (file)
--- a/src/screen_play.c
+++ b/src/screen_play.c
@@ -31,6 +31,7 @@
 #include "screen.h"
 #include "screen_utils.h"
 #include "screen_play.h"
+#include "gcc.h"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -69,11 +70,11 @@ playlist_changed_callback(mpdclient_t *c, int event, gpointer data)
        /* make shure the playlist is repainted */
        lw->clear = 1;
        lw->repaint = 1;
-       list_window_check_selected(lw, c->playlist.length);
+       list_window_check_selected(lw, c->playlist.list->len);
 }
 
 static const char *
-list_callback(int idx, int *highlight, void *data)
+list_callback(unsigned idx, int *highlight, void *data)
 {
        static char songname[MAX_SONG_LENGTH];
        mpdclient_t *c = (mpdclient_t *) data;
@@ -92,10 +93,10 @@ list_callback(int idx, int *highlight, void *data)
 }
 
 static int
-center_playing_item(screen_t *screen, mpdclient_t *c)
+center_playing_item(mpdclient_t *c)
 {
-       int length = c->playlist.length;
-       int offset = lw->selected - lw->start;
+       unsigned length = c->playlist.list->len;
+       unsigned offset = lw->selected - lw->start;
        int idx;
 
        if (!lw || !c->song || length<lw->rows ||
@@ -105,11 +106,12 @@ center_playing_item(screen_t *screen, mpdclient_t *c)
        /* try to center the song that are playing */
        idx = playlist_get_index(c, c->song);
        D("Autocenter song id:%d pos:%d index:%d\n", c->song->id,c->song->pos,idx);
-       lw->start = idx - (lw->rows / 2);
-       if (lw->start + lw->rows > length)
-               lw->start = length - lw->rows;
-       if (lw->start < 0)
-               lw->start = 0;
+       idx -= (lw->rows / 2);
+       if (idx + (int)lw->rows > (int)length)
+               idx = length - lw->rows;
+       if (idx < 0)
+               idx = 0;
+       lw->start = idx;
 
        /* make sure the cursor is in the window */
        lw->selected = lw->start+offset;
@@ -122,7 +124,7 @@ center_playing_item(screen_t *screen, mpdclient_t *c)
 }
 
 static void
-save_pre_completion_cb(GCompletion *gcmp, gchar *line, void *data)
+save_pre_completion_cb(GCompletion *gcmp, mpd_unused gchar *line, void *data)
 {
        completion_callback_data_t *tmp = (completion_callback_data_t *)data;
        GList **list = tmp->list;
@@ -136,8 +138,8 @@ save_pre_completion_cb(GCompletion *gcmp, gchar *line, void *data)
 }
 
 static void
-save_post_completion_cb(GCompletion *gcmp, gchar *line, GList *items,
-                       void *data)
+save_post_completion_cb(mpd_unused GCompletion *gcmp, mpd_unused gchar *line,
+                       GList *items, void *data)
 {
        completion_callback_data_t *tmp = (completion_callback_data_t *)data;
        screen_t *screen = tmp->screen;
@@ -335,7 +337,7 @@ play_init(WINDOW *w, int cols, int rows)
 }
 
 static void
-play_open(screen_t *screen, mpdclient_t *c)
+play_open(mpd_unused screen_t *screen, mpdclient_t *c)
 {
        static gboolean install_cb = TRUE;
 
@@ -370,7 +372,7 @@ play_title(char *str, size_t size)
 }
 
 static void
-play_paint(screen_t *screen, mpdclient_t *c)
+play_paint(mpd_unused screen_t *screen, mpdclient_t *c)
 {
        lw->clear = 1;
 
@@ -394,15 +396,15 @@ play_update(screen_t *screen, mpdclient_t *c)
                static int prev_song_id = 0;
 
                if( c->song && prev_song_id != c->song->id ) {
-                       center_playing_item(screen, c);
+                       center_playing_item(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 )
+               if (lw->selected >= c->playlist.list->len)
+                       lw->selected = c->playlist.list->len - 1;
+               if (lw->start >= c->playlist.list->len)
                        list_window_reset(lw);
 
                play_paint(screen, c);
@@ -416,13 +418,13 @@ play_update(screen_t *screen, mpdclient_t *c)
 
 #ifdef HAVE_GETMOUSE
 static int
-handle_mouse_event(screen_t *screen, mpdclient_t *c)
+handle_mouse_event(mpd_unused screen_t *screen, mpdclient_t *c)
 {
        int row;
-       int selected;
+       unsigned selected;
        unsigned long bstate;
 
-       if (screen_get_mouse_event(c, lw, c->playlist.length, &bstate, &row))
+       if (screen_get_mouse_event(c, lw, c->playlist.list->len, &bstate, &row))
                return 1;
 
        if (bstate & BUTTON1_DOUBLE_CLICKED) {
@@ -435,7 +437,7 @@ handle_mouse_event(screen_t *screen, mpdclient_t *c)
 
        if (bstate & BUTTON1_CLICKED) {
                /* play */
-               if (lw->start + row < c->playlist.length)
+               if (lw->start + row < c->playlist.list->len)
                        mpdclient_cmd_play(c, lw->start + row);
        } else if (bstate & BUTTON3_CLICKED) {
                /* delete */
@@ -444,7 +446,7 @@ handle_mouse_event(screen_t *screen, mpdclient_t *c)
        }
 
        lw->selected = selected;
-       list_window_check_selected(lw, c->playlist.length);
+       list_window_check_selected(lw, c->playlist.list->len);
 
        return 1;
 }
@@ -472,7 +474,7 @@ play_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
                screen->painted = 0;
                lw->clear = 1;
                lw->repaint = 1;
-               center_playing_item(screen, c);
+               center_playing_item(c);
                return 1;
        case CMD_LIST_MOVE_UP:
                mpdclient_cmd_move(c, lw->selected, lw->selected-1);
@@ -485,14 +487,14 @@ play_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
        case CMD_LIST_FIND_NEXT:
        case CMD_LIST_RFIND_NEXT:
                return screen_find(screen,
-                                  lw, c->playlist.length,
+                                  lw, c->playlist.list->len,
                                   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) ;
+       return list_window_cmd(lw, c->playlist.list->len, cmd);
 }
 
 static list_window_t *
@@ -501,22 +503,15 @@ play_lw(void)
   return lw;
 }
 
-screen_functions_t *
-get_screen_playlist(void)
-{
-  static screen_functions_t functions;
-
-  memset(&functions, 0, sizeof(screen_functions_t));
-  functions.init   = play_init;
-  functions.exit   = play_exit;
-  functions.open   = play_open;
-  functions.close  = NULL;
-  functions.resize = play_resize;
-  functions.paint  = play_paint;
-  functions.update = play_update;
-  functions.cmd    = play_cmd;
-  functions.get_lw = play_lw;
-  functions.get_title = play_title;
-
-  return &functions;
-}
+const struct screen_functions screen_playlist = {
+       .init = play_init,
+       .exit = play_exit,
+       .open = play_open,
+       .close = NULL,
+       .resize = play_resize,
+       .paint = play_paint,
+       .update = play_update,
+       .cmd = play_cmd,
+       .get_lw = play_lw,
+       .get_title = play_title,
+};