shaka-player 3.3.5 → 4.0.2

package/lib/player.js

@@ -43,7 +43,6 @@ goog.require('shaka.util.Error');
 goog.require('shaka.util.EventManager');
 goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.FakeEventTarget');
-goog.require('shaka.util.Functional');
 goog.require('shaka.util.IDestroyable');
 goog.require('shaka.util.LanguageUtils');
 goog.require('shaka.util.ManifestParserUtils');
@@ -301,22 +300,6 @@ goog.requireType('shaka.routing.Payload');
  */
 
 
-/**
- * @event shaka.Player.LargeGapEvent
- * @description Fired when the playhead enters a large gap.  If the
- *   <code>streaming.jumpLargeGaps</code> configuration is set, the default
- *   action of this event is to jump the gap; this can be prevented by calling
- *   <code>preventDefault()</code> on the event object.
- * @property {string} type
- *   'largegap'
- * @property {number} currentTime
- *   The current time of the playhead.
- * @property {number} gapSize
- *   The size of the gap, in seconds.
- * @exportDoc
- */
-
-
 /**
  * @event shaka.Player.ManifestParsedEvent
  * @description Fired after the manifest has been parsed, but before anything
@@ -591,8 +574,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     this.adManager_ = null;
 
     if (shaka.Player.adManagerFactory_) {
-      this.adManager_ =
-          shaka.util.Functional.callFactory(shaka.Player.adManagerFactory_);
+      this.adManager_ = shaka.Player.adManagerFactory_();
     }
 
     // If the browser comes back online after being offline, then try to play
@@ -870,10 +852,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       return false;
     }
 
-    // We do not support iOS 9, 10, or 11, nor those same versions of desktop
-    // Safari.
+    // We do not support iOS 9, 10, 11 or 12, nor those same versions of
+    // desktop Safari.
     const safariVersion = shaka.util.Platform.safariVersion();
-    if (safariVersion && safariVersion < 12) {
+    if (safariVersion && safariVersion < 13) {
       return false;
     }
 
@@ -1579,8 +1561,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     // text displayer and streaming engine are always in sync, wait until they
     // are both initialized before setting the initial value.
     const textDisplayerFactory = this.config_.textDisplayFactory;
-    const textDisplayer =
-        shaka.util.Functional.callFactory(textDisplayerFactory);
+    const textDisplayer = textDisplayerFactory();
     this.lastTextFactory_ = textDisplayerFactory;
 
     const mediaSourceEngine = this.createMediaSourceEngine(
@@ -1590,6 +1571,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         (metadata, offset, endTime) => {
           this.processTimedMetadataMediaSrc_(metadata, offset, endTime);
         });
+    const {segmentRelativeVttTiming} = this.config_.manifest;
+    mediaSourceEngine.setSegmentRelativeVttTiming(segmentRelativeVttTiming);
 
     // Wait for media source engine to finish opening. This promise should
     // NEVER be rejected as per the media source engine implementation.
@@ -1651,7 +1634,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         this.config_.manifest.retryParameters,
         has.mimeType);
     goog.asserts.assert(this.parserFactory_, 'Must have manifest parser');
-    this.parser_ = shaka.util.Functional.callFactory(this.parserFactory_);
+    this.parser_ = this.parserFactory_();
 
     const manifestConfig =
         shaka.util.ObjectUtils.cloneObject(this.config_.manifest);
@@ -1937,13 +1920,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     const abrFactory = this.config_.abrFactory;
     if (!this.abrManager_ || this.abrManagerFactory_ != abrFactory) {
       this.abrManagerFactory_ = abrFactory;
-      this.abrManager_ = shaka.util.Functional.callFactory(abrFactory);
-      if (typeof this.abrManager_.playbackRateChanged != 'function') {
-        shaka.Deprecate.deprecateFeature(4,
-            'AbrManager',
-            'Please use an AbrManager with playbackRateChanged function.');
-        this.abrManager_.playbackRateChanged = (rate) => {};
-      }
+      this.abrManager_ = abrFactory();
       this.abrManager_.configure(this.config_.abr);
     }
 
@@ -2716,8 +2693,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         this.manifest_,
         this.config_.streaming,
         startTime,
-        () => this.onSeek_(),
-        (event) => this.dispatchEvent(event));
+        () => this.onSeek_());
   }
 
   /**
@@ -2976,17 +2952,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
     goog.asserts.assert(typeof(config) == 'object', 'Should be an object!');
 
-    // Deprecate 'manifest.dash.defaultPresentationDelay' configuration.
-    if (config['manifest'] && config['manifest']['dash'] &&
-          'defaultPresentationDelay' in config['manifest']['dash']) {
-      shaka.Deprecate.deprecateFeature(4,
-          'manifest.dash.defaultPresentationDelay configuration',
-          'Please Use manifest.defaultPresentationDelay instead.');
-      config['manifest']['defaultPresentationDelay'] =
-          config['manifest']['dash']['defaultPresentationDelay'];
-      delete config['manifest']['dash']['defaultPresentationDelay'];
-    }
-
     // If lowLatencyMode is enabled, and inaccurateManifestTolerance and
     // rebufferingGoal are not specified, set inaccurateManifestTolerance to 0
     // and rebufferingGoal to 0.01 by default for low latency streaming.
@@ -3053,10 +3018,13 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     }
 
     if (this.mediaSourceEngine_) {
+      const {segmentRelativeVttTiming} = this.config_.manifest;
+      this.mediaSourceEngine_.setSegmentRelativeVttTiming(
+          segmentRelativeVttTiming);
+
       const textDisplayerFactory = this.config_.textDisplayFactory;
       if (this.lastTextFactory_ != textDisplayerFactory) {
-        const displayer =
-            shaka.util.Functional.callFactory(textDisplayerFactory);
+        const displayer = textDisplayerFactory();
         this.mediaSourceEngine_.setTextDisplayer(displayer);
         this.lastTextFactory_ = textDisplayerFactory;
 
@@ -4441,158 +4409,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     return this.stats_.getBlob();
   }
 
-  /**
-   * Adds the given text track to the loaded manifest.  <code>load()</code> must
-   * resolve before calling.  The presentation must have a duration.
-   *
-   * This returns the created track, which can immediately be selected by the
-   * application.  The track will not be automatically selected.
-   *
-   * @param {string} uri
-   * @param {string} language
-   * @param {string} kind
-   * @param {string=} mimeType
-   * @param {string=} codec
-   * @param {string=} label
-   * @param {boolean=} forced
-   * @return {shaka.extern.Track}
-   * @export
-   */
-  addTextTrack(uri, language, kind, mimeType, codec, label, forced = false) {
-    shaka.Deprecate.deprecateFeature(4,
-        'addTextTrack',
-        'Please use an addTextTrackAsync.');
-    if (this.loadMode_ != shaka.Player.LoadMode.MEDIA_SOURCE &&
-        this.loadMode_ != shaka.Player.LoadMode.SRC_EQUALS) {
-      shaka.log.error(
-          'Must call load() and wait for it to resolve before adding text ' +
-          'tracks.');
-      throw new shaka.util.Error(
-          shaka.util.Error.Severity.RECOVERABLE,
-          shaka.util.Error.Category.PLAYER,
-          shaka.util.Error.Code.CONTENT_NOT_LOADED);
-    }
-
-    if (!mimeType) {
-      // Try using the uri extension.
-      const extension = shaka.media.ManifestParser.getExtension(uri);
-      mimeType = shaka.Player.TEXT_EXTENSIONS_TO_MIME_TYPES_[extension];
-
-      if (!mimeType) {
-        shaka.log.error(
-            'The mimeType has not been provided and it could not be deduced ' +
-            'from its extension.');
-        throw new shaka.util.Error(
-            shaka.util.Error.Severity.RECOVERABLE,
-            shaka.util.Error.Category.TEXT,
-            shaka.util.Error.Code.TEXT_COULD_NOT_GUESS_MIME_TYPE,
-            extension);
-      }
-    }
-
-    if (this.loadMode_ == shaka.Player.LoadMode.SRC_EQUALS) {
-      if (mimeType != 'text/vtt') {
-        shaka.log.error('Only WebVTT is supported when using src=');
-        throw new shaka.util.Error(
-            shaka.util.Error.Severity.RECOVERABLE,
-            shaka.util.Error.Category.TEXT,
-            shaka.util.Error.Code.TEXT_ONLY_WEBVTT_SRC_EQUALS,
-            mimeType);
-      }
-      if (forced) {
-        // See: https://github.com/whatwg/html/issues/4472
-        kind = 'forced';
-      }
-      const trackElement =
-        /** @type {!HTMLTrackElement} */(document.createElement('track'));
-      trackElement.src = this.cmcdManager_.appendTextTrackData(uri);
-      trackElement.label = label || '';
-      trackElement.kind = kind;
-      trackElement.srclang = language;
-      // Because we're pulling in the text track file via Javascript, the
-      // same-origin policy applies. If you'd like to have a player served
-      // from one domain, but the text track served from another, you'll
-      // need to enable CORS in order to do so. In addition to enabling CORS
-      // on the server serving the text tracks, you will need to add the
-      // crossorigin attribute to the video element itself.
-      if (!this.video_.getAttribute('crossorigin')) {
-        this.video_.setAttribute('crossorigin', 'anonymous');
-      }
-      this.video_.appendChild(trackElement);
-      const textTracks = this.getTextTracks();
-      const srcTrack = textTracks.find((t) => {
-        return t.language == language &&
-            t.label == (label || '') &&
-            t.kind == kind;
-      });
-      if (srcTrack) {
-        this.onTracksChanged_();
-        return srcTrack;
-      }
-      // This should not happen, but there are browser implementations that may
-      // not support the Track element.
-      shaka.log.error('Cannot add this text when loaded with src=');
-      throw new shaka.util.Error(
-          shaka.util.Error.Severity.RECOVERABLE,
-          shaka.util.Error.Category.TEXT,
-          shaka.util.Error.Code.CANNOT_ADD_EXTERNAL_TEXT_TO_SRC_EQUALS);
-    }
-
-    const ContentType = shaka.util.ManifestParserUtils.ContentType;
-
-    const duration = this.manifest_.presentationTimeline.getDuration();
-    if (duration == Infinity) {
-      throw new shaka.util.Error(
-          shaka.util.Error.Severity.RECOVERABLE,
-          shaka.util.Error.Category.MANIFEST,
-          shaka.util.Error.Code.CANNOT_ADD_EXTERNAL_TEXT_TO_LIVE_STREAM);
-    }
-
-    /** @type {shaka.extern.Stream} */
-    const stream = {
-      id: this.nextExternalStreamId_++,
-      originalId: null,
-      createSegmentIndex: () => Promise.resolve(),
-      segmentIndex: shaka.media.SegmentIndex.forSingleSegment(
-          /* startTime= */ 0,
-          /* duration= */ duration,
-          /* uris= */ [uri]),
-      mimeType: mimeType || '',
-      codecs: codec || '',
-      kind: kind,
-      encrypted: false,
-      drmInfos: [],
-      keyIds: new Set(),
-      language: language,
-      label: label || null,
-      type: ContentType.TEXT,
-      primary: false,
-      trickModeVideo: null,
-      emsgSchemeIdUris: null,
-      roles: [],
-      forced: !!forced,
-      channelsCount: null,
-      audioSamplingRate: null,
-      spatialAudio: false,
-      closedCaptions: null,
-    };
-
-    const fullMimeType = shaka.util.MimeUtils.getFullType(
-        stream.mimeType, stream.codecs);
-    const supported = shaka.text.TextEngine.isTypeSupported(fullMimeType);
-    if (!supported) {
-      throw new shaka.util.Error(
-          shaka.util.Error.Severity.CRITICAL,
-          shaka.util.Error.Category.TEXT,
-          shaka.util.Error.Code.MISSING_TEXT_PLUGIN,
-          mimeType);
-    }
-
-    this.manifest_.textStreams.push(stream);
-    this.onTracksChanged_();
-    return shaka.util.StreamUtils.textStreamToTrack(stream);
-  }
-
   /**
    * Adds the given text track to the loaded manifest.  <code>load()</code> must
    * resolve before calling.  The presentation must have a duration.
@@ -4918,6 +4734,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         periodStart: 0,
         segmentStart: 0,
         segmentEnd: this.video_.duration,
+        vttOffset: 0,
       };
       const data = shaka.util.BufferUtils.toUint8(buffer);
       const cues = obj.parseMedia(data, time);
@@ -6574,7 +6391,6 @@ shaka.Player.EventName = {
   Emsg: 'emsg',
   Error: 'error',
   ExpirationUpdated: 'expirationupdated',
-  LargeGap: 'largegap',
   Loaded: 'loaded',
   Loading: 'loading',
   ManifestParsed: 'manifestparsed',
@@ -6634,7 +6450,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @define {string} A version number taken from git at compile time.
  * @export
  */
