From a33f98d90779740c49987bd825ceb560c0ffb1f5 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 24 Dec 2011 17:27:39 +0100 Subject: Avoid struct padding where possible Pointed out by -Wpadding. Does not decrease memory usage/binary size though. --- src/ui_dispatch.h | 61 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 30 deletions(-) (limited to 'src/ui_dispatch.h') diff --git a/src/ui_dispatch.h b/src/ui_dispatch.h index 4a5f791..e8c9944 100644 --- a/src/ui_dispatch.h +++ b/src/ui_dispatch.h @@ -39,10 +39,10 @@ typedef void (*BarKeyShortcutFunc_t) (BarApp_t *, PianoStation_t *, PianoSong_t *, BarUiDispatchContext_t); typedef struct { + char defaultKey; BarUiDispatchContext_t context; BarKeyShortcutFunc_t function; const char * const helpText; - char defaultKey; const char * const configKey; } BarUiDispatchAction_t; @@ -50,49 +50,50 @@ typedef struct { /* see settings.h */ static const BarUiDispatchAction_t dispatchActions[BAR_KS_COUNT] = { - {BAR_DC_UNDEFINED, BarUiActHelp, NULL, '?', "act_help"}, - {BAR_DC_SONG, BarUiActLoveSong, "love song", '+', + {'?', BAR_DC_UNDEFINED, BarUiActHelp, NULL, "act_help"}, + {'+', BAR_DC_SONG, BarUiActLoveSong, "love song", "act_songlove"}, - {BAR_DC_SONG, BarUiActBanSong, "ban song", '-', "act_songban"}, - {BAR_DC_STATION, BarUiActAddMusic, "add music to station", 'a', + {'-', BAR_DC_SONG, BarUiActBanSong, "ban song", "act_songban"}, + {'a', BAR_DC_STATION, BarUiActAddMusic, "add music to station", "act_stationaddmusic"}, - {BAR_DC_GLOBAL, BarUiActCreateStation, "create new station", 'c', + {'c', BAR_DC_GLOBAL, BarUiActCreateStation, "create new station", "act_stationcreate"}, - {BAR_DC_STATION, BarUiActDeleteStation, "delete station", 'd', + {'d', BAR_DC_STATION, BarUiActDeleteStation, "delete station", "act_stationdelete"}, - {BAR_DC_SONG, BarUiActExplain, "explain why this song is played", 'e', + {'e', BAR_DC_SONG, BarUiActExplain, "explain why this song is played", "act_songexplain"}, - {BAR_DC_GLOBAL, BarUiActStationFromGenre, "add genre station", 'g', + {'g', BAR_DC_GLOBAL, BarUiActStationFromGenre, "add genre station", "act_stationaddbygenre"}, - {BAR_DC_GLOBAL, BarUiActHistory, "song history", 'h', "act_history"}, - {BAR_DC_GLOBAL | BAR_DC_STATION | BAR_DC_SONG, BarUiActSongInfo, - "print information about song/station", 'i', - "act_songinfo"}, - {BAR_DC_GLOBAL, BarUiActAddSharedStation, "add shared station", 'j', + {'h', BAR_DC_GLOBAL, BarUiActHistory, "song history", "act_history"}, + {'i', BAR_DC_GLOBAL | BAR_DC_STATION | BAR_DC_SONG, BarUiActSongInfo, + "print information about song/station", "act_songinfo"}, + {'j', BAR_DC_GLOBAL, BarUiActAddSharedStation, "add shared station", "act_addshared"}, - {BAR_DC_SONG, BarUiActMoveSong, "move song to different station", 'm', + {'m', BAR_DC_SONG, BarUiActMoveSong, "move song to different station", "act_songmove"}, - {BAR_DC_GLOBAL | BAR_DC_STATION, BarUiActSkipSong, "next song", 'n', "act_songnext"}, - {BAR_DC_GLOBAL | BAR_DC_STATION, BarUiActPause, "pause/continue", 'p', "act_songpause"}, - {BAR_DC_GLOBAL, BarUiActQuit, "quit", 'q', "act_quit"}, - {BAR_DC_STATION, BarUiActRenameStation, "rename station", 'r', + {'n', BAR_DC_GLOBAL | BAR_DC_STATION, BarUiActSkipSong, "next song", + "act_songnext"}, + {'p', BAR_DC_GLOBAL | BAR_DC_STATION, BarUiActPause, "pause/continue", + "act_songpause"}, + {'q', BAR_DC_GLOBAL, BarUiActQuit, "quit", "act_quit"}, + {'r', BAR_DC_STATION, BarUiActRenameStation, "rename station", "act_stationrename"}, - {BAR_DC_GLOBAL, BarUiActSelectStation, "change station", 's', + {'s', BAR_DC_GLOBAL, BarUiActSelectStation, "change station", "act_stationchange"}, - {BAR_DC_SONG, BarUiActTempBanSong, "tired (ban song for 1 month)", 't', + {'t', BAR_DC_SONG, BarUiActTempBanSong, "tired (ban song for 1 month)", "act_songtired"}, - {BAR_DC_GLOBAL | BAR_DC_STATION, BarUiActPrintUpcoming, "upcoming songs", 'u', - "act_upcoming"}, - {BAR_DC_STATION, BarUiActSelectQuickMix, "select quickmix stations", - 'x', "act_stationselectquickmix"}, - {BAR_DC_GLOBAL, BarUiActDebug, NULL, '$', "act_debug"}, - {BAR_DC_SONG, BarUiActBookmark, "bookmark song/artist", 'b', + {'u', BAR_DC_GLOBAL | BAR_DC_STATION, BarUiActPrintUpcoming, + "upcoming songs", "act_upcoming"}, + {'x', BAR_DC_STATION, BarUiActSelectQuickMix, "select quickmix stations", + "act_stationselectquickmix"}, + {'$', BAR_DC_GLOBAL, BarUiActDebug, NULL, "act_debug"}, + {'b', BAR_DC_SONG, BarUiActBookmark, "bookmark song/artist", "act_bookmark"}, - {BAR_DC_GLOBAL, BarUiActVolDown, "decrease volume", '(', + {'(', BAR_DC_GLOBAL, BarUiActVolDown, "decrease volume", "act_voldown"}, - {BAR_DC_GLOBAL, BarUiActVolUp, "increase volume", ')', + {')', BAR_DC_GLOBAL, BarUiActVolUp, "increase volume", "act_volup"}, - {BAR_DC_STATION, BarUiActManageStation, "delete seeds/feedback", '=', + {'=', BAR_DC_STATION, BarUiActManageStation, "delete seeds/feedback", "act_managestation"}, }; -- cgit v1.2.3