From ce8503f859345990a14be90bf89dadf7f73d7613 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 6 Jan 2011 16:25:40 +0100 Subject: BarReadline rewrite Doesn't use c streams any more, allows multiplexing of fifo/stdin in all situations. --- src/ui.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/ui.h') diff --git a/src/ui.h b/src/ui.h index 6664f8e..4d4b555 100644 --- a/src/ui.h +++ b/src/ui.h @@ -1,5 +1,5 @@ /* -Copyright (c) 2008-2010 +Copyright (c) 2008-2011 Lars-Dominik Braun Permission is hereby granted, free of charge, to any person obtaining a copy @@ -30,6 +30,7 @@ THE SOFTWARE. #include "settings.h" #include "player.h" #include "main.h" +#include "ui_readline.h" typedef enum {MSG_NONE, MSG_INFO, MSG_PLAYING, MSG_TIME, MSG_ERR, MSG_QUESTION, MSG_LIST} uiMsg_t; @@ -37,11 +38,12 @@ typedef enum {MSG_NONE, MSG_INFO, MSG_PLAYING, MSG_TIME, MSG_ERR, void BarUiMsg (uiMsg_t type, const char *format, ...); PianoReturn_t BarUiPrintPianoStatus (PianoReturn_t ret); PianoStation_t *BarUiSelectStation (PianoHandle_t *, const char *, - BarStationSorting_t, FILE *); -PianoSong_t *BarUiSelectSong (const BarSettings_t *, PianoSong_t *, FILE *); -PianoArtist_t *BarUiSelectArtist (PianoArtist_t *startArtist, FILE *curFd); -char *BarUiSelectMusicId (BarApp_t *, FILE *, char *); -void BarStationFromGenre (BarApp_t *, FILE *); + BarStationSorting_t, BarReadlineFds_t *); +PianoSong_t *BarUiSelectSong (const BarSettings_t *, PianoSong_t *, + BarReadlineFds_t *); +PianoArtist_t *BarUiSelectArtist (PianoArtist_t *, BarReadlineFds_t *); +char *BarUiSelectMusicId (BarApp_t *, char *); +void BarStationFromGenre (BarApp_t *); void BarUiPrintStation (PianoStation_t *); void BarUiPrintSong (const BarSettings_t *, const PianoSong_t *, const PianoStation_t *); -- cgit v1.2.3