Remove unnecessary ContentInitializer State

Author: peaBerberian

src/main_thread/init/directfile_content_initializer.ts

@@ -31,7 +31,7 @@ import noop from "../../utils/noop";
 import type { IReadOnlySharedReference } from "../../utils/reference";
 import type { CancellationSignal } from "../../utils/task_canceller";
 import TaskCanceller from "../../utils/task_canceller";
-import { ContentInitializer, ContentInitializerState } from "./types";
+import { ContentInitializer } from "./types";
 import type { IInitialTimeOptions } from "./utils/get_initial_time";
 import getLoadedReference from "./utils/get_loaded_reference";
 import performInitialSeekAndPlay from "./utils/initial_seek_and_play";
@@ -50,7 +50,6 @@ import listenToMediaError from "./utils/throw_on_media_error";
  * @class DirectFileContentInitializer
  */
 export default class DirectFileContentInitializer extends ContentInitializer {
-  public state: ContentInitializerState;
   /**
    * Initial options given to the `DirectFileContentInitializer`.
    */
@@ -67,15 +66,10 @@ export default class DirectFileContentInitializer extends ContentInitializer {
    */
   constructor(settings: IDirectFileOptions) {
     super();
-    this.state = ContentInitializerState.Idle;
     this._settings = settings;
     this._initCanceller = new TaskCanceller();
   }
 
-  public getState(): ContentInitializerState {
-    return this.state;
-  }
-
   /**
    * "Prepare" content so it can later be played by calling `start`.
    */
@@ -97,8 +91,6 @@ export default class DirectFileContentInitializer extends ContentInitializer {
       );
     }
 
-    this.state = ContentInitializerState.Loading;
-    this.trigger("stateChange", this.state);
     if (this._initCanceller.isUsed()) {
       return;
     }
@@ -210,8 +202,6 @@ export default class DirectFileContentInitializer extends ContentInitializer {
   public dispose(): void {
     this._initCanceller.cancel();
     this._initCanceller = new TaskCanceller();
-    this.state = ContentInitializerState.Idle;
-    this.trigger("stateChange", this.state);
   }
 
   /**

src/main_thread/init/media_source_content_initializer.ts

@@ -57,7 +57,7 @@ import { ContentDecryptorState, getKeySystemConfiguration } from "../decrypt";
 import type { ITextDisplayer } from "../text_displayer";
 import { MainThreadMessageType } from "../types";
 import type { ITextDisplayerOptions } from "./types";
-import { ContentInitializer, ContentInitializerState } from "./types";
+import { ContentInitializer } from "./types";
 import type { ICorePlaybackObservation } from "./utils/create_core_playback_observer";
 import createCorePlaybackObserver from "./utils/create_core_playback_observer";
 import {
@@ -79,8 +79,6 @@ const generateContentId = idGenerator();
  * @class MediaSourceContentInitializer
  */
 export default class MediaSourceContentInitializer extends ContentInitializer {
-  public state: ContentInitializerState;
-
   /** Constructor settings associated to this `MultiThreadContentInitializer`. */
   private _settings: IInitializeArguments;
 
@@ -153,7 +151,6 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
    */
   constructor(settings: IInitializeArguments) {
     super();
-    this.state = ContentInitializerState.Idle;
     this._settings = settings;
     this._initCanceller = new TaskCanceller();
     this._currentMediaSourceCanceller = new TaskCanceller();
@@ -168,10 +165,6 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
     this._isPlaybackReady = false;
   }
 
-  public getState(): ContentInitializerState {
-    return this.state;
-  }
-
   /**
    * Perform non-destructive preparation steps, to prepare a future content.
    */
@@ -345,11 +338,6 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
       },
       { clearSignal: this._initCanceller.signal, emitCurrentValue: true },
     );
-
-    if (this.state === ContentInitializerState.Idle) {
-      this.state = ContentInitializerState.Preparing;
-      this.trigger("stateChange", this.state);
-    }
   }
 
   /**
@@ -374,8 +362,6 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
    * @param {Object} playbackObserver
    */
   public start(playbackObserver: IMediaElementPlaybackObserver): void {
-    this.state = ContentInitializerState.Loading;
-    this.trigger("stateChange", this.state);
     if (this._initCanceller.isUsed()) {
       return;
     }
@@ -1360,8 +1346,6 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
       }
       this._currentContentInfo = null;
     }
-    this.state = ContentInitializerState.Idle;
-    this.trigger("stateChange", this.state);
   }
 
   private _onFatalError(err: unknown) {

src/main_thread/init/types.ts

@@ -46,10 +46,6 @@ import type {
  * be emitted after `dispose` is called.
  */
 export abstract class ContentInitializer extends EventEmitter<IContentInitializerEvents> {
-  /**
-   * Exposes the state the `ContentInitializer` is currenly in.
-   */
-  public abstract getState(): ContentInitializerState;
   /**
    * Prepare the content linked to this `ContentInitializer` in the background,
    * without actually trying to play it.
@@ -98,33 +94,6 @@ export abstract class ContentInitializer extends EventEmitter<IContentInitialize
   public abstract dispose(): void;
 }
 
-/** List of "states" in which a `ContentInitializer` may be in. */
-export const enum ContentInitializerState {
-  /**
-   * The `ContentInitializer` has been created but nothing has been done on it
-   * yet.
-   */
-  Idle,
-  /**
-   * A content is being or has been "prepared" which is a step where only some
-   * non-destructive steps, such as loading a Manifest, is performed.
-   *
-   * Note that this state should only be set when the `ContentInitializer` is
-   * only preloading a content, not when it is a step in a `Loading` or
-   * `Preloading` step.
-   */
-  Preparing,
-  /**
-   * A content is being pre-loaded. That is, it is being pre-fetched without
-   * truly playing it yet.
-   * It will switch to `Loading` mode once an `HTMLMediaElement` is attached to
-   * the `PlaybackObserver` linked to that `ContentInitializer`.
-   */
-  Preloading,
-  /** A content is being loaded on a media element. */
-  Loading,
-}
-
 /** Every events emitted by a `ContentInitializer`. */
 export interface IContentInitializerEvents {
   /** Event sent when a minor happened. */
@@ -135,8 +104,6 @@ export interface IContentInitializerEvents {
   manifestReady: IManifestMetadata;
   /** Event sent after the Manifest has been updated. */
   manifestUpdate: IPeriodsUpdateResult;
-  /** Event sent when the "state" of the ContentInitializer updates. */
-  stateChange: ContentInitializerState;
   /**
    * The codecs support for some tracks may have changed.
    */