Unverified Commit 70d863e3 authored by Hampton Maxwell's avatar Hampton Maxwell Committed by GitHub
Browse files

Allow timed metadata to compile on older SDKs

parent aa896837
Loading
Loading
Loading
Loading
+9 −3
Changes for android/src/main/java/com/brentvatne/react/ReactVideoView.java: 9 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ public class ReactVideoView extends ScalableVideoView implements
    MediaPlayer.OnPreparedListener,
    MediaPlayer.OnErrorListener,
    MediaPlayer.OnBufferingUpdateListener,
    MediaPlayer.OnTimedMetaDataAvailableListener,
    MediaPlayer.OnCompletionListener,
    MediaPlayer.OnInfoListener,
    LifecycleEventListener,
@@ -197,8 +196,10 @@ public class ReactVideoView extends ScalableVideoView implements
            mMediaPlayer.setOnPreparedListener(this);
            mMediaPlayer.setOnBufferingUpdateListener(this);
            mMediaPlayer.setOnCompletionListener(this);
            mMediaPlayer.setOnTimedMetaDataAvailableListener(this);
            mMediaPlayer.setOnInfoListener(this);
            if (Build.VERSION.SDK_INT >= 23) {
                mMediaPlayer.setOnTimedMetaDataAvailableListener(new TimedMetaDataAvailableListener());
            }
        }
    }

@@ -552,7 +553,11 @@ public class ReactVideoView extends ScalableVideoView implements
        mEventEmitter.receiveEvent(getId(), Events.EVENT_END.toString(), null);
    }
        
    @Override
    // This is not fully tested and does not work for all forms of timed metadata
    @TargetApi(23) // 6.0
    public class TimedMetaDataAvailableListener
            implements MediaPlayer.OnTimedMetaDataAvailableListener
    {
        public void onTimedMetaDataAvailable(MediaPlayer mp, TimedMetaData data) {
            WritableMap event = Arguments.createMap();

@@ -575,6 +580,7 @@ public class ReactVideoView extends ScalableVideoView implements

            mEventEmitter.receiveEvent(getId(), Events.EVENT_TIMED_METADATA.toString(), event);
        }
    }

    @Override
    protected void onDetachedFromWindow() {