From a9f5a8b4e1cfb7326471c4b8afc26f5c60cf79b2 Mon Sep 17 00:00:00 2001 From: CoderRing28 Date: Tue, 23 Jun 2020 18:09:06 -0500 Subject: [PATCH] Add volume change event. Include volume in Event Command information --- src/ui.c | 2 ++ src/ui_act.c | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/ui.c b/src/ui.c index 6ccc2af1f..2928f692e 100644 --- a/src/ui.c +++ b/src/ui.c @@ -888,6 +888,7 @@ void BarUiStartEventCmd (const BarSettings_t *settings, const char *type, "wRetStr=%s\n" "songDuration=%u\n" "songPlayed=%u\n" + "volume=%i\n" "rating=%i\n" "detailUrl=%s\n", curSong == NULL ? "" : curSong->artist, @@ -902,6 +903,7 @@ void BarUiStartEventCmd (const BarSettings_t *settings, const char *type, curl_easy_strerror (wRet), songDuration, songPlayed, + settings->volume, curSong == NULL ? PIANO_RATE_NONE : curSong->rating, curSong == NULL ? "" : curSong->detailUrl ); diff --git a/src/ui_act.c b/src/ui_act.c index ba340c158..7ccc0001e 100644 --- a/src/ui_act.c +++ b/src/ui_act.c @@ -648,22 +648,34 @@ BarUiActCallback(BarUiActBookmark) { /* decrease volume */ BarUiActCallback(BarUiActVolDown) { + PianoReturn_t pRet; + CURLcode wRet; + --app->settings.volume; BarPlayerSetVolume (&app->player); + BarUiStartEventCmd (&app->settings, "volchange", NULL, NULL, &app->player, NULL, pRet, wRet); } /* increase volume */ BarUiActCallback(BarUiActVolUp) { + PianoReturn_t pRet; + CURLcode wRet; + ++app->settings.volume; BarPlayerSetVolume (&app->player); + BarUiStartEventCmd (&app->settings, "volchange", NULL, NULL, &app->player, NULL, pRet, wRet); } /* reset volume */ BarUiActCallback(BarUiActVolReset) { + PianoReturn_t pRet; + CURLcode wRet; + app->settings.volume = 0; BarPlayerSetVolume (&app->player); + BarUiStartEventCmd (&app->settings, "volchange", NULL, NULL, &app->player, NULL, pRet, wRet); } static const char *boolToYesNo (const bool value) {