-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Speakerphone #102
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Speakerphone #102
Conversation
@cloudwebrtc rebased to fix conflict |
@@ -894,11 +900,21 @@ public void mediaStreamTrackSetVolume(final String id, final double volume) { | |||
} | |||
} | |||
|
|||
<<<<<<< HEAD |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here is a conflicting diff tag, which causes compilation errors.
public void mediaStreamTrackSetMicrophoneMute(final String id, boolean mute) { | ||
try { | ||
audioDeviceModule.setMicrophoneMute(mute); | ||
} catch (Exception e) { | ||
Log.e(TAG, "setMicrophoneMute(): error", e); | ||
======= |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The same issue as above. And it looks like need to add
}
}
to complete the body of the method.
audioManager.setSpeakerphoneOn(enabled); | ||
} catch (Exception e) { | ||
Log.e(TAG, "setSpeakerphoneOn(): error", e); | ||
>>>>>>> Add speakerphone support for Android |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a conflict marker and should be removed.
@cloudwebrtc rebased again to fix conflict |
Co-authored-by: alexlapa <lapa.alex@ex.ua>
Adds support for speakerphone feature in Android/iOS.