diff options
| author | Max Kellermann <max@duempel.org> | 2008-09-25 21:21:27 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-09-25 21:21:27 +0200 |
| commit | 5c752834b88e5f956e535da674f5a712757f69e7 (patch) | |
| tree | 3770be36290121e009021c38ec882043f10d458f | |
| parent | 9791d3094719f1ed6c3c8ecf9c006b81d0de5370 (diff) | |
| download | mpd-5c752834b88e5f956e535da674f5a712757f69e7.tar.gz mpd-5c752834b88e5f956e535da674f5a712757f69e7.tar.xz mpd-5c752834b88e5f956e535da674f5a712757f69e7.zip | |
screen: removed screen ids
Finally remove all screen ids, they are not used anymore.
Diffstat (limited to '')
| -rw-r--r-- | src/screen_list.c | 23 | ||||
| -rw-r--r-- | src/screen_list.h | 11 |
2 files changed, 7 insertions, 27 deletions
diff --git a/src/screen_list.c b/src/screen_list.c index 76ae8b155..fddeeb025 100644 --- a/src/screen_list.c +++ b/src/screen_list.c @@ -24,24 +24,23 @@ static const struct { - int id; const char *name; const struct screen_functions *functions; } screens[] = { - { SCREEN_PLAYLIST_ID, "playlist", &screen_playlist }, - { SCREEN_BROWSE_ID, "browse", &screen_browse }, + { "playlist", &screen_playlist }, + { "browse", &screen_browse }, #ifdef ENABLE_ARTIST_SCREEN - { SCREEN_ARTIST_ID, "artist", &screen_artist }, + { "artist", &screen_artist }, #endif - { SCREEN_HELP_ID, "help", &screen_help }, + { "help", &screen_help }, #ifdef ENABLE_SEARCH_SCREEN - { SCREEN_SEARCH_ID, "search", &screen_search }, + { "search", &screen_search }, #endif #ifdef ENABLE_KEYDEF_SCREEN - { SCREEN_KEYDEF_ID, "keydef", &screen_keydef }, + { "keydef", &screen_keydef }, #endif #ifdef ENABLE_LYRICS_SCREEN - { SCREEN_LYRICS_ID, "lyrics", &screen_lyrics }, + { "lyrics", &screen_lyrics }, #endif }; @@ -106,14 +105,6 @@ screen_lookup_name(const char *name) return NULL; } -const struct screen_functions * -screen_get_functions(unsigned i) -{ - assert(i < NUM_SCREENS); - - return screens[i].functions; -} - int lookup_mode(const struct screen_functions *sf) { diff --git a/src/screen_list.h b/src/screen_list.h index 763b4ee9b..583c225b0 100644 --- a/src/screen_list.h +++ b/src/screen_list.h @@ -24,14 +24,6 @@ #include <ncurses.h> -#define SCREEN_PLAYLIST_ID 0 -#define SCREEN_BROWSE_ID 1 -#define SCREEN_ARTIST_ID 2 -#define SCREEN_HELP_ID 100 -#define SCREEN_KEYDEF_ID 101 -#define SCREEN_SEARCH_ID 103 -#define SCREEN_LYRICS_ID 104 - extern const struct screen_functions screen_playlist; extern const struct screen_functions screen_browse; #ifdef ENABLE_ARTIST_SCREEN @@ -66,9 +58,6 @@ screen_lookup_name(const char *name); int screen_get_id(const char *name); -const struct screen_functions * -screen_get_functions(unsigned i); - int lookup_mode(const struct screen_functions *sf); |