fix bug

1.修复mute事件bug 2.添加volume事件
langhuihui · Apr 15, 2024 · 797d577 · 797d577
1 parent 7d57e91
commit 797d577
Show file tree

Hide file tree

Showing 13 changed files with 64 additions and 241 deletions.
diff --git a/demo/api.md b/demo/api.md
@@ -959,6 +959,16 @@ jessibuca.on("mute", function (flag) {
 })
 ```
 
+### volume
+
+触发音量事件，返回音量值
+
+```js
+jessibuca.on("volume", function (volume) {
+    console.log('volume', volume)
+})
+```
+
 ### stats
 
 流状态统计，流开始播放后回调，每秒1次。

diff --git a/demo/public/decoder.js.map b/demo/public/decoder.js.map
diff --git a/demo/public/dist.zip b/demo/public/dist.zip
diff --git a/demo/public/jessibuca.js b/demo/public/jessibuca.js
diff --git a/demo/public/jessibuca.js.map b/demo/public/jessibuca.js.map
diff --git a/dist/jessibuca.js b/dist/jessibuca.js
diff --git a/src/audio/audioContextLoader.js b/src/audio/audioContextLoader.js
@@ -36,6 +36,7 @@ export default class AudioContextLoader extends Emitter {
         this.audioEnabled(true);
         // default setting 0
         this.gainNode.gain.value = 0;
+        this._prevVolume = null;
 
         this.playing = false;
         //
@@ -89,6 +90,7 @@ export default class AudioContextLoader extends Emitter {
         this.audioSyncVideoOption = {
             diff: null
         };
+        this._prevVolume = null;
         this.off();
         this.player.debug.log('AudioContext', 'destroy');
     }
@@ -204,15 +206,15 @@ export default class AudioContextLoader extends Emitter {
 
     mute(flag) {
         if (flag) {
-            if (!this.isMute) {
-                this.player.emit(EVENTS.mute, flag);
-            }
+            // if (!this.isMute) {
+            //     this.player.emit(EVENTS.mute, flag);
+            // }
             this.setVolume(0);
             this.clear();
         } else {
-            if (this.isMute) {
-                this.player.emit(EVENTS.mute, flag);
-            }
+            // if (this.isMute) {
+            //     this.player.emit(EVENTS.mute, flag);
+            // }
             this.setVolume(0.5);
         }
     }
@@ -224,9 +226,21 @@ export default class AudioContextLoader extends Emitter {
         }
         this.audioEnabled(true);
         volume = clamp(volume, 0, 1);
+        if (this._prevVolume === null) {
+            this.player.emit(EVENTS.mute, volume === 0);
+        } else {
+            if (this._prevVolume === 0 && volume > 0) {
+                this.player.emit(EVENTS.mute, false);
+            } else if (this._prevVolume > 0 && volume === 0) {
+                this.player.emit(EVENTS.mute, true);
+            }
+        }
         this.gainNode.gain.value = volume;
         this.gainNode.gain.setValueAtTime(volume, this.audioContext.currentTime);
         this.player.emit(EVENTS.volumechange, this.player.volume);
+        this.player.emit(EVENTS.volume, this.player.volume); // outer
+        // save last volume
+        this._prevVolume = volume;
     }
 
     closeAudio() {

diff --git a/src/audio/audioLoader.js b/src/audio/audioLoader.js
diff --git a/src/audio/index.js b/src/audio/index.js
@@ -1,5 +1,4 @@
 import AudioContextLoader from "./audioContextLoader";
-import AudioLoader from "./audioLoader";
 
 export default class Audio {
     constructor(player) {

diff --git a/src/audio/mseAudioLoader.js b/src/audio/mseAudioLoader.js
diff --git a/src/constant/index.js b/src/constant/index.js
@@ -148,6 +148,7 @@ export const EVENTS = {
     streamMessage: 'streamMessage',
     streamError: 'streamError',
     volumechange: 'volumechange',
+    volume: 'volume',
     destroy: 'destroy',
     mseSourceOpen: 'mseSourceOpen',
     mseSourceClose: 'mseSourceClose',
@@ -184,7 +185,8 @@ export const JESSIBUCA_EVENTS = {
     recordingTimestamp: EVENTS.recordingTimestamp,
     recordStart: EVENTS.recordStart,
     recordEnd: EVENTS.recordEnd,
-    playToRenderTimes: EVENTS.playToRenderTimes
+    playToRenderTimes: EVENTS.playToRenderTimes,
+    volume: EVENTS.volume
 }
 
 export const EVENTS_ERROR = {