8000 Speakerphone by wbarnard · Pull Request #102 · flutter-webrtc/flutter-webrtc · GitHub
[go: up one dir, main page]

Skip to content

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

Merged
merged 2 commits into from
Jun 4, 2019
Merged

Speakerphone #102

merged 2 commits into from
Jun 4, 2019

Conversation

wbarnard
Copy link
Contributor
@wbarnard wbarnard commented Jun 4, 2019

Adds support for speakerphone feature in Android/iOS.

@cloudwebrtc
Copy link
Member

@wbarnard File conflict after merging #101.

@cloudwebrtc cloudwebrtc requested review from cloudwebrtc and removed request for cloudwebrtc June 4, 2019 07:35
@wbarnard
Copy link
Contributor Author
wbarnard commented Jun 4, 2019

@cloudwebrtc rebased to fix conflict

@@ -894,11 +900,21 @@ public void mediaStreamTrackSetVolume(final String id, final double volume) {
}
}

<<<<<<< HEAD
Copy link
Member

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);
=======
Copy link
Member
@cloudwebrtc cloudwebrtc Jun 4, 2019

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
Copy link 8000
Member

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.

@wbarnard
Copy link
Contributor Author
wbarnard commented Jun 4, 2019

@cloudwebrtc rebased again to fix conflict

@cloudwebrtc cloudwebrtc merged commit 4e2548b into flutter-webrtc:master Jun 4, 2019
cloudwebrtc added a commit that referenced this pull request Jul 4, 2020
evdokimovs added a commit to evdokimovs/flutter-webrtc that referenced this pull request Jun 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
0