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/main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index 908fcee..d6da519 100644 --- a/src/main.c +++ b/src/main.c @@ -249,8 +249,8 @@ static void BarMainGetPlaylist (BarApp_t *app) { } } BarUiStartEventCmd (&app->settings, "stationfetchplaylist", - app->curStation, app->playlist, &app->player, pRet, - wRet); + app->curStation, app->playlist, &app->player, app->ph.stations, + pRet, wRet); } /* start new player thread @@ -286,7 +286,7 @@ static void BarMainStartPlayback (BarApp_t *app, pthread_t *playerThread) { /* throw event */ BarUiStartEventCmd (&app->settings, "songstart", - app->curStation, app->playlist, &app->player, + app->curStation, app->playlist, &app->player, app->ph.stations, PIANO_RET_OK, WAITRESS_RET_OK); /* prevent race condition, mode must _not_ be FREED if @@ -304,7 +304,8 @@ static void BarMainPlayerCleanup (BarApp_t *app, pthread_t *playerThread) { void *threadRet; BarUiStartEventCmd (&app->settings, "songfinish", app->curStation, - app->playlist, &app->player, PIANO_RET_OK, WAITRESS_RET_OK); + app->playlist, &app->player, app->ph.stations, PIANO_RET_OK, + WAITRESS_RET_OK); /* FIXME: pthread_join blocks everything if network connection * is hung up e.g. */ -- cgit v1.2.3