Permalink
Browse files

Merge remote-tracking branch 'brimstone/master'

  • Loading branch information...
2 parents d7842ea + 8b47211 commit cdb74a79d0db6cc9b5d4eae8b3231c7390208cf2 @jmesmon committed Jul 27, 2012
Showing with 9 additions and 0 deletions.
  1. +6 −0 src/ui_act.c
  2. +1 −0 src/ui_act.h
  3. +2 −0 src/ui_dispatch.h
View
6 src/ui_act.c
@@ -344,6 +344,12 @@ BarUiActCallback(BarUiActPause) {
}
}
+/* pauseregardless
+ */
+BarUiActCallback(BarUiActPauseRegardless) {
+ pthread_mutex_trylock (&app->player.pauseMutex);
+}
+
/* rename current station
*/
BarUiActCallback(BarUiActRenameStation) {
View
1 src/ui_act.h
@@ -46,6 +46,7 @@ BarUiActCallback(BarUiActSongInfo);
BarUiActCallback(BarUiActLoveSong);
BarUiActCallback(BarUiActSkipSong);
BarUiActCallback(BarUiActPause);
+BarUiActCallback(BarUiActPauseRegardless);
BarUiActCallback(BarUiActRenameStation);
BarUiActCallback(BarUiActSelectStation);
BarUiActCallback(BarUiActTempBanSong);
View
2 src/ui_dispatch.h
@@ -73,6 +73,8 @@ static const BarUiDispatchAction_t dispatchActions[BAR_KS_COUNT] = {
"act_songnext"},
{'p', BAR_DC_GLOBAL | BAR_DC_STATION, BarUiActPause, "pause/continue",
"act_songpause"},
+ {'P', BAR_DC_GLOBAL | BAR_DC_STATION, BarUiActPauseRegardless, "pause regardless",
+ "act_songpauseregardless"},
{'q', BAR_DC_GLOBAL, BarUiActQuit, "quit", "act_quit"},
{'r', BAR_DC_STATION, BarUiActRenameStation, "rename station",
"act_stationrename"},

0 comments on commit cdb74a7

Please sign in to comment.