-shaka.Player.version = 'v3.3.5-uncompiled';
+shaka.Player.version = 'v4.0.2-uncompiled';
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/media_capabilities.js

@@ -24,8 +24,8 @@ shaka.polyfill.MediaCapabilities = class {
    * @export
    */
   static install() {
-    // Since MediaCapabilities is not fully supported on Chromecast yet, we
-    // should always install polyfill for Chromecast.
+    // Since MediaCapabilities is not fully supported on some Chromecast yet,
+    // we should always install polyfill for all Chromecast not Android-based.
     // TODO: re-evaluate MediaCapabilities in the future versions of Chromecast.
     // Since MediaCapabilities implementation is buggy in Apple browsers, we
     // should always install polyfill for Apple browsers.
@@ -37,10 +37,16 @@ shaka.polyfill.MediaCapabilities = class {
     // See: https://github.com/shaka-project/shaka-player/issues/3582
     // TODO: re-evaluate MediaCapabilities in the future versions of PS5
     // Browsers.
-    if (!shaka.util.Platform.isChromecast() &&
-        !shaka.util.Platform.isApple() &&
-        !shaka.util.Platform.isPS5() &&
-        navigator.mediaCapabilities) {
+    let canUseNativeMCap = true;
+    if (shaka.util.Platform.isApple() ||
+        shaka.util.Platform.isPS5() ||
+        shaka.util.Platform.isChromecast()) {
+      canUseNativeMCap = false;
+    }
+    if (shaka.util.Platform.isAndroidCastDevice()) {
+      canUseNativeMCap = true;
+    }
+    if (canUseNativeMCap && navigator.mediaCapabilities) {
       shaka.log.info(
           'MediaCapabilities: Native mediaCapabilities support found.');
       return;

package/lib/polyfill/mediasource.js

@@ -38,11 +38,6 @@ shaka.polyfill.MediaSource = class {
       // Chromecast cannot make accurate determinations via isTypeSupported.
       shaka.polyfill.MediaSource.patchCastIsTypeSupported_();
     } else if (safariVersion) {
-      // TS content is broken on Safari in general.
-      // See https://github.com/shaka-project/shaka-player/issues/743
-      // and https://bugs.webkit.org/show_bug.cgi?id=165342
-      shaka.polyfill.MediaSource.rejectTsContent_();
-
       // NOTE:  shaka.Player.isBrowserSupported() has its own restrictions on
       // Safari version.
       if (safariVersion <= 12) {
@@ -127,29 +122,6 @@ shaka.polyfill.MediaSource = class {
     };
   }
 
-  /**
-   * Patch isTypeSupported() to reject TS content.  Used to avoid TS-related MSE
-   * bugs on Safari.
-   *
-   * @private
-   */
-  static rejectTsContent_() {
-    const originalIsTypeSupported = MediaSource.isTypeSupported;
-
-    MediaSource.isTypeSupported = (mimeType) => {
-      // Parse the basic MIME type from its parameters.
-      const pieces = mimeType.split(/ *; */);
-      const basicMimeType = pieces[0];
-      const container = basicMimeType.split('/')[1];
-
-      if (container.toLowerCase() == 'mp2t') {
-        return false;
-      }
-
-      return originalIsTypeSupported(mimeType);
-    };
-  }
-
   /**
    * Patch |MediaSource.isTypeSupported| to always reject |codec|. This is used
    * when we know that we are on a platform that does not work well with a given

package/lib/polyfill/patchedmediakeys_nop.js

@@ -49,6 +49,8 @@ shaka.polyfill.PatchedMediaKeysNop = class {
     // These are not usable, but allow Player.isBrowserSupported to pass.
     window.MediaKeys = PatchedMediaKeysNop.MediaKeys;
     window.MediaKeySystemAccess = PatchedMediaKeysNop.MediaKeySystemAccess;
+
+    window.shakaMediaKeysPolyfill = true;
   }
 
   /**

package/lib/polyfill/patchedmediakeys_webkit.js

@@ -72,6 +72,8 @@ shaka.polyfill.PatchedMediaKeysWebkit = class {
         PatchedMediaKeysWebkit.setMediaKeys;
     window.MediaKeys = PatchedMediaKeysWebkit.MediaKeys;
     window.MediaKeySystemAccess = PatchedMediaKeysWebkit.MediaKeySystemAccess;
+
+    window.shakaMediaKeysPolyfill = true;
   }
 
   /**

package/lib/text/cue.js

@@ -234,12 +234,6 @@ shaka.text.Cue = class {
      */
     this.lineBreak = false;
 
-    /**
-     * @override
-     * @exportInterface
-     */
-    this.spacer = false;
-
     /**
      * @override
      * @exportInterface

package/lib/text/lrc_text_parser.js

@@ -28,6 +28,14 @@ shaka.text.LrcTextParser = class {
     goog.asserts.assert(false, 'LRC does not have init segments');
   }
 
+  /**
+   * @override
+   * @export
+   */
+  setSequenceMode(sequenceMode) {
+    // Unused.
+  }
+
   /**
    * @override
    * @export

package/lib/text/mp4_ttml_parser.js

@@ -55,6 +55,14 @@ shaka.text.Mp4TtmlParser = class {
     }
   }
 
+  /**
+   * @override
+   * @export
+   */
+  setSequenceMode(sequenceMode) {
+    // Unused.
+  }
+
   /**
    * @override
    * @export

package/lib/text/mp4_vtt_parser.js

@@ -84,6 +84,14 @@ shaka.text.Mp4VttParser = class {
     }
   }
 
+  /**
+   * @override
+   * @export
+   */
+  setSequenceMode(sequenceMode) {
+    // Unused.
+  }
+
   /**
    * @override
    * @export

package/lib/text/sbv_text_parser.js

@@ -27,6 +27,14 @@ shaka.text.SbvTextParser = class {
     goog.asserts.assert(false, 'SubViewer does not have init segments');
   }
 
+  /**
+   * @override
+   * @export
+   */
+  setSequenceMode(sequenceMode) {
+    // Unused.
+  }
+
   /**
    * @override
    * @export

package/lib/text/simple_text_displayer.js

@@ -12,7 +12,6 @@
 goog.provide('shaka.text.SimpleTextDisplayer');
 
 goog.require('goog.asserts');
-goog.require('shaka.Deprecate');
 goog.require('shaka.log');
 goog.require('shaka.text.Cue');
 
@@ -108,12 +107,7 @@ shaka.text.SimpleTextDisplayer = class {
         return `${acc}</${tag}>`;
       }, '');
 
-      if (cue.lineBreak || cue.spacer) {
-        if (cue.spacer) {
-          shaka.Deprecate.deprecateFeature(4,
-              'shaka.extern.Cue',
-              'Please use lineBreak instead of spacer.');
-        }
+      if (cue.lineBreak) {
         // This is a vertical lineBreak, so insert a newline.
         return '\n';
       } else if (cue.nestedCues.length) {

package/lib/text/srt_text_parser.js

@@ -35,6 +35,14 @@ shaka.text.SrtTextParser = class {
     goog.asserts.assert(false, 'SRT does not have init segments');
   }
 
+  /**
+   * @override
+   * @export
+   */
+  setSequenceMode(sequenceMode) {
+    // Unused.
+  }
+
   /**
    * @override
    * @export

package/lib/text/ssa_text_parser.js

@@ -28,6 +28,14 @@ shaka.text.SsaTextParser = class {
     goog.asserts.assert(false, 'SSA does not have init segments');
   }
 
+  /**
+   * @override
+   * @export
+   */
+  setSequenceMode(sequenceMode) {
+    // Unused.
+  }
+
   /**
    * @override
    * @export

package/lib/text/text_engine.js

@@ -7,9 +7,9 @@
 goog.provide('shaka.text.TextEngine');
 
 goog.require('goog.asserts');
+goog.require('shaka.log');
 goog.require('shaka.text.Cue');
 goog.require('shaka.util.BufferUtils');
-goog.require('shaka.util.Functional');
 goog.require('shaka.util.IDestroyable');
 goog.require('shaka.util.MimeUtils');
 goog.requireType('shaka.cea.ICaptionDecoder');
@@ -30,6 +30,9 @@ shaka.text.TextEngine = class {
     /** @private {shaka.extern.TextDisplayer} */
     this.displayer_ = displayer;
 
+    /** @private {boolean} */
+    this.segmentRelativeVttTiming_ = false;
+
     /** @private {number} */
     this.timestampOffset_ = 0;
 
@@ -128,8 +131,10 @@ shaka.text.TextEngine = class {
    * called at least once before appendBuffer.
    *
    * @param {string} mimeType
+   * @param {boolean} sequenceMode
+   * @param {boolean} segmentRelativeVttTiming
    */
-  initParser(mimeType) {
+  initParser(mimeType, sequenceMode, segmentRelativeVttTiming) {
     // No parser for CEA, which is extracted from video and side-loaded
     // into TextEngine and TextDisplayer.
     if (mimeType == shaka.util.MimeUtils.CEA608_CLOSED_CAPTION_MIMETYPE ||
@@ -140,7 +145,14 @@ shaka.text.TextEngine = class {
     const factory = shaka.text.TextEngine.parserMap_[mimeType];
     goog.asserts.assert(
         factory, 'Text type negotiation should have happened already');
-    this.parser_ = shaka.util.Functional.callFactory(factory);
+    this.parser_ = factory();
+    if (this.parser_.setSequenceMode) {
+      this.parser_.setSequenceMode(sequenceMode);
+    } else {
+      shaka.log.alwaysWarn(
+          'Text parsers should have a "setSequenceMode" method!');
+    }
+    this.segmentRelativeVttTiming_ = segmentRelativeVttTiming;
   }
 
   /**
@@ -166,11 +178,15 @@ shaka.text.TextEngine = class {
       return;
     }
 
+    const vttOffset = this.segmentRelativeVttTiming_ ?
+        startTime : this.timestampOffset_;
+
     /** @type {shaka.extern.TextParser.TimeContext} **/
     const time = {
       periodStart: this.timestampOffset_,
       segmentStart: startTime,
       segmentEnd: endTime,
+      vttOffset: vttOffset,
     };
 
     // Parse the buffer and add the new cues.

package/lib/text/ttml_text_parser.js

@@ -30,6 +30,14 @@ shaka.text.TtmlTextParser = class {
     goog.asserts.assert(false, 'TTML does not have init segments');
   }
 
+  /**
+   * @override
+   * @export
+   */
+  setSequenceMode(sequenceMode) {
+    // Unused.
+  }
+
   /**
    * @override
    * @export

package/lib/text/ui_text_displayer.js

@@ -8,7 +8,6 @@
 goog.provide('shaka.text.UITextDisplayer');
 
 goog.require('goog.asserts');
-goog.require('shaka.Deprecate');
 goog.require('shaka.text.Cue');
 goog.require('shaka.text.CueRegion');
 goog.require('shaka.util.Dom');
@@ -343,12 +342,7 @@ shaka.text.UITextDisplayer = class {
   createCue_(cue, parents) {
     const isNested = parents.length > 1;
     let type = isNested ? 'span' : 'div';
-    if (cue.lineBreak || cue.spacer) {
-      if (cue.spacer) {
-        shaka.Deprecate.deprecateFeature(4,
-            'shaka.extern.Cue',
-            'Please use lineBreak instead of spacer.');
-      }
+    if (cue.lineBreak) {
       type = 'br';
     }