From efd16a2a2fa5bb8ea3bc61ffd5c10ec69aa96c63 Mon Sep 17 00:00:00 2001 From: Jeff Keen Date: Thu, 11 Jan 2024 16:39:51 -0600 Subject: [PATCH] fix: move urlsAreEqual to base class so all connections benefit --- ember-stereo/src/stereo-connections/base.js | 12 ++++++++++++ ember-stereo/src/stereo-connections/native-audio.js | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ember-stereo/src/stereo-connections/base.js b/ember-stereo/src/stereo-connections/base.js index 780aa913..36e799e2 100644 --- a/ember-stereo/src/stereo-connections/base.js +++ b/ember-stereo/src/stereo-connections/base.js @@ -538,6 +538,18 @@ export default class Sound extends Evented { assert('[ember-stereo] #stop interface not implemented', false); } + urlsAreEqual(url1, url2) { + // GOTCHA: audio.src is a fully qualified URL, and this.url may be a relative url + // So when comparing, make sure we're dealing in absolutes + + let parser1 = document.createElement('a'); + let parser2 = document.createElement('a'); + parser1.href = url1; + parser2.href = url2; + + return parser1.href === parser2.href; + } + teardown() { // optionally implemented in subclasses this.isDestroyed = true; diff --git a/ember-stereo/src/stereo-connections/native-audio.js b/ember-stereo/src/stereo-connections/native-audio.js index 83880b7b..2c8c5ab9 100644 --- a/ember-stereo/src/stereo-connections/native-audio.js +++ b/ember-stereo/src/stereo-connections/native-audio.js @@ -495,18 +495,6 @@ export default class NativeAudio extends BaseSound { } } - urlsAreEqual(url1, url2) { - // GOTCHA: audio.src is a fully qualified URL, and this.url may be a relative url - // So when comparing, make sure we're dealing in absolutes - - let parser1 = document.createElement('a'); - let parser2 = document.createElement('a'); - parser1.href = url1; - parser2.href = url2; - - return parser1.href === parser2.href; - } - teardown() { let audio = this.requestControl(); this.durationWorkaroundTask.cancelAll();