fix issue 683. (#684)

* fix issue 683. * fix issue #655.
livekit · Jan 13, 2025 · 20b348c · 20b348c
1 parent 757bcde
commit 20b348c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/lib/src/hardware/hardware.dart b/lib/src/hardware/hardware.dart
@@ -76,10 +76,14 @@ class Hardware {
 
   MediaDevice? selectedVideoInput;
 
-  bool? speakerOn;
+  bool? _speakerOn;
+
+  bool? get speakerOn => _speakerOn;
 
   bool _preferSpeakerOutput = false;
 
+  bool get preferSpeakerOutput => _preferSpeakerOutput;
+
   Future<List<MediaDevice>> enumerateDevices({String? type}) async {
     var infos = await rtc.navigator.mediaDevices.enumerateDevices();
     var devices = infos
@@ -143,21 +147,12 @@ class Hardware {
     }
   }
 
-  bool get preferSpeakerOutput => _preferSpeakerOutput;
-
-  bool get canSwitchSpeakerphone =>
-      (lkPlatformIsMobile()) &&
-      [AudioTrackState.localOnly, AudioTrackState.localAndRemote]
-          .contains(audioTrackState);
+  bool get canSwitchSpeakerphone => lkPlatformIsMobile();
 
   Future<void> setSpeakerphoneOn(bool enable) async {
-    if (lkPlatformIsMobile()) {
-      speakerOn = enable;
-      if (canSwitchSpeakerphone) {
-        await rtc.Helper.setSpeakerphoneOn(enable);
-      } else {
-        logger.warning('Can\'t switch speaker/earpiece');
-      }
+    if (canSwitchSpeakerphone) {
+      _speakerOn = enable;
+      await rtc.Helper.setSpeakerphoneOn(enable);
     } else {
       logger.warning('setSpeakerphoneOn only support on iOS/Android');
     }

diff --git a/lib/src/track/track.dart b/lib/src/track/track.dart
@@ -153,9 +153,8 @@ abstract class Track extends DisposableChangeNotifier
     logger
         .fine('$objectId.disable() disabling ${mediaStreamTrack.objectId}...');
     try {
-      if (_active || !_muted) {
+      if (_active) {
         mediaStreamTrack.enabled = false;
-        if (!_muted) _muted = true;
       }
     } catch (_) {
       logger.warning(