Fix jumpy track position when playing & volume adjusted

malletfils · Jan 23, 2019 · 7cc774d · 7cc774d
1 parent e9ca847
commit 7cc774d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/client/src/store.js b/client/src/store.js
@@ -132,9 +132,11 @@ export default new Vuex.Store({
     },
   },
   actions: {
-    updateZoneGroup({ commit, dispatch }, data) {
+    updateZoneGroup({ commit, getters, dispatch }, data) {
+      const group = getters.activeZoneGroup;
+      const previousPlayState = group.state;
       commit('UPDATE_ZONE_GROUP', data);
-      dispatch('updateTrackTimer');
+      dispatch('updateTrackTimer', { previousPlayState });
     },
     setActiveZoneGroup({ commit, dispatch }, groupId) {
       localStorage.setItem('activeZoneGroupId', groupId);
@@ -170,12 +172,12 @@ export default new Vuex.Store({
       }
       commit('SET_DOCUMENT_TITLE_FOR_ACTIVE_GROUP', documentTitle);
     },
-    updateTrackTimer({ dispatch, getters, commit }) {
+    updateTrackTimer({ dispatch, getters, commit }, data) {
       const group = getters.activeZoneGroup;
       if (group) {
-        if (group.state === PlayState.playing) {
+        if (group.state === PlayState.playing && data.previousPlayState !== PlayState.playing) {
           dispatch('startTrackTimer');
-        } else {
+        } else if (group.state !== PlayState.playing) {
           commit('CLEAR_TRACK_TIMER');
         }
       }

diff --git a/server/src/sonos/SonosNetwork.js b/server/src/sonos/SonosNetwork.js
@@ -149,6 +149,9 @@ class SonosNetwork {
       if (zoneGroup) {
         // eslint-disable-next-line max-len
         const updatedZone = this._updateZoneGroupRenderingInfo(zoneGroup.id, device.id, renderingInfo);
+        // We don't want to send this field, because it can cause a
+        // jumpy track position when adjust volume
+        delete updatedZone.track;
         if (updatedZone) {
           this.socketio.emit(
             SonosEventDataReceived,