From d166a010670ac829d1e6d4f37dbac075d13d9b26 Mon Sep 17 00:00:00 2001 From: Matthew Beckler Date: Thu, 13 Jan 2011 17:18:25 -0500 Subject: Send station list to eventcmd See issue #76 --- src/ui_act.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/ui_act.c') diff --git a/src/ui_act.c b/src/ui_act.c index 4ea8b71..76f4fee 100644 --- a/src/ui_act.c +++ b/src/ui_act.c @@ -42,7 +42,8 @@ THE SOFTWARE. /* standard eventcmd call */ #define BarUiActDefaultEventcmd(name) BarUiStartEventCmd (&app->settings, \ - name, app->curStation, app->playlist, &app->player, pRet, wRet) + name, app->curStation, app->playlist, &app->player, app->ph.stations, \ + pRet, wRet) /* standard piano call */ @@ -517,7 +518,8 @@ BarUiActCallback(BarUiActHistory) { &reqData); BarUiStartEventCmd (&app->settings, "songlove", songStation, - selectedSong, &app->player, pRet, wRet); + selectedSong, &app->player, app->ph.stations, + pRet, wRet); } else if (selectBuf[0] == app->settings.keys[BAR_KS_BAN]) { PianoRequestDataRateSong_t reqData; reqData.song = selectedSong; @@ -527,13 +529,15 @@ BarUiActCallback(BarUiActHistory) { BarUiActDefaultPianoCall (PIANO_REQUEST_RATE_SONG, &reqData); BarUiStartEventCmd (&app->settings, "songban", songStation, - selectedSong, &app->player, pRet, wRet); + selectedSong, &app->player, app->ph.stations, + pRet, wRet); } else if (selectBuf[0] == app->settings.keys[BAR_KS_TIRED]) { BarUiMsg (MSG_INFO, "Putting song on shelf... "); BarUiActDefaultPianoCall (PIANO_REQUEST_ADD_TIRED_SONG, selectedSong); BarUiStartEventCmd (&app->settings, "songshelf", songStation, - selectedSong, &app->player, pRet, wRet); + selectedSong, &app->player, app->ph.stations, + pRet, wRet); } /* end if */ } /* end if selectBuf[0] */ } /* end if selectedSong != NULL */ -- cgit v1.2.3