Reverting stream_title_changed, addressed more thoroughly in #588

mopidy_iris/static/app.js

@@ -118718,7 +118718,6 @@ var CoreMiddleware = function () {
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return reducer; });
 /* harmony import */ var _util_arrays__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../util/arrays */ "./src/js/util/arrays.js");
-/* harmony import */ var _util_format__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../util/format */ "./src/js/util/format.js");
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -118738,7 +118737,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 
-
 function reducer() {
   var core = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var action = arguments.length > 1 ? arguments[1] : undefined;

mopidy_iris/static/index.html

@@ -106,7 +106,7 @@
 
 	// Release details
 	// These are automatically injected to built HTML
-	var build = "1605168871";
+	var build = "1605340269";
 	var version = "3.54.1";
 
 	// Construct the script tag

src/js/services/core/reducer.js

@@ -9,6 +9,10 @@ export default function reducer(core = {}, action) {
     case 'CACHEBUST_HTTP_STREAM':
       return { ...core, http_streaming_cachebuster: new Date().getTime() };
 
+      /**
+         * Current track and tracklist
+         * */
+
     case 'CURRENT_TRACK_LOADED':
       return {
         ...core,
@@ -16,15 +20,6 @@ export default function reducer(core = {}, action) {
         current_track_uri: action.uri,
       };
 
-    case 'MOPIDY_STREAM_TITLE_CHANGED':
-      return {
-        ...core,
-        current_track: {
-          ...core.current_track,
-          name: action.title,
-        },
-      };
-
     case 'CLEAR_CURRENT_TRACK':
       return {
         ...core,

src/js/services/mopidy/actions.js

@@ -277,13 +277,6 @@ export function currentTrackLoaded(tl_track) {
   };
 }
 
-export function streamTitleChanged(title) {
-  return {
-    type: 'MOPIDY_STREAM_TITLE_CHANGED',
-    title,
-  };
-}
-
 export function getNextTrack() {
   return {
     type: 'MOPIDY_GET_NEXT_TRACK',

src/js/services/mopidy/middleware.js

@@ -148,10 +148,6 @@ const MopidyMiddleware = (function () {
         );
         break;
 
-      case 'event:streamTitleChanged':
-        store.dispatch(mopidyActions.streamTitleChanged(data.title));
-        break;
-
       case 'event:volumeChanged':
         store.dispatch({ type: 'MOPIDY_VOLUME', volume: data.volume });
         break;
@@ -1478,25 +1474,6 @@ const MopidyMiddleware = (function () {
         break;
       }
 
-      case 'MOPIDY_STREAM_TITLE_CHANGED': {
-        const {
-          core: {
-            current_track,
-          },
-        } = store.getState();
-        const track = {
-          ...current_track,
-          name: action.title,
-        };
-
-        store.dispatch({
-          type: 'CURRENT_TRACK_LOADED',
-          track,
-          uri: current_track.uri,
-        });
-        break;
-      }
-
       case 'MOPIDY_GET_NEXT_TRACK':
         request(store, 'tracklist.getNextTlid')
           .then(

src/js/views/Queue.js

@@ -369,10 +369,7 @@ const mapStateToProps = (state) => {
 
       // Siphon off this track if it's a full representation of our current track
       if (track.playing) {
-        current_track = {
-          ...track,
-          ...core_current_track,
-        };
+        current_track = track;
       }
 
       // Now add our compiled track for our tracklist