Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix external player muting. add audio focus flag #1785

Merged
merged 1 commit into from
Jul 31, 2019
Merged

fix external player muting. add audio focus flag #1785

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ public abstract class Cocos2dxActivity extends Activity implements Cocos2dxHelpe
private Cocos2dxWebViewHelper mWebViewHelper = null;
private boolean hasFocus = false;
private Cocos2dxEditBox mEditBox = null;
private boolean gainAudioFocus = false;
private boolean paused = true;

// DEBUG VIEW BEGIN
private LinearLayout mLinearLayoutForDebugView;
Expand Down Expand Up @@ -276,6 +278,18 @@ public void run() {
});
}

public void setEnableAudioFocusGain(boolean value) {
if(gainAudioFocus != value) {
if(!paused) {
if (value)
Cocos2dxAudioFocusManager.registerAudioFocusListener(this);
else
Cocos2dxAudioFocusManager.unregisterAudioFocusListener(this);
}
gainAudioFocus = value;
}
}

public Cocos2dxGLSurfaceView onCreateView() {
Cocos2dxGLSurfaceView glSurfaceView = new Cocos2dxGLSurfaceView(this);
//this line is need on some device if we specify an alpha bits
Expand Down Expand Up @@ -339,8 +353,10 @@ protected void onCreate(final Bundle savedInstanceState) {
@Override
protected void onResume() {
Log.d(TAG, "onResume()");
paused = false;
super.onResume();
Cocos2dxAudioFocusManager.registerAudioFocusListener(this);
if(gainAudioFocus)
Cocos2dxAudioFocusManager.registerAudioFocusListener(this);
Utils.hideVirtualButton();
resumeIfHasFocus();
}
Expand All @@ -365,15 +381,18 @@ private void resumeIfHasFocus() {
@Override
protected void onPause() {
Log.d(TAG, "onPause()");
paused = true;
super.onPause();
Cocos2dxAudioFocusManager.unregisterAudioFocusListener(this);
if(gainAudioFocus)
Cocos2dxAudioFocusManager.unregisterAudioFocusListener(this);
Cocos2dxHelper.onPause();
mGLSurfaceView.onPause();
}

@Override
protected void onDestroy() {
Cocos2dxAudioFocusManager.unregisterAudioFocusListener(this);
if(gainAudioFocus)
Cocos2dxAudioFocusManager.unregisterAudioFocusListener(this);
Cocos2dxHelper.unregisterBatteryLevelReceiver(this);;
CanvasRenderingContext2DImpl.destroy();

Expand Down