@editframe/elements 0.18.3-beta.0 → 0.18.7-beta.0

package/src/elements/EFMedia.ts

@@ -3,7 +3,6 @@ import { property, state } from "lit/decorators.js";
 
 import type { AudioSpan } from "../transcoding/types/index.ts";
 import { UrlGenerator } from "../transcoding/utils/UrlGenerator.ts";
-// Audio task imports
 import { makeAudioBufferTask } from "./EFMedia/audioTasks/makeAudioBufferTask.ts";
 import { makeAudioFrequencyAnalysisTask } from "./EFMedia/audioTasks/makeAudioFrequencyAnalysisTask.ts";
 import { makeAudioInitSegmentFetchTask } from "./EFMedia/audioTasks/makeAudioInitSegmentFetchTask.ts";
@@ -12,10 +11,7 @@ import { makeAudioSeekTask } from "./EFMedia/audioTasks/makeAudioSeekTask.ts";
 import { makeAudioSegmentFetchTask } from "./EFMedia/audioTasks/makeAudioSegmentFetchTask.ts";
 import { makeAudioSegmentIdTask } from "./EFMedia/audioTasks/makeAudioSegmentIdTask.ts";
 import { makeAudioTimeDomainAnalysisTask } from "./EFMedia/audioTasks/makeAudioTimeDomainAnalysisTask.ts";
-import { AudioElementFactory } from "./EFMedia/services/AudioElementFactory.js";
-// Import extracted services and utilities
-import { MediaSourceService } from "./EFMedia/services/MediaSourceService.js";
-// Common task imports
+import { fetchAudioSpanningTime } from "./EFMedia/shared/AudioSpanUtils.ts";
 import { makeMediaEngineTask } from "./EFMedia/tasks/makeMediaEngineTask.ts";
 import { EFSourceMixin } from "./EFSourceMixin.js";
 import { EFTemporal } from "./EFTemporal.js";
@@ -72,16 +68,6 @@ export class EFMedia extends EFTargetable(
     ];
   }
 
-  // Services for media source and audio element management
-  private mediaSourceService = new MediaSourceService({
-    onError: (error) => {
-      console.error("🎵 [EFMedia] MediaSourceService error:", error);
-    },
-    onReady: () => {},
-  });
-
-  private audioElementFactory = new AudioElementFactory();
-
   static styles = [
     css`
       :host {
@@ -220,6 +206,13 @@ export class EFMedia extends EFTargetable(
     changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>,
   ): void {
     super.updated(changedProperties);
+
+    // Check if our timeline position has actually changed, even if ownCurrentTimeMs isn't tracked as a property
+    const newCurrentSourceTimeMs = this.currentSourceTimeMs;
+    if (newCurrentSourceTimeMs !== this.desiredSeekTimeMs) {
+      this.executeSeek(newCurrentSourceTimeMs);
+    }
+
     if (changedProperties.has("ownCurrentTimeMs")) {
       this.executeSeek(this.currentSourceTimeMs);
     }
@@ -249,6 +242,8 @@ export class EFMedia extends EFTargetable(
   }
 
   protected async executeSeek(seekToMs: number) {
+    // The seekToMs parameter should be the timeline-relative media time
+    // calculated from currentSourceTimeMs which includes timeline positioning
     this.desiredSeekTimeMs = seekToMs;
   }
 
@@ -261,22 +256,7 @@ export class EFMedia extends EFTargetable(
     toMs: number,
     signal: AbortSignal = new AbortController().signal,
   ): Promise<AudioSpan> {
-    // Reset MediaSourceManager for fresh playback session
-    await this.mediaSourceService.initialize();
-
-    // Use the clean, testable utility function
-    const { fetchAudioSpanningTime: fetchAudioSpan } = await import(
-      "./EFMedia/shared/AudioSpanUtils.ts"
-    );
-
-    return fetchAudioSpan(this, fromMs, toMs, signal);
-  }
-
-  /**
-   * Get the HTML audio element for ContextMixin integration
-   */
-  get audioElement(): HTMLAudioElement | null {
-    return this.mediaSourceService.getAudioElement();
+    return fetchAudioSpanningTime(this, fromMs, toMs, signal);
   }
 
   /**
@@ -300,27 +280,4 @@ export class EFMedia extends EFTargetable(
       segmentIds.filter((id) => bufferState.cachedSegments.has(id)),
     );
   }
-
-  /**
-   * Get MediaElementAudioSourceNode for ContextMixin integration
-   * Uses AudioElementFactory for proper caching and lifecycle management
-   */
-  async getMediaElementSource(
-    audioContext: AudioContext,
-  ): Promise<MediaElementAudioSourceNode> {
-    return this.audioElementFactory.createMediaElementSource(
-      audioContext,
-      this.mediaSourceService,
-    );
-  }
-
-  disconnectedCallback(): void {
-    super.disconnectedCallback?.();
-
-    // Clean up MediaSource service
-    this.mediaSourceService.cleanup();
-
-    // Clear audio element factory cache
-    this.audioElementFactory.clearCache();
-  }
 }

package/src/elements/EFTimegroup.ts

@@ -503,32 +503,27 @@ export class EFTimegroup extends EFTemporal(LitElement) {
    * Usage: timegroup.testPlayAudio(0, 5000) // Play first 5 seconds
    */
   async testPlayAudio(fromMs: number, toMs: number) {
-    try {
-      // Render the audio using the existing renderAudio method
-      const renderedBuffer = await this.renderAudio(fromMs, toMs);
-
-      // Create a regular AudioContext for playback
-      const playbackContext = new AudioContext();
-
-      // Create a buffer source and connect it
-      const bufferSource = playbackContext.createBufferSource();
-      bufferSource.buffer = renderedBuffer;
-      bufferSource.connect(playbackContext.destination);
-
-      // Start playback immediately
-      bufferSource.start(0);
-
-      // Return a promise that resolves when playback ends
-      return new Promise<void>((resolve) => {
-        bufferSource.onended = () => {
-          playbackContext.close();
-          resolve();
-        };
-      });
-    } catch (error) {
-      console.error("🎵 [TEST_PLAY_AUDIO] Error:", error);
-      throw error;
-    }
+    // Render the audio using the existing renderAudio method
+    const renderedBuffer = await this.renderAudio(fromMs, toMs);
+
+    // Create a regular AudioContext for playback
+    const playbackContext = new AudioContext();
+
+    // Create a buffer source and connect it
+    const bufferSource = playbackContext.createBufferSource();
+    bufferSource.buffer = renderedBuffer;
+    bufferSource.connect(playbackContext.destination);
+
+    // Start playback immediately
+    bufferSource.start(0);
+
+    // Return a promise that resolves when playback ends
+    return new Promise<void>((resolve) => {
+      bufferSource.onended = () => {
+        playbackContext.close();
+        resolve();
+      };
+    });
   }
 
   async loadMd5Sums() {