Merge lp:~jeremywootten/audience/fix-1627167-black-bars into lp:~audience-members/audience/trunk

[Jeremy Wootten]

This branch addresses a number of problems relating to the display and sizing of videos.

* Black bars around video are eliminated. Note however that resizing by drag and drop, which does not maintain aspect ratio because of a window manager bug, can now result in parts of the video being truncated.

* Implement fixed aspect ratio resizing using Ctrl-Scroll or the keyboard.

* Make sure Welcome Page is always correct size when returning from resized, maximised or minimized window.

* Videos start at their native size and a minimum size is applied

* Implement F11 to toggle fullscreen

* Unmaximise and unfullscreen return to correct window size

* Closing the window while a video is playing no longer results in a segfault

[Jeremy Wootten (jeremywootten)]

This will be resubmitted as separate smaller branches after migration to github.

Unmerged revisions

740. By Jeremy Wootten on 2017-04-03

Fix segfault when closing while playing

739. By Jeremy Wootten on 2017-04-03

Resume at same size

738. By Jeremy Wootten on 2017-04-03

Implement F11 to toggle fullscreen

737. By Jeremy Wootten on 2017-04-03

Implement keyboard resizing with fixed aspect ratio

736. By Jeremy Wootten on 2017-04-03

Implement Ctrl-Scroll resizing with constant aspect ratio

735. By Jeremy Wootten on 2017-04-03

Handle player size change in Window; Fix size of Welcome Page

734. By Jeremy Wootten on 2017-04-03

Remove black borders

=== modified file 'src/Widgets/Player/PlayerPage.vala'
--- src/Widgets/Player/PlayerPage.vala	2016-11-02 23:59:41 +0000
+++ src/Widgets/Player/PlayerPage.vala	2017-04-03 18:18:46 +0000
@@ -11,6 +11,7 @@
     public class PlayerPage : Gtk.EventBox {
         public signal void unfullscreen_clicked ();
         public signal void ended ();
+        public signal void aspect_changed (int width, int height);
 
         public GtkClutter.Embed clutter;
         private Clutter.Actor video_actor;
@@ -78,16 +79,14 @@
             var aspect_ratio = ClutterGst.Aspectratio.@new ();
 #endif
             ((ClutterGst.Aspectratio) aspect_ratio).paint_borders = false;
+            ((ClutterGst.Aspectratio) aspect_ratio).fill_allocation = true;
             ((ClutterGst.Content) aspect_ratio).player = playback;
-            /* Commented because of a bug in the compositor
+
             ((ClutterGst.Content) aspect_ratio).size_change.connect ((width, height) => {
-                double aspect = ((double) width)/((double) height);
-                var geometry = Gdk.Geometry ();
-                geometry.min_aspect = aspect;
-                geometry.max_aspect = aspect;
-                ((Gtk.Window) get_toplevel ()).set_geometry_hints (get_toplevel (), geometry, Gdk.WindowHints.ASPECT);
+                set_size_request (width / 3, height / 3); // Set minimum video size
+                aspect_changed (width, height); // notify window
             });
-            */
+
             video_actor.content = aspect_ratio;
 
             video_actor.add_constraint (new Clutter.BindConstraint (stage, Clutter.BindCoordinate.WIDTH, 0));

=== modified file 'src/Window.vala'
--- src/Window.vala	2017-01-25 22:40:27 +0000
+++ src/Window.vala	2017-04-03 18:18:46 +0000
@@ -22,6 +22,9 @@
  */
 
 public class Audience.Window : Gtk.Window {
+    private const int DEFAULT_WIDTH = 1000;
+    private const int DEFAULT_HEIGHT = 680;
+
     private Gtk.Stack main_stack;
     private Gtk.HeaderBar header;
     private PlayerPage player_page;
@@ -33,8 +36,9 @@
     private NavigationButton navigation_button;
     private ZeitgeistManager zeitgeist_manager;
     private Gtk.SearchEntry search_entry;
-
-
+    private int added_height; // The amount by which the window height exceeds the player page size when aspect ratio correct.
+    private double aspect_ratio;
+    private Gtk.Allocation last_video_allocation;
     // For better translation
     const string navigation_button_welcomescreen = N_("Back");
     const string navigation_button_library = N_("Library");
@@ -50,7 +54,8 @@
         zeitgeist_manager = new ZeitgeistManager ();
         window_position = Gtk.WindowPosition.CENTER;
         gravity = Gdk.Gravity.CENTER;
-        set_default_geometry (1000, 680);
+        set_initial_size ();
+        last_video_allocation = {0, 0};
 
         header = new Gtk.HeaderBar ();
         header.set_show_close_button (true);
@@ -130,6 +135,24 @@
             app_notification.visible = true;
         });
 
+        player_page.aspect_changed.connect ((w, h) => {
+            aspect_ratio = (double)h / (double)w;
+            /* Initiate the video playback at natural size. */
+            added_height = get_allocated_height () - player_page.get_allocated_height ();
+            resize (w, h + added_height);
+#if 0
+            /* Not currently included because a bug in the compositor prevents maintaining the
+             * aspect ratio on drag resizing.
+             * Note that using keyboard or scroll now maintains aspect ratio.
+             */
+            var geometry = Gdk.Geometry ();
+            double aspect = ((double) width)/((double) height);
+            geometry.min_aspect = aspect;
+            geometry.max_aspect = aspect;
+            set_geometry_hints (this, geometry, Gdk.WindowHints.ASPECT | Gdk.WindowHints.MIN_SIZE);
+#endif
+        });
+
         alert_view = new Granite.Widgets.AlertView ("", "", "");
         alert_view.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL);
         alert_view.set_vexpand (true);
