feat(qobuz): set volume if changed by ui - fix(qobuz): disconnect

Author: tobiasguyer

StreamCore32/core/include/AudioControl.h

@@ -109,7 +109,7 @@ class AudioControl {
         case CommandType::VOLUME_LOGARITHMIC: {
           this->audioController->volume.store(
               this->audioSink->to_logarithmic_volume(value));
-          this->audioSink->feed_command([this, value](uint8_t) {
+          this->audioSink->feed_command([this](uint8_t) {
             this->audioSink->set_volume(this->audioController->volume.load());
           });
         } break;

StreamCore32/stream/qobuz/include/QobuzPlayer.h

@@ -42,8 +42,8 @@ class QobuzPlayer : public StreamBase {
     stopTask();
     while (hb_)
       BELL_SLEEP_MS(50);
-    pb_release(qconnect_QueueRendererState_fields, &player_state);
     std::scoped_lock lock(isRunningMutex_);
+    pb_release(qconnect_QueueRendererState_fields, &player_state);
   }
   void runTask() override;
 

StreamCore32/stream/qobuz/include/QobuzStream.h

@@ -51,6 +51,7 @@ class QobuzStream : public bell::Task {
     std::string queueSnapshot;
     std::string api_base = "https://www.qobuz.com/api.json/0.2";
     char queue_uuid[37];
+    uint8_t volume = 0;
     uint32_t expiresAt = 0;
     uint64_t rendererId = 0;
     WSToken ws_token;

StreamCore32/stream/qobuz/src/QobuzPlayer.cpp

@@ -478,9 +478,7 @@ void QobuzPlayer::runTask() {
       retries = 0;
   }  // outer while
   feed_->feedCommand(AudioControl::DISC, 0);
-  while (hb_)
-    BELL_SLEEP_MS(100);
-  isRunning_.store(false);
+  isRunning_.store(false)
 }
 
 void QobuzPlayer::sendPlayerState() {

StreamCore32/stream/qobuz/src/QobuzStream.cpp

@@ -151,6 +151,9 @@ void QobuzStream::runTask() {
         } else if (cfg_.XsessionId.expiresAt <= timesync::now_ms() + 60000) {
           startSession();
         }
+        if(cfg_.volume != audioControl_->volume.load()) {
+          WSSetRendererVolume();
+        }
       },
       30000);
   token_hb_->start();
@@ -637,6 +640,8 @@ void QobuzStream::WSDecodeMessage(_qconnect_QConnectMessage* data) {
       if (!data->has_srvrCtrlVolumeChanged)
         break;
       if (data->srvrCtrlVolumeChanged.rendererId == cfg_.rendererId) {
+        if (!player_->isRunning()) break;
+        cfg_.volume = data->srvrCtrlVolumeChanged.volume;
         player_->feed_->feedCommand(AudioControl::VOLUME_LINEAR,
                                     data->srvrCtrlVolumeChanged.volume,
                                     std::optional<uint32_t>(100)  // max volume
@@ -648,6 +653,7 @@ void QobuzStream::WSDecodeMessage(_qconnect_QConnectMessage* data) {
       if (!data->has_srvrRndrSetVolume)
         break;
       if (player_->isRunning()) {
+        cfg_.volume = data->srvrRndrSetVolume.volume;
         player_->feed_->feedCommand(AudioControl::VOLUME_LINEAR,
                                     data->srvrRndrSetVolume.volume,
                                     std::optional<uint32_t>(100)  // max volume
@@ -797,6 +803,7 @@ void QobuzStream::WSSetRendererVolume() {
   msg.has_messageType = true;
   msg.has_rndrSrvrVolumeChanged = true;
   msg.rndrSrvrVolumeChanged.has_volume = true;
-  msg.rndrSrvrVolumeChanged.volume = player_->audio_->volume.load();
+  msg.rndrSrvrVolumeChanged.volume = audioControl_->volume.load();
+  cfg_.volume = audioControl_->volume.load();
   this->encodeBatches(&msg, 1);
 }