Merge lp:~artem-anufrij/audience/Looping-functionality into lp:~audience-members/audience/trunk

[Artem Anufrij]

Improve preview looping

Preview looping functionality was improved.

[Artem Anufrij (artem-anufrij)]

Timer reset functionality was added

[lp:~artem-anufrij/audience/Looping-functionality]

451. By artem-anufrij on 2014-11-02

Looping functionality was improved.

=== modified file 'src/Widgets/PreviewPopover.vala'
--- src/Widgets/PreviewPopover.vala	2014-11-02 21:19:27 +0000
+++ src/Widgets/PreviewPopover.vala	2014-11-02 22:50:42 +0000
@@ -23,6 +23,7 @@
     dynamic Gst.Element preview_playbin;
     Clutter.Texture video;
     double ratio = 0;
+    uint? timer_id = null;
     public PreviewPopover () {
         opacity = GLOBAL_OPACITY;
         can_focus = false;
@@ -57,7 +58,10 @@
         stage.add_child (video);
         add (clutter);
         //show_all ();
-        closed.connect (() => {preview_playbin.set_state (Gst.State.PAUSED);});
+        closed.connect (() => {
+            preview_playbin.set_state (Gst.State.PAUSED);
+            cancel_loop_timer ();
+        });
     }
 
     public void set_preview_uri (string uri) {
@@ -86,13 +90,21 @@
     }
 
     public void set_preview_progress (double progress) {
+        cancel_loop_timer ();
         int64 length;
         preview_playbin.query_duration (Gst.Format.TIME, out length);
         preview_playbin.seek_simple (Gst.Format.TIME, Gst.SeekFlags.FLUSH | Gst.SeekFlags.ACCURATE, (int64)(double.max (progress, 0.0) * length));
         preview_playbin.set_state (Gst.State.PLAYING);
-        Timeout.add_seconds (5, () => {
+        timer_id = Timeout.add_seconds (5, () => {
             set_preview_progress (progress);
             return false;
         });
     }
+
+    private void cancel_loop_timer () {
+        if (timer_id != null) {
+            Source.remove (timer_id);
+            timer_id = null;
+        }
+    }
 }
 \ No newline at end of file