@@ -205,6 +228,14 @@
                 header.visible = !player_page.fullscreened;
             }
 
+            var flags = (Gdk.WindowState.FULLSCREEN | Gdk.WindowState.MAXIMIZED | Gdk.WindowState.ICONIFIED);
+            if ((flags & e.changed_mask) > 0 &&
+                (flags & e.new_window_state) == 0 &&
+                main_stack.get_visible_child () == welcome_page) {
+
+                set_initial_size (); //make sure Welcome Page is default size.
+            }
+
             /*/ FIXME: Remove comments once gala bug is fixed: https://bugs.launchpad.net/gala/+bug/1602722
             if (Gdk.WindowState.MAXIMIZED in e.changed_mask) {
                 bool currently_maximixed = Gdk.WindowState.MAXIMIZED in e.new_window_state;
@@ -216,6 +247,16 @@
 
             return false;
         });
+
+        scroll_event.connect (on_scroll_event);
+
+        delete_event.connect (() => {
+            if (player_page.playing) {
+                /* This prevents a segmentation fault and allows proper shutdown of application */
+                navigate_back ();
+            }
+            return false;
+        });
     }
 
     /** Returns true if the code parameter matches the keycode of the keyval parameter for
@@ -248,7 +289,7 @@
                 player_page.next_audio ();
             } else if (match_keycode (Gdk.Key.s, keycode)) {
                 player_page.next_text ();
-            } else if (match_keycode (Gdk.Key.f, keycode)) {
+            } else if (match_keycode (Gdk.Key.f, keycode) || match_keycode (Gdk.Key.F11, keycode)) {
                 if (player_page.fullscreened) {
                     unfullscreen ();
                 } else {
@@ -309,6 +350,13 @@
                     player_page.seek_jump_seconds (600); // 10 mins
                     player_page.reveal_control ();
                     break;
+                case Gdk.Key.minus:
+                case Gdk.Key.plus:
+                case Gdk.Key.equal: 
+                    if (Gdk.ModifierType.CONTROL_MASK in e.state) {
+                        schedule_resize (e.keyval != Gdk.Key.minus);
+                    }
+                    break;
                 default:
                     break;
             }
@@ -342,6 +390,52 @@
         return base.key_press_event (e);
     }
 
+    public bool on_scroll_event (Gdk.EventScroll e) {
+        /* Ctrl-Scroll to resize only applies to player page */
+        if (main_stack.get_visible_child () != player_page) {
+            return false;
+        }
+
+        switch (e.direction) {
+            case Gdk.ScrollDirection.DOWN:
+            case Gdk.ScrollDirection.UP:
+                    if (Gdk.ModifierType.CONTROL_MASK in e.state) {
+                        schedule_resize (e.direction == Gdk.ScrollDirection.UP);
+                        return true;
+                    }
+                    break;
+            default:
+                break;
+        }
+        return false;
+    }
+
+    /* Limit the rate of window resizing by combining rapid events */
+    private int total_horiz_increment = 0;
+    private uint resize_timeout_id = 0;
+    private void schedule_resize (bool increase) {
+        if (resize_timeout_id == 0) {
+            resize_timeout_id = Timeout.add (100, () => {
+                Gtk.Allocation alloc = {};
+                get_allocation (out alloc);
+                int w = alloc.width + total_horiz_increment;
+                int h = (int)((double)w * aspect_ratio) + added_height; // Ensure correct aspect maintained
+
+                resize (w, h);
+
+                resize_timeout_id = 0;
+                total_horiz_increment = 0;
+                return false;
+            });
+        }
+
+        if (increase) {
+            total_horiz_increment += 10;
+        } else {
+            total_horiz_increment -= 10;
+        }
+    }
+
     public void open_files (File[] files, bool clear_playlist = false, bool force_play = true) {
         if (clear_playlist) {
             player_page.get_playlist_widget ().clear_items ();
@@ -453,6 +547,10 @@
         unfullscreen ();
     }
 
+    private void set_initial_size () {
+        resize (DEFAULT_WIDTH, DEFAULT_HEIGHT);
+    }
+
     public void play_file (string uri, bool from_beginning = true) {
         search_entry.visible = false;
         if (navigation_button.visible) {
@@ -467,6 +565,10 @@
         }
 
         main_stack.set_visible_child_full ("player", Gtk.StackTransitionType.SLIDE_LEFT);
+        if (last_video_allocation.width > 0) {
+            resize (last_video_allocation.width, last_video_allocation.height);
+        }
+
         player_page.play_file (uri, from_beginning);
         if (is_maximized) {
             fullscreen ();
@@ -490,6 +592,14 @@
         }
         title = App.get_instance ().program_name;
         get_window ().set_cursor (null);
+        if (is_maximized) {
+            unmaximize ();
+        }
+
+        if (main_stack.get_visible_child () == player_page) {
+            get_allocation (out last_video_allocation);
+        }
+        set_initial_size (); // return to default size for start page
 
         if (navigation_button.label == _(navigation_button_library)) {
             navigation_button.label = _(navigation_button_welcomescreen);