| 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 2a8037753968da804db2874d7becc053bda28270..432042ed25ac2b8c9ceeee3865f3c199eaf9e678 100644
|
| --- a/media/base/android/media_player_bridge.cc
|
| +++ b/media/base/android/media_player_bridge.cc
|
| @@ -50,8 +50,6 @@ MediaPlayerBridge::MediaPlayerBridge(
|
| volume_(-1.0),
|
| allow_credentials_(allow_credentials),
|
| weak_factory_(this) {
|
| - listener_.reset(new MediaPlayerListener(base::MessageLoopProxy::current(),
|
| - weak_factory_.GetWeakPtr()));
|
| }
|
|
|
| MediaPlayerBridge::~MediaPlayerBridge() {
|
| @@ -103,7 +101,7 @@ void MediaPlayerBridge::CreateJavaMediaPlayerBridge() {
|
| if (volume_ >= 0)
|
| SetVolume(volume_);
|
|
|
| - SetMediaPlayerListener();
|
| + AttachListener(j_media_player_bridge_.obj());
|
| }
|
|
|
| void MediaPlayerBridge::SetJavaMediaPlayerBridge(
|
| @@ -121,13 +119,6 @@ base::android::ScopedJavaLocalRef<jobject> MediaPlayerBridge::
|
| return j_bridge;
|
| }
|
|
|
| -void MediaPlayerBridge::SetMediaPlayerListener() {
|
| - jobject j_context = base::android::GetApplicationContext();
|
| - DCHECK(j_context);
|
| -
|
| - listener_->CreateMediaPlayerListener(j_context, j_media_player_bridge_.obj());
|
| -}
|
| -
|
| void MediaPlayerBridge::SetDuration(base::TimeDelta duration) {
|
| duration_ = duration;
|
| }
|
| @@ -386,7 +377,7 @@ void MediaPlayerBridge::Release() {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| Java_MediaPlayerBridge_release(env, j_media_player_bridge_.obj());
|
| j_media_player_bridge_.Reset();
|
| - listener_->ReleaseMediaPlayerListenerResources();
|
| + DetachListener();
|
| }
|
|
|
| void MediaPlayerBridge::SetVolume(double volume) {
|
| @@ -404,29 +395,17 @@ void MediaPlayerBridge::SetVolume(double volume) {
|
| void MediaPlayerBridge::OnVideoSizeChanged(int width, int height) {
|
| width_ = width;
|
| height_ = height;
|
| - manager()->OnVideoSizeChanged(player_id(), width, height);
|
| -}
|
| -
|
| -void MediaPlayerBridge::OnMediaError(int error_type) {
|
| - manager()->OnError(player_id(), error_type);
|
| -}
|
| -
|
| -void MediaPlayerBridge::OnBufferingUpdate(int percent) {
|
| - manager()->OnBufferingUpdate(player_id(), percent);
|
| + MediaPlayerAndroid::OnVideoSizeChanged(width, height);
|
| }
|
|
|
| void MediaPlayerBridge::OnPlaybackComplete() {
|
| time_update_timer_.Stop();
|
| - manager()->OnPlaybackComplete(player_id());
|
| + MediaPlayerAndroid::OnPlaybackComplete();
|
| }
|
|
|
| void MediaPlayerBridge::OnMediaInterrupted() {
|
| time_update_timer_.Stop();
|
| - manager()->OnMediaInterrupted(player_id());
|
| -}
|
| -
|
| -void MediaPlayerBridge::OnSeekComplete() {
|
| - manager()->OnSeekComplete(player_id(), GetCurrentTime());
|
| + MediaPlayerAndroid::OnMediaInterrupted();
|
| }
|
|
|
| void MediaPlayerBridge::OnMediaPrepared() {
|
|
|