Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Side by Side Diff: content/browser/media/session/media_session_delegate_android.cc

Issue 2291163002: Let MediaSession store duck state instead of volume multiplier (Closed)
Patch Set: addressed Anton's comments Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/media/session/media_session_delegate_android.h" 5 #include "content/browser/media/session/media_session_delegate_android.h"
6 6
7 #include "base/android/context_utils.h" 7 #include "base/android/context_utils.h"
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "jni/MediaSessionDelegate_jni.h" 9 #include "jni/MediaSessionDelegate_jni.h"
10 10
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 } 69 }
70 70
71 void MediaSessionDelegateAndroid::OnResume( 71 void MediaSessionDelegateAndroid::OnResume(
72 JNIEnv*, const JavaParamRef<jobject>&) { 72 JNIEnv*, const JavaParamRef<jobject>&) {
73 if (!media_session_->IsReallySuspended()) 73 if (!media_session_->IsReallySuspended())
74 return; 74 return;
75 75
76 media_session_->Resume(MediaSession::SuspendType::SYSTEM); 76 media_session_->Resume(MediaSession::SuspendType::SYSTEM);
77 } 77 }
78 78
79 void MediaSessionDelegateAndroid::OnSetVolumeMultiplier( 79 void MediaSessionDelegateAndroid::OnStartDucking(JNIEnv*, jobject) {
80 JNIEnv*, jobject, jdouble volume_multiplier) { 80 media_session_->StartDucking();
81 media_session_->SetVolumeMultiplier(volume_multiplier); 81 }
82
83 void MediaSessionDelegateAndroid::OnStopDucking(JNIEnv*, jobject) {
84 media_session_->StopDucking();
82 } 85 }
83 86
84 void MediaSessionDelegateAndroid::RecordSessionDuck( 87 void MediaSessionDelegateAndroid::RecordSessionDuck(
85 JNIEnv*, const JavaParamRef<jobject>&) { 88 JNIEnv*, const JavaParamRef<jobject>&) {
86 media_session_->RecordSessionDuck(); 89 media_session_->RecordSessionDuck();
87 } 90 }
88 91
89 // static 92 // static
90 std::unique_ptr<MediaSessionDelegate> MediaSessionDelegate::Create( 93 std::unique_ptr<MediaSessionDelegate> MediaSessionDelegate::Create(
91 MediaSession* media_session) { 94 MediaSession* media_session) {
92 MediaSessionDelegateAndroid* delegate = 95 MediaSessionDelegateAndroid* delegate =
93 new MediaSessionDelegateAndroid(media_session); 96 new MediaSessionDelegateAndroid(media_session);
94 delegate->Initialize(); 97 delegate->Initialize();
95 return std::unique_ptr<MediaSessionDelegate>(delegate); 98 return std::unique_ptr<MediaSessionDelegate>(delegate);
96 } 99 }
97 100
98 } // namespace content 101 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698