Merge pull request #89 from learning-layers/feature/long-tap-annotation

Feature/long tap annotation

app/src/main/java/fi/aalto/legroup/achso/playback/PlayerFragment.java

@@ -69,6 +69,9 @@ public final class PlayerFragment extends Fragment implements ExoPlayer.Listener
     // Number of framework renderers (currently video and audio)
     private static final int DOWNSTREAM_RENDERER_COUNT = 2;
 
+    // The total buffer size for storing video stream data, in bytes
+    private static final int EXO_BUFFER_SIZE = 1024 * 1024 * 8;
+
     private State state = State.UNPREPARED;
 
     private FrameLayout videoContainer;
@@ -185,7 +188,7 @@ public void prepare(Video video, AnnotationEditor annotationEditor) {
 
         extractor = new Mp4Extractor();
 
-        ExtractorSampleSource source = new ExtractorSampleSource(videoUri, dataSource, extractor, DOWNSTREAM_RENDERER_COUNT, 5 * 1024 * 1024);
+        ExtractorSampleSource source = new ExtractorSampleSource(videoUri, dataSource, extractor, DOWNSTREAM_RENDERER_COUNT, EXO_BUFFER_SIZE);
 
         // The video renderer runs on another thread: we need to supply a handler on the main
         // thread in order to receive events.

app/src/main/java/fi/aalto/legroup/achso/views/MarkerCanvas.java

@@ -160,16 +160,9 @@ private class GestureListener extends GestureDetector.SimpleOnGestureListener {
         /**
          * Called when the canvas is tapped once.
          */
-        @Override
-        public boolean onSingleTapUp(MotionEvent event) {
-            canvasTapped(event);
-            return true;
-        }
-
         @Override
         public boolean onDown(MotionEvent event) {
-            // Best practice to always return true here.
-            // http://developer.android.com/training/gestures/detector.html#detect
+            canvasTapped(event);
             return true;
         }