From 7cb352aaa6868bc9ce1bd09f58f9403f592d3b75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Tue, 5 Aug 2014 19:12:02 +0200
Subject: [PATCH] playback/player: Implement seek throttling

---
 playback/player/android/jni/player.c          | 19 +------------------
 .../src/org/freedesktop/gstreamer/Player.java | 15 ---------------
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/playback/player/android/jni/player.c b/playback/player/android/jni/player.c
index fe7f29d9b4..d9f520c38c 100644
--- a/playback/player/android/jni/player.c
+++ b/playback/player/android/jni/player.c
@@ -56,7 +56,6 @@ static jfieldID native_player_field_id;
 static jmethodID on_position_updated_method_id;
 static jmethodID on_duration_changed_method_id;
 static jmethodID on_end_of_stream_method_id;
-static jmethodID on_seek_finished_method_id;
 static jmethodID on_error_method_id;
 static jmethodID on_video_dimensions_changed_method_id;
 
@@ -143,18 +142,6 @@ on_end_of_stream (GstPlayer * unused, Player * player)
   }
 }
 
-static void
-on_seek_finished (GstPlayer * unused, Player * player)
-{
-  JNIEnv *env = get_jni_env ();
-
-  (*env)->CallVoidMethod (env, player->java_player, on_seek_finished_method_id);
-  if ((*env)->ExceptionCheck (env)) {
-    (*env)->ExceptionDescribe (env);
-    (*env)->ExceptionClear (env);
-  }
-}
-
 static void
 on_error (GstPlayer * unused, GError * err, Player * player)
 {
@@ -202,8 +189,6 @@ native_new (JNIEnv * env, jobject thiz)
       G_CALLBACK (on_duration_changed), player);
   g_signal_connect (player->player, "end-of-stream",
       G_CALLBACK (on_end_of_stream), player);
-  g_signal_connect (player->player, "seek-finished",
-      G_CALLBACK (on_seek_finished), player);
   g_signal_connect (player->player, "error", G_CALLBACK (on_error), player);
   g_signal_connect (player->player, "video-dimensions-changed",
       G_CALLBACK (on_video_dimensions_changed), player);
@@ -423,8 +408,6 @@ native_class_init (JNIEnv * env, jclass klass)
       (*env)->GetMethodID (env, klass, "onDurationChanged", "(J)V");
   on_end_of_stream_method_id =
       (*env)->GetMethodID (env, klass, "onEndOfStream", "()V");
-  on_seek_finished_method_id =
-      (*env)->GetMethodID (env, klass, "onSeekFinished", "()V");
   on_error_method_id =
       (*env)->GetMethodID (env, klass, "onError", "(ILjava/lang/String;)V");
   on_video_dimensions_changed_method_id =
@@ -432,7 +415,7 @@ native_class_init (JNIEnv * env, jclass klass)
 
   if (!native_player_field_id ||
       !on_position_updated_method_id || !on_duration_changed_method_id ||
-      !on_end_of_stream_method_id || !on_seek_finished_method_id ||
+      !on_end_of_stream_method_id ||
       !on_error_method_id || !on_video_dimensions_changed_method_id) {
     static const gchar *message =
         "The calling class does not implement all necessary interface methods";
diff --git a/playback/player/android/src/org/freedesktop/gstreamer/Player.java b/playback/player/android/src/org/freedesktop/gstreamer/Player.java
index 993001a759..d93304d92d 100644
--- a/playback/player/android/src/org/freedesktop/gstreamer/Player.java
+++ b/playback/player/android/src/org/freedesktop/gstreamer/Player.java
@@ -168,21 +168,6 @@ public class Player implements Closeable {
         }
     }
 
-    public static interface SeekFinishedListener {
-        abstract void seekFinished(Player player);
-    }
-
-    private SeekFinishedListener seekFinishedListener;
-    public void setSeekFinishedListener(SeekFinishedListener listener) {
-        seekFinishedListener = listener;
-    }
-
-    private void onSeekFinished() {
-        if (seekFinishedListener != null) {
-            seekFinishedListener.seekFinished(this);
-        }
-    }
-
     // Keep these in sync with gstplayer.h
     private static final Error[] errorMap = {Error.FAILED};
     public enum Error {