| Index: media/base/android/media_player_bridge.cc
|
| diff --git a/media/base/android/media_player_bridge.cc b/media/base/android/media_player_bridge.cc
|
| index ed8854f1b688774a4f00eecca7f4790d88a368b7..a9bf7e42900a7528ce284ee442aa8771b468d65a 100644
|
| --- a/media/base/android/media_player_bridge.cc
|
| +++ b/media/base/android/media_player_bridge.cc
|
| @@ -355,8 +355,6 @@
|
| if (j_media_player_bridge_.is_null())
|
| return;
|
|
|
| - SetAudible(false);
|
| -
|
| time_update_timer_.Stop();
|
| if (prepared_) {
|
| pending_seek_ = GetCurrentTime();
|
| @@ -373,22 +371,15 @@
|
| }
|
|
|
| void MediaPlayerBridge::SetVolume(double volume) {
|
| - volume_ = volume;
|
| -
|
| - if (j_media_player_bridge_.is_null())
|
| - return;
|
| -
|
| - JNIEnv* env = base::android::AttachCurrentThread();
|
| - CHECK(env);
|
| -
|
| - // Update the audible state if we are playing.
|
| - jboolean is_playing = Java_MediaPlayerBridge_isPlaying(
|
| - env, j_media_player_bridge_.obj());
|
| - if (is_playing)
|
| - SetAudible(volume_ > 0);
|
| -
|
| + if (j_media_player_bridge_.is_null()) {
|
| + volume_ = volume;
|
| + return;
|
| + }
|
| +
|
| + JNIEnv* env = base::android::AttachCurrentThread();
|
| + CHECK(env);
|
| Java_MediaPlayerBridge_setVolume(
|
| - env, j_media_player_bridge_.obj(), volume_);
|
| + env, j_media_player_bridge_.obj(), volume);
|
| }
|
|
|
| void MediaPlayerBridge::OnVideoSizeChanged(int width, int height) {
|
| @@ -398,13 +389,11 @@
|
| }
|
|
|
| void MediaPlayerBridge::OnPlaybackComplete() {
|
| - SetAudible(false);
|
| time_update_timer_.Stop();
|
| MediaPlayerAndroid::OnPlaybackComplete();
|
| }
|
|
|
| void MediaPlayerBridge::OnMediaInterrupted() {
|
| - SetAudible(false);
|
| time_update_timer_.Stop();
|
| MediaPlayerAndroid::OnMediaInterrupted();
|
| }
|
| @@ -464,13 +453,9 @@
|
| base::TimeDelta::FromMilliseconds(kTimeUpdateInterval),
|
| this, &MediaPlayerBridge::OnTimeUpdateTimerFired);
|
| }
|
| -
|
| - SetAudible(volume_ > 0);
|
| }
|
|
|
| void MediaPlayerBridge::PauseInternal() {
|
| - SetAudible(false);
|
| -
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| Java_MediaPlayerBridge_pause(env, j_media_player_bridge_.obj());
|
| time_update_timer_.Stop();
|
|
|