Merge lp:~darkcs2/audience/fix-1163909 into lp:~audience-members/audience/trunk

[Dark_Cs]

[Cody Garver (codygarver)]

Split up the fixes 1 branch per fix.

I disapprove the window title changes because we intentionally replace dots and underscores and the like with spaces.

review: Needs Fixing

[Cody Garver (codygarver)]

And the typo has already been fixed in trunk it's just stuck updating for some reason.

[Volodymyr Shatsky (shockone89)]

I would also like to discuss the distance of jumps. Usually I want to rewind when I missed something, so 60 seconds are too long and 3 are too short. I suggest to make asymmetric jumps — 10 and 30 seconds for back and forth accordingly.

The solution I always dreamed about is to rewind to the beginning of the current scene, how hard is it to implement?

[lp:~darkcs2/audience/fix-1163909]

262. By Dark_Cs on 2013-04-15

fix: time jumps with arrows (3 seconds / 60 with Ctrl)

[Cody Garver (codygarver)]

I don't think scene detection is feasible because it's CPU intensive and would add loading time before a video can start playing. We should see what the other video players out there are using for skip time.

[Dark_Cs (darkcs2)]

For example, PotPlayer uses 5 seconds for a short jump and 30 with Ctrl. The KMPlayer uses the same settings. I think that this property should be configurable by user.

p.s. What IDE do you use to development and debug? It is difficult to test the program without debugging.

[Cody Garver (codygarver)]

Merged a slightly modified version of this at revision 382

review: Approve

=== modified file 'Audience/Audience.vala'
--- Audience/Audience.vala	2013-04-13 20:13:03 +0000
+++ Audience/Audience.vala	2013-04-15 17:37:26 +0000
@@ -242,13 +242,24 @@
                         mainwindow.destroy ();
                         break;
                     case Gdk.Key.Left:
-                        if ((video_player.progress - 0.05) < 0)
-                            video_player.progress = 0.0;
+                        if ((e.state & Gdk.ModifierType.CONTROL_MASK) != Gdk.ModifierType.CONTROL_MASK)
+                        {
+                            video_player.rewind_seconds (-3);
+                        }
                         else
-                            video_player.progress -= 0.05;
+                        {
+                            video_player.rewind_seconds (-60);
+                        }
                         break;
                     case Gdk.Key.Right:
-                        video_player.progress += 0.05;
+                        if ((e.state & Gdk.ModifierType.CONTROL_MASK) != Gdk.ModifierType.CONTROL_MASK)
+                        {
+                            video_player.rewind_seconds (3);
+                        }
+                        else
+                        {
+                            video_player.rewind_seconds (60);
+                        }
                         break;
                     case Gdk.Key.a:
                         next_audio ();
 
=== modified file 'Audience/Widgets/VideoPlayer.vala'
--- Audience/Widgets/VideoPlayer.vala	2013-04-07 18:53:17 +0000
+++ Audience/Widgets/VideoPlayer.vala	2013-04-15 17:37:26 +0000
@@ -624,5 +624,26 @@
 				dpy.get_screensaver (out timeout, out interval, out prefer_blanking, out allow_exposures);
 			dpy.set_screensaver (enable ? timeout : 0, interval, prefer_blanking, allow_exposures);
 		}
+
+		public void rewind_seconds (int seconds)
+		{
+			int64 gstSecond = 1000000000;
+			int64 position, length;
+			var time = Gst.Format.TIME;
+#if HAS_CLUTTER_GST_1
+			playbin.query_duration (Gst.Format.TIME, out length);
+			playbin.query_position (Gst.Format.TIME, out position);
+#else
+			playbin.query_duration (ref time, out length);
+			playbin.query_position (ref time, out position);
+#endif
+			if ((position + seconds * gstSecond) < 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, (int64)(position + seconds * gstSecond));
+		}
 	}
 }