From bf79a91a3f6381cade8a9e0fd50c2897bfb316c9 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 31 Mar 2010 11:32:39 +0200 Subject: Use new libpiano api Adds error messages to libwaitress, too. Eventcmd implementation is quick&dirty, needs to be rewritten. --- src/ui.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/ui.h') diff --git a/src/ui.h b/src/ui.h index 46cdbe8..0a23881 100644 --- a/src/ui.h +++ b/src/ui.h @@ -25,6 +25,7 @@ THE SOFTWARE. #define _UI_H #include +#include #include "settings.h" #include "player.h" @@ -38,12 +39,14 @@ PianoStation_t *BarUiSelectStation (PianoHandle_t *ph, const char *prompt, FILE *curFd); PianoSong_t *BarUiSelectSong (PianoSong_t *startSong, FILE *curFd); PianoArtist_t *BarUiSelectArtist (PianoArtist_t *startArtist, FILE *curFd); -char *BarUiSelectMusicId (PianoHandle_t *ph, FILE *curFd, char *); -void BarStationFromGenre (PianoHandle_t *ph, FILE *curFd); +char *BarUiSelectMusicId (PianoHandle_t *ph, WaitressHandle_t *, FILE *curFd, char *); +void BarStationFromGenre (PianoHandle_t *ph, WaitressHandle_t *, FILE *curFd); void BarUiPrintStation (PianoStation_t *); void BarUiPrintSong (PianoSong_t *, PianoStation_t *); void BarUiStartEventCmd (const BarSettings_t *, const char *, - const PianoStation_t *, const PianoSong_t *, - const struct audioPlayer *, PianoReturn_t); + const PianoStation_t *, const PianoSong_t *, const struct audioPlayer *, + PianoReturn_t, WaitressReturn_t); +int BarUiPianoCall (PianoHandle_t *, PianoRequestType_t, WaitressHandle_t *, + void *, PianoReturn_t *, WaitressReturn_t *); #endif /* _UI_H */ -- cgit v1.2.3