improvements to fade timing

Mindgamesnl · Jul 8, 2024 · dd36f04 · dd36f04
1 parent 28cd0ac
commit dd36f04
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 22 deletions.
diff --git a/client/public/metadata.json b/client/public/metadata.json
@@ -1 +1 @@
-{"buildMajor":1,"buildMinor":125,"buildRevision":250,"buildTag":"dev","buildDate":"Thu Jun 13 2024","build":"1.125.250 dev"}
+{"buildMajor":1,"buildMinor":125,"buildRevision":251,"buildTag":"dev","buildDate":"Tue Jul 09 2024","build":"1.125.251 dev"}
diff --git a/client/src/client/services/media/objects/Mixer.jsx b/client/src/client/services/media/objects/Mixer.jsx
@@ -26,7 +26,7 @@ export class Mixer {
     }, 250);
   }
 
-  tick() {
+  tick(forceInstant = false) {
     this.channels.forEach((channel) => {
       channel.tick();
     });
@@ -57,7 +57,7 @@ export class Mixer {
         }
       });
 
-      const fade = channel.getPrefferedFadeTime() > 5;
+      const fade = channel.getPrefferedFadeTime() > 5 && !forceInstant;
 
       if (score >= 1 && !channel.mutedByScore) {
         channel.mutedByScore = true;

diff --git a/client/src/client/services/socket/handlers/HandleCreateMedia.jsx b/client/src/client/services/socket/handlers/HandleCreateMedia.jsx
@@ -43,13 +43,11 @@ export async function handleCreateMedia(data) {
   if (muteRegions) {
     debugLog('Incrementing region inhibit');
     MediaManager.mixer.incrementInhibitor('REGION');
-    MediaManager.mixer.tick();
   }
 
   if (muteSpeakers) {
     debugLog('Incrementing speaker inhibit');
     MediaManager.mixer.incrementInhibitor('SPEAKER');
-    MediaManager.mixer.tick();
   }
 
   MediaManager.mixer.whenFinished(id, () => {
@@ -67,9 +65,12 @@ export async function handleCreateMedia(data) {
 
   createdChannel.setTag(flag);
 
+  MediaManager.mixer.tick();
+
   // load file and play
   await createdMedia.load(source);
   createdChannel.setChannelVolume(0);
+  createdChannel.originalVolume = volume;
   createdMedia.setLooping(looping);
   createdMedia.setStartAt(startAt);
   // convert distance
@@ -83,7 +84,13 @@ export async function handleCreateMedia(data) {
   } else {
     // default sound, just play
     createdChannel.setTag('DEFAULT');
+
     createdMedia.whenInitialized(() => {
+      // are we not already nicked from the start?
+      if (createdChannel.mutedByScore) {
+        return;
+      }
+
       if (fadeTime === 0) {
         createdChannel.setChannelVolume(volume);
         createdChannel.updateFromMasterVolume();

diff --git a/client/src/client/util/AudioSourceProcessor.jsx b/client/src/client/util/AudioSourceProcessor.jsx
@@ -72,11 +72,6 @@ export class AudioSourceProcessor {
         this.isYoutube = true;
       }
 
-      // strip old endpoint
-      if (source.includes('https://weathered-dust-0281.craftmend.workers.dev/')) {
-        source = source.replace('https://weathered-dust-0281.craftmend.workers.dev/', '');
-      }
-
       // handle soundcloud
       if (source.includes('soundcloud.com')) {
         // update now playing too

diff --git a/client/src/metadata.json b/client/src/metadata.json
@@ -1 +1 @@
-{"buildMajor":1,"buildMinor":125,"buildRevision":250,"buildTag":"dev","buildDate":"Thu Jun 13 2024","build":"1.125.250 dev"}
+{"buildMajor":1,"buildMinor":125,"buildRevision":251,"buildTag":"dev","buildDate":"Tue Jul 09 2024","build":"1.125.251 dev"}
diff --git a/modules/vistas-server/dependency-reduced-pom.xml b/modules/vistas-server/dependency-reduced-pom.xml
@@ -152,12 +152,6 @@
       <artifactId>junit</artifactId>
       <version>4.13.2</version>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>hamcrest-core</artifactId>
-          <groupId>org.hamcrest</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
   </dependencies>
   <properties>

diff --git a/plugin/src/main/bash/data.bin b/plugin/src/main/bash/data.bin
@@ -1 +1 @@
-BUILD_NUM="1443"
+BUILD_NUM="1445"
diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/regions/RegionModule.java b/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/regions/RegionModule.java
@@ -90,7 +90,7 @@ public RegionModule(@Nullable AbstractRegionAdapter customAdapter) {
 
         OpenAudioMc.getService(MediaService.class).getResetTriggers().add(() -> {
             // clean media once a new media adapter is loaded, this ensures that they will be re-evaluated
-            worldManagers.forEach((s, worldRegionManager) -> {worldRegionManager.clearMedia();});
+            worldManagers.forEach((s, worldRegionManager) -> {worldRegionManager.dropMediaCache();});
         });
 
         // register unknown regions

diff --git a/plugin/src/main/resources/data.bin b/plugin/src/main/resources/data.bin
@@ -1 +1 @@
-BUILD_NUM="1443"
+BUILD_NUM="1445"
diff --git a/plugin/src/main/resources/openaudiomc-build.properties b/plugin/src/main/resources/openaudiomc-build.properties
@@ -1,3 +1,3 @@
-BUILD_VERSION="1443"
-BUILD_COMMIT="258a4b8a41ea78b464d2501a76164dceee302f7e"
+BUILD_VERSION="1445"
+BUILD_COMMIT="28cd0ac842b271f5be2e8efe9dc60208b96ad077"
 BUILD_AUTHOR="Mats"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"buildMajor":1,"buildMinor":125,"buildRevision":250,"buildTag":"dev","buildDate":"Thu Jun 13 2024","build":"1.125.250 dev"}
		{"buildMajor":1,"buildMinor":125,"buildRevision":251,"buildTag":"dev","buildDate":"Tue Jul 09 2024","build":"1.125.251 dev"}