diff options
| -rw-r--r-- | contrib/pianobar.1 | 9 | ||||
| -rw-r--r-- | src/ui.c | 70 | ||||
| -rw-r--r-- | src/ui.h | 1 | ||||
| -rw-r--r-- | src/ui_act.c | 70 |
4 files changed, 73 insertions, 77 deletions
diff --git a/contrib/pianobar.1 b/contrib/pianobar.1 index 12cd06d..d5f1ad7 100644 --- a/contrib/pianobar.1 +++ b/contrib/pianobar.1 @@ -375,10 +375,11 @@ related to the current event, is supplied through stdin. Currently supported events are: artistbookmark, songban, songbookmark, songexplain, songfinish, songlove, songmove, songshelf, songstart, -stationaddmusic, stationaddshared, stationcreate, stationdelete, -stationdeleteartistseed, stationdeletefeedback, stationdeletesongseed, -stationfetchinfo, stationfetchplaylist, stationquickmixtoggle, stationrename, -userlogin, usergetstations +stationaddgenre, stationaddmusic, stationaddshared, stationcreate, +stationdelete, stationdeleteartistseed, stationdeletefeedback, +stationdeletesongseed, stationfetchinfo, stationfetchplaylist, +stationfetchgenre stationquickmixtoggle, stationrename, userlogin, +usergetstations An example script can be found in the contrib/ directory of .B pianobar's @@ -548,76 +548,6 @@ char *BarUiSelectMusicId (BarApp_t *app, PianoStation_t *station, return musicId; } -/* browse genre stations and create shared station - * @param app handle - */ -void BarStationFromGenre (BarApp_t *app) { - PianoReturn_t pRet; - WaitressReturn_t wRet; - PianoGenreCategory_t *curCat; - PianoGenre_t *curGenre; - int i; - - /* receive genre stations list if not yet available */ - if (app->ph.genreStations == NULL) { - BarUiMsg (&app->settings, MSG_INFO, "Receiving genre stations... "); - if (!BarUiPianoCall (app, PIANO_REQUEST_GET_GENRE_STATIONS, NULL, - &pRet, &wRet)) { - return; - } - } - - /* print all available categories */ - curCat = app->ph.genreStations; - i = 0; - while (curCat != NULL) { - BarUiMsg (&app->settings, MSG_LIST, "%2i) %s\n", i, curCat->name); - i++; - curCat = curCat->next; - } - - do { - /* select category or exit */ - BarUiMsg (&app->settings, MSG_QUESTION, "Select category: "); - if (BarReadlineInt (&i, &app->input) == 0) { - return; - } - curCat = app->ph.genreStations; - while (curCat != NULL && i > 0) { - curCat = curCat->next; - i--; - } - } while (curCat == NULL); - - /* print all available stations */ - curGenre = curCat->genres; - i = 0; - while (curGenre != NULL) { - BarUiMsg (&app->settings, MSG_LIST, "%2i) %s\n", i, curGenre->name); - i++; - curGenre = curGenre->next; - } - - do { - BarUiMsg (&app->settings, MSG_QUESTION, "Select genre: "); - if (BarReadlineInt (&i, &app->input) == 0) { - return; - } - curGenre = curCat->genres; - while (curGenre != NULL && i > 0) { - curGenre = curGenre->next; - i--; - } - } while (curGenre == NULL); - - /* create station */ - PianoRequestDataCreateStation_t reqData; - reqData.token = curGenre->musicId; - reqData.type = PIANO_MUSICTYPE_INVALID; - BarUiMsg (&app->settings, MSG_INFO, "Adding shared station \"%s\"... ", curGenre->name); - BarUiPianoCall (app, PIANO_REQUEST_CREATE_STATION, &reqData, &pRet, &wRet); -} - /* replaces format characters (%x) in format string with custom strings * @param destination buffer * @param dest buffer size @@ -44,7 +44,6 @@ PianoSong_t *BarUiSelectSong (const BarSettings_t *, PianoSong_t *, BarReadlineFds_t *); PianoArtist_t *BarUiSelectArtist (BarApp_t *, PianoArtist_t *); char *BarUiSelectMusicId (BarApp_t *, PianoStation_t *, const char *); -void BarStationFromGenre (BarApp_t *); void BarUiPrintStation (const BarSettings_t *, PianoStation_t *); void BarUiPrintSong (const BarSettings_t *, const PianoSong_t *, const PianoStation_t *); diff --git a/src/ui_act.c b/src/ui_act.c index 9af34bf..0f73018 100644 --- a/src/ui_act.c +++ b/src/ui_act.c @@ -263,8 +263,74 @@ BarUiActCallback(BarUiActExplain) { /* choose genre station and add it as shared station */ BarUiActCallback(BarUiActStationFromGenre) { - /* use genre station */ - BarStationFromGenre (app); + PianoReturn_t pRet; + WaitressReturn_t wRet; + const PianoGenreCategory_t *curCat; + const PianoGenre_t *curGenre; + int i; + + /* receive genre stations list if not yet available */ + if (app->ph.genreStations == NULL) { + BarUiMsg (&app->settings, MSG_INFO, "Receiving genre stations... "); + const bool ret = BarUiActDefaultPianoCall ( + PIANO_REQUEST_GET_GENRE_STATIONS, NULL); + BarUiActDefaultEventcmd ("stationfetchgenre"); + if (!ret) { + return; + } + } + + /* print all available categories */ + curCat = app->ph.genreStations; + i = 0; + while (curCat != NULL) { + BarUiMsg (&app->settings, MSG_LIST, "%2i) %s\n", i, curCat->name); + i++; + curCat = curCat->next; + } + + do { + /* select category or exit */ + BarUiMsg (&app->settings, MSG_QUESTION, "Select category: "); + if (BarReadlineInt (&i, &app->input) == 0) { + return; + } + curCat = app->ph.genreStations; + while (curCat != NULL && i > 0) { + curCat = curCat->next; + i--; + } + } while (curCat == NULL); + + /* print all available stations */ + curGenre = curCat->genres; + i = 0; + while (curGenre != NULL) { + BarUiMsg (&app->settings, MSG_LIST, "%2i) %s\n", i, curGenre->name); + i++; + curGenre = curGenre->next; + } + + do { + BarUiMsg (&app->settings, MSG_QUESTION, "Select genre: "); + if (BarReadlineInt (&i, &app->input) == 0) { + return; + } + curGenre = curCat->genres; + while (curGenre != NULL && i > 0) { + curGenre = curGenre->next; + i--; + } + } while (curGenre == NULL); + + /* create station */ + PianoRequestDataCreateStation_t reqData; + reqData.token = curGenre->musicId; + reqData.type = PIANO_MUSICTYPE_INVALID; + BarUiMsg (&app->settings, MSG_INFO, "Adding genre station \"%s\"... ", + curGenre->name); + BarUiActDefaultPianoCall (PIANO_REQUEST_CREATE_STATION, &reqData); + BarUiActDefaultEventcmd ("stationaddgenre"); } /* print verbose song information |