Merge lp:~shockone89/audience/rewinding into lp:~audience-members/audience/trunk

[Volodymyr Shatsky]

[Robert Roth (evfool)]

The changes look fine, some comments though
* with these changes, the jump intervals are hardcoded to 5 seconds and 60 seconds, instead of 5% of the total length. Is this something we want? In a 3-hour movie, 60 seconds jumps are rather short. Maybe short jump could work with jump 5-10 seconds, long jump could jump 5-10% of the total length.

review: Needs Fixing

[Robert Roth (evfool)]

Additionally, see my inline comments on the diff for what could be fixed.

review: Needs Fixing

[Cody Garver (codygarver)]

I just did a clean merge of the branch this code came from

review: Disapprove

Unmerged revisions

337. By Volodymyr Shatsky on 2014-05-04

Short and long rewinding.

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2013-11-24 08:10:51 +0000
+++ src/Audience.vala	2014-05-04 14:17:09 +0000
@@ -243,13 +243,18 @@
                         mainwindow.destroy ();
                         break;
                     case Gdk.Key.Left:
-                        if ((video_player.progress - 0.05) < 0)
-                            video_player.progress = 0.0;
-                        else
-                            video_player.progress -= 0.05;
+                        if (modifier_is_pressed (e, Gdk.ModifierType.SHIFT_MASK)) {
+                            video_player.rewind_seconds (-REWIND_LONG);
+                        } else {
+                            video_player.rewind_seconds (-REWIND_SHORT);
+                        }
                         break;
                     case Gdk.Key.Right:
-                        video_player.progress += 0.05;
+                        if (modifier_is_pressed (e, Gdk.ModifierType.SHIFT_MASK)) {
+                            video_player.rewind_seconds (REWIND_LONG);
+                        } else {
+                            video_player.rewind_seconds (REWIND_SHORT);
+                        }
                         break;
                     case Gdk.Key.a:
                         next_audio ();
@@ -597,6 +602,11 @@
             }
         }
 
+        private bool modifier_is_pressed (Gdk.EventKey event, Gdk.ModifierType modifier)
+        {
+            return (event.state & modifier) == modifier;
+        }
+
         internal void open_file (string filename, bool dont_modify=false)
         {
             var file = File.new_for_commandline_arg (filename);
 
=== modified file 'src/Consts.vala'
--- src/Consts.vala	2013-03-31 21:46:37 +0000
+++ src/Consts.vala	2014-05-04 14:17:09 +0000
@@ -2,5 +2,6 @@
 namespace Audience {
     
     public const int CONTROLS_HEIGHT = 32;
-
+    public const int REWIND_SHORT = 5;
+    public const int REWIND_LONG = 60;
 }
 
=== modified file 'src/Widgets/VideoPlayer.vala'
--- src/Widgets/VideoPlayer.vala	2014-04-28 12:58:09 +0000
+++ src/Widgets/VideoPlayer.vala	2014-05-04 14:17:09 +0000
@@ -592,5 +592,21 @@
                 }
             } catch (Error e) { warning (e.message); }
         }
+
+        public void rewind_seconds (int seconds)
+        {
+            int64 position;
+            playbin.query_position (Gst.Format.TIME, out position);
+
+            var gst_seconds = 1000000000 * (int64)seconds;
+            var new_position = position + gst_seconds;
+
+            if (new_position < 0) {
+                playbin.seek_simple (Gst.Format.TIME, Gst.SeekFlags.FLUSH | Gst.SeekFlags.ACCURATE, 1);
+                return;
+            }
+            
+            playbin.seek_simple (Gst.Format.TIME, Gst.SeekFlags.FLUSH | Gst.SeekFlags.ACCURATE, new_position);
+        }
     }
-}
 \ No newline at end of file
+}