p
/
nncmpp
1
1
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Make code a bit more compact

This commit is contained in:
Přemysl Eric Janouch 2017-06-05 20:02:21 +02:00
parent 627cb0dee9
commit e0e63cb177
Signed by: p
GPG Key ID: B715679E3A361BE6
1 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
nncmpp.c
View File

@ -1498,18 +1498,18 @@ app_goto_tab (int tab_index)
XX( HELP_TAB, "Switch to the help tab" ) \ XX( HELP_TAB, "Switch to the help tab" ) \
XX( LAST_TAB, "Switch to previous tab" ) \ XX( LAST_TAB, "Switch to previous tab" ) \
\ \
XX( MPD_PREVIOUS, "Previous song" ) \
XX( MPD_TOGGLE, "Toggle play/pause" ) \ XX( MPD_TOGGLE, "Toggle play/pause" ) \
XX( MPD_STOP, "Stop playback" ) \ XX( MPD_STOP, "Stop playback" ) \
XX( MPD_PREVIOUS, "Previous song" ) \
XX( MPD_NEXT, "Next song" ) \ XX( MPD_NEXT, "Next song" ) \
XX( MPD_BACKWARD, "Seek backwards" ) \ XX( MPD_BACKWARD, "Seek backwards" ) \
XX( MPD_FORWARD, "Seek forwards" ) \ XX( MPD_FORWARD, "Seek forwards" ) \
XX( MPD_UPDATE_DB, "Update MPD database" ) \
XX( MPD_VOLUME_UP, "Increase volume" ) \ XX( MPD_VOLUME_UP, "Increase volume" ) \
XX( MPD_VOLUME_DOWN, "Decrease volume" ) \ XX( MPD_VOLUME_DOWN, "Decrease volume" ) \
\ \
XX( MPD_ADD, "Add song to playlist" ) \ XX( MPD_ADD, "Add song to playlist" ) \
XX( MPD_REPLACE, "Replace playlist with song" ) \ XX( MPD_REPLACE, "Replace playlist with song" ) \
XX( MPD_UPDATE_DB, "Update MPD database" ) \
\ \
XX( CHOOSE, "Choose item" ) \ XX( CHOOSE, "Choose item" ) \
XX( DELETE, "Delete item" ) \ XX( DELETE, "Delete item" ) \
@ -1626,26 +1626,17 @@ app_process_action (enum action action)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
case ACTION_MPD_UPDATE_DB:
MPD_SIMPLE ("update");
break;
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
case ACTION_MPD_PREVIOUS:
MPD_SIMPLE ("previous");
break;
case ACTION_MPD_TOGGLE: case ACTION_MPD_TOGGLE:
if (g.state == PLAYER_PLAYING) MPD_SIMPLE ("pause", "1"); if (g.state == PLAYER_PLAYING) MPD_SIMPLE ("pause", "1");
else if (g.state == PLAYER_PAUSED) MPD_SIMPLE ("pause", "0"); else if (g.state == PLAYER_PAUSED) MPD_SIMPLE ("pause", "0");
else MPD_SIMPLE ("play"); else MPD_SIMPLE ("play");
break; break;
case ACTION_MPD_STOP: case ACTION_MPD_STOP: MPD_SIMPLE ("stop"); break;
MPD_SIMPLE ("stop"); case ACTION_MPD_PREVIOUS: MPD_SIMPLE ("previous"); break;
break; case ACTION_MPD_NEXT: MPD_SIMPLE ("next"); break;
case ACTION_MPD_NEXT: case ACTION_MPD_FORWARD: MPD_SIMPLE ("seekcur", "+10"); break;
MPD_SIMPLE ("next"); case ACTION_MPD_BACKWARD: MPD_SIMPLE ("seekcur", "-10"); break;
break; case ACTION_MPD_UPDATE_DB: MPD_SIMPLE ("update"); break;
case ACTION_MPD_VOLUME_UP: case ACTION_MPD_VOLUME_UP:
if (g.volume >= 0) if (g.volume >= 0)
{ {
@ -1663,23 +1654,11 @@ app_process_action (enum action action)
} }
break; break;
// XXX: these should rather be parametrized
case ACTION_MPD_FORWARD:
MPD_SIMPLE ("seekcur", "+10");
break;
case ACTION_MPD_BACKWARD:
MPD_SIMPLE ("seekcur", "-10");
break;
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// XXX: these should rather be parametrized // XXX: these should rather be parametrized
case ACTION_SCROLL_UP: case ACTION_SCROLL_UP: app_scroll (-3); break;
app_scroll (-3); case ACTION_SCROLL_DOWN: app_scroll (3); break;
break;
case ACTION_SCROLL_DOWN:
app_scroll (3);
break;
case ACTION_GOTO_TOP: case ACTION_GOTO_TOP:
if (tab->item_count) if (tab->item_count)
@ -1861,16 +1840,16 @@ g_default_bindings[] =
{ "Backspace", ACTION_UP, {}}, { "Backspace", ACTION_UP, {}},
{ "a", ACTION_MPD_ADD, {}}, { "a", ACTION_MPD_ADD, {}},
{ "r", ACTION_MPD_REPLACE, {}}, { "r", ACTION_MPD_REPLACE, {}},
{ "u", ACTION_MPD_UPDATE_DB, {}},
{ "M-Left", ACTION_MPD_BACKWARD, {}},
{ "M-Right", ACTION_MPD_FORWARD, {}},
{ "Left", ACTION_MPD_PREVIOUS, {}}, { "Left", ACTION_MPD_PREVIOUS, {}},
{ "Right", ACTION_MPD_NEXT, {}}, { "Right", ACTION_MPD_NEXT, {}},
{ "M-Left", ACTION_MPD_BACKWARD, {}},
{ "M-Right", ACTION_MPD_FORWARD, {}},
{ "h", ACTION_MPD_PREVIOUS, {}}, { "h", ACTION_MPD_PREVIOUS, {}},
{ "l", ACTION_MPD_NEXT, {}}, { "l", ACTION_MPD_NEXT, {}},
{ "Space", ACTION_MPD_TOGGLE, {}}, { "Space", ACTION_MPD_TOGGLE, {}},
{ "C-Space", ACTION_MPD_STOP, {}}, { "C-Space", ACTION_MPD_STOP, {}},
{ "u", ACTION_MPD_UPDATE_DB, {}},
{ "M-PageUp", ACTION_MPD_VOLUME_UP, {}}, { "M-PageUp", ACTION_MPD_VOLUME_UP, {}},
{ "M-PageDown", ACTION_MPD_VOLUME_DOWN, {}}, { "M-PageDown", ACTION_MPD_VOLUME_DOWN, {}},
}; };