summaryrefslogtreecommitdiff
path: root/src/ui.h
diff options
context:
space:
mode:
authorLars-Dominik Braun <PromyLOPh@lavabit.com>2010-03-31 11:32:39 +0200
committerLars-Dominik Braun <PromyLOPh@lavabit.com>2010-04-06 16:48:14 +0200
commitbf79a91a3f6381cade8a9e0fd50c2897bfb316c9 (patch)
treeee785b6ae183c18837c5f8357444b88c51001f92 /src/ui.h
parent37cee3b9d6d3f5fd7a477791ebfdb1e85e8faf9d (diff)
downloadpianobar-bf79a91a3f6381cade8a9e0fd50c2897bfb316c9.tar.gz
pianobar-bf79a91a3f6381cade8a9e0fd50c2897bfb316c9.tar.bz2
pianobar-bf79a91a3f6381cade8a9e0fd50c2897bfb316c9.zip
Use new libpiano api
Adds error messages to libwaitress, too. Eventcmd implementation is quick&dirty, needs to be rewritten.
Diffstat (limited to 'src/ui.h')
-rw-r--r--src/ui.h11
1 files changed, 7 insertions, 4 deletions
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 <piano.h>
+#include <waitress.h>
#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 */