Merge lp:~tintou/audience/clutter-gst-3-bis into lp:~audience-members/audience/trunk

[Corentin Noël]

Port to clutter-gst-3.0

[Nathan Dyer (nathandyer)]

The clutter embed is working as expected, but it appears that there are a lot of regressions here. Window resizing is broken, videos have vertical bars on both sides, and the cursor disappears when over the title bar.

review: Needs Fixing

[Cody Garver (codygarver)]

Needs trunk merged in and conflicts resolved

review: Needs Fixing

[Corentin Noël (tintou)]

Merged with trunk.

[Cody Garver (codygarver)]

Still has a lot of regressions like:
* Black bars at the bottom and top when starting video windowed
* Black bars left and right after leaving fullscreen
* Cursor disappears for a while when mousing over video
* Can no longer grab and drag window around by the playback area

[Cody Garver (codygarver)]

* Subtitles aren't shown in the menu

[lp:~tintou/audience/clutter-gst-3-bis]

577. By Corentin Noël on 2016-03-19

Fixed some misbehavior with DVDs

[Corentin Noël (tintou)]

I fixed the grab&drag window but there is nothing I can do for the black bars, there is a bug with the compositor that triggers misbehaviours when I force the window ratio.
I couldn't reproduce subtitles not showing

[Danielle Foré (danrabbit)]

Hm I'm getting crashes when the preview popopver appears. It's doing like weird chasing the cursor (vertically) stuff as well. Not sure if this is related. Also the popover contains pillarboxing (black bars on the sides), so it might not be the window manager's fault after all ;p

[lp:~tintou/audience/clutter-gst-3-bis]

578. By Corentin Noël on 2016-03-20

Fixed popover size request

[Corentin Noël (tintou)]

I fixed the popover preview not being correctly resized, I applied the size to the popover instead of the widget itself. It's still the windows manager fault for the app itself :P

=== modified file 'data/org.pantheon.audience.gschema.xml'
--- data/org.pantheon.audience.gschema.xml	2015-05-16 10:36:21 +0000
+++ data/org.pantheon.audience.gschema.xml	2016-03-20 01:32:19 +0000
@@ -49,10 +49,5 @@
             <summary>Cause the audience window to stay on top by default when it's playing</summary>
             <description>Set the option to keep the audience window above all other windows by default when audience is currently playing</description>
         </key>
-        <key name="show-window-decoration" type="b">
-            <default>true</default>
-            <summary>Don't show the window decorations</summary>
-            <description>Hide the window decorations. You can close the window with escape</description>
-        </key>
     </schema>
 </schemalist>

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2016-02-23 04:26:42 +0000
+++ src/Audience.vala	2016-03-20 01:32:19 +0000
@@ -19,21 +19,9 @@
  *              Artem Anufrij <[e-mail]>
  */
 
-/*
-[CCode (cname="gst_navigation_query_parse_commands_length")]
-public extern bool gst_navigation_query_parse_commands_length (Gst.Query q, out uint n);
-[CCode (cname="gst_navigation_query_parse_commands_nth")]
-public extern bool gst_navigation_query_parse_commands_nth (Gst.Query q, uint n, out Gst.NavigationCommand cmd);
-*/
 namespace Audience {
 
-    public enum Page {
-        WELCOME,
-        PLAYER
-    }
-
     public Audience.Settings settings; //global space for easier access...
-
     public class App : Granite.Application {
 
         /**
@@ -50,8 +38,11 @@
         public const string ABOUT_STOCK = N_("About Audience");
         /// TRANSLATORS: This is the shortcut used to view information about the application itself when its displayed name is the localized equivalent of "Videos".
         public const string ABOUT_GENERIC = N_("About Videos");
-	public const string ABOUT_TRANSLATORS = N_("translator-credits");
-	
+        public const string ABOUT_TRANSLATORS = N_("translator-credits");
+
+        public Window mainwindow;
+        public GLib.VolumeMonitor monitor;
+
         construct {
             program_name = "Audience";
             exec_name = "audience";
@@ -81,318 +72,36 @@
             about_license_type = Gtk.License.GPL_3_0;
         }
 
-        private ZeitgeistManager    zeitgeist_manager;
-        private Gtk.HeaderBar       header;
-
-        public Gtk.Window           mainwindow;
-
-        private Page _page;
-        public Page page {
-            get {
-                return _page;
-            }
-            set {
-                switch (value) {
-                    case Page.PLAYER:
-                        if (page == Page.PLAYER)
-                            break;
-
-                        if (mainwindow.get_child()!=null)
-                            mainwindow.get_child().destroy ();
-
-                        var new_widget = new PlayerPage ();
-                        new_widget.ended.connect (on_player_ended);
-                        mainwindow.add (new_widget);
-                        mainwindow.show_all ();
-
-                        _page = Page.PLAYER;
-                        break;
-                    case Page.WELCOME:
-                        var pl = mainwindow.get_child () as PlayerPage;
-                        if (pl!=null) {
-                            pl.ended.disconnect (on_player_ended);
-                            pl.destroy ();
-                        }
-
-                        var new_widget = new WelcomePage ();
-                        mainwindow.add (new_widget);
-                        mainwindow.show_all ();
-
-                        _page = Page.WELCOME;
-                        break;
-                }
-            }
-        }
-
-        private static App app; // global App instance
-        public DiskManager disk_manager;
-
-        public GLib.VolumeMonitor monitor;
-
-        public signal void media_volumes_changed ();
-
         public App () {
-
             Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = true;
             this.flags |= GLib.ApplicationFlags.HANDLES_OPEN;
-
-            zeitgeist_manager = new ZeitgeistManager ();
+            settings = new Settings ();
+            set_default ();
         }
 
+        private static App app; // global App instance
         public static App get_instance () {
             if (app == null)
                 app = new App ();
             return app;
         }
 
-        void build () {
-            settings = new Settings ();
-            if (is_privacy_mode_enabled ()) {
-                clear_video_settings ();
-            }
-
-            mainwindow = new Gtk.Window ();
-
-            if (settings.last_folder == "-1")
-                settings.last_folder = Environment.get_home_dir ();
-
-            header = new Gtk.HeaderBar ();
-            header.set_show_close_button (true);
-            header.get_style_context ().add_class ("compact");
-
-            disk_manager = DiskManager.get_default ();
-
-            disk_manager.volume_found.connect ((vol) => {
-                media_volumes_changed ();
-            });
-
-            disk_manager.volume_removed.connect ((vol) => {
-                media_volumes_changed ();
-            });
-
-            page = Page.WELCOME;
-
-            mainwindow.set_application (this);
-            mainwindow.set_titlebar (header);
-            mainwindow.window_position = Gtk.WindowPosition.CENTER;
-            mainwindow.gravity = Gdk.Gravity.CENTER;
-            mainwindow.show_all ();
-            if (!settings.show_window_decoration)
-                mainwindow.decorated = false;
-            set_window_title (program_name);
-
-            mainwindow.key_press_event.connect (on_key_press_event);
-
-            mainwindow.destroy.connect (() => {
-                if (is_privacy_mode_enabled ()) {
-                    clear_video_settings ();
-                }
-            });
-
-            setup_drag_n_drop ();
-        }
-
-        public bool has_media_volumes () {
-            return disk_manager.has_media_volumes ();
-        }
-
-        private async void read_first_disk () {
-            if (disk_manager.get_volumes ().length () <= 0)
-                return;
-            var volume = disk_manager.get_volumes ().nth_data (0);
-            if (volume.can_mount () == true && volume.get_mount ().can_unmount () == false) {
-                try {
-                    yield volume.mount (MountMountFlags.NONE, null);
-                } catch (Error e) {
-                    critical (e.message);
-                }
-            }
-
-            page = Page.PLAYER;
-            var root = volume.get_mount ().get_default_location ();
-            play_file (root.get_uri (), true);
-        }
-
-        public void set_content_size (double width, double height, double content_height){
-            var geom = Gdk.Geometry ();
-
-            if (width == 0
-                && height == 0
-                && content_height == 0) {
-                geom.min_aspect = geom.max_aspect = 0;
-            } else {
-                double width_offset = mainwindow.get_allocated_width () - width;
-                double height_offset = mainwindow.get_allocated_height () - content_height;
-
-                debug ("Width: %f, Height: %f, Offset: %f )\n", width, height, content_height);
-
-                geom.min_aspect = geom.max_aspect = (width + width_offset) / (height + height_offset);
-            }
-
-            mainwindow.set_geometry_hints (mainwindow, geom, Gdk.WindowHints.ASPECT);
-        }
-
-        private void on_player_ended () {
-            page = Page.WELCOME;
-        }
-
-        public bool on_key_press_event (Gdk.EventKey e) {
-            switch (e.keyval) {
-                case Gdk.Key.o:
-                    App.get_instance ().run_open_file ();
-                    break;
-                case Gdk.Key.q:
-                    App.get_instance ().mainwindow.destroy ();
-                    break;
-                default:
-                    break;
-            }
-            return false;
-        }
-
-        private inline void clear_video_settings () {
-            settings.last_stopped = 0;
-            settings.last_played_videos = null;
-            settings.current_video = "";
-            settings.last_folder = "";
-        }
-
-        public void run_open_file () {
-            var file = new Gtk.FileChooserDialog (_("Open"), mainwindow, Gtk.FileChooserAction.OPEN,
-                _("_Cancel"), Gtk.ResponseType.CANCEL, _("_Open"), Gtk.ResponseType.ACCEPT);
-            file.set_transient_for (mainwindow);
-            file.select_multiple = true;
-
-            var all_files_filter = new Gtk.FileFilter ();
-            all_files_filter.set_filter_name (_("All files"));
-            all_files_filter.add_pattern ("*");
-
-            var video_filter = new Gtk.FileFilter ();
-            video_filter.set_filter_name (_("Video files"));
-            video_filter.add_mime_type ("video/*");
-
-            file.add_filter (video_filter);
-            file.add_filter (all_files_filter);
-
-            file.set_current_folder (settings.last_folder);
-            if (file.run () == Gtk.ResponseType.ACCEPT) {
-                if (page == Page.WELCOME)
-                    clear_video_settings ();
-
-                File[] files = {};
-                foreach (File item in file.get_files ()) {
-                    files += item;
-                }
-
-                open (files, "");
-                settings.last_folder = file.get_current_folder ();
-            }
-
-            file.destroy ();
-        }
-
-        public void run_open_dvd () {
-            read_first_disk.begin ();
-        }
-
-        /*DnD*/
-        private void setup_drag_n_drop () {
-            Gtk.TargetEntry uris = {"text/uri-list", 0, 0};
-            Gtk.drag_dest_set (mainwindow, Gtk.DestDefaults.ALL, {uris}, Gdk.DragAction.MOVE);
-            mainwindow.drag_data_received.connect ( (ctx, x, y, sel, info, time) => {
-                page = Page.PLAYER;
-                File[] files = {};
-                foreach (var uri in sel.get_uris ()) {
-                    var file = File.new_for_uri (uri);
-                    files += file;
-                }
-                open (files,"");
-            });
-        }
-
-        public void resume_last_videos () {
-            page = Page.PLAYER;
-
-            var player = mainwindow.get_child () as PlayerPage;
-            player.resume_last_videos ();
-        }
-
-        public void set_window_title (string title) {
-            mainwindow.title = title;
-        }
-
-        /*
-           make sure we are in player page and play file
-        */
-        internal void play_file (string uri, bool dont_modify = false) {
-            if (page != Page.PLAYER)
-                page = Page.PLAYER;
-
-            PlayerPage player_page = mainwindow.get_child() as PlayerPage;
-            player_page.play_file (uri);
-
-        }
-
         public override void activate () {
             if (mainwindow == null) {
-                build ();
+                if (settings.last_folder == "-1") {
+                    settings.last_folder = Environment.get_user_special_dir (GLib.UserDirectory.VIDEOS);
+                }
+
+                mainwindow = new Window ();
+                mainwindow.application = this;
+                mainwindow.title = program_name;
             }
         }
 
         //the application was requested to open some files
         public override void open (File[] files, string hint) {
-            if (mainwindow == null)
-                build ();
-
-            if (page != Page.PLAYER)
-                clear_video_settings ();
-
-            page = Page.PLAYER;
-            var player_page = (mainwindow.get_child () as PlayerPage);
-            string[] videos = {};
-            foreach (var file in files) {
-
-                if (file.query_file_type (0) == FileType.DIRECTORY) {
-                    Audience.recurse_over_dir (file, (file_ret) => {
-                        player_page.append_to_playlist (file);
-                        videos += file_ret.get_uri ();
-                    });
-                } else if (player_page.video_player.playing &&
-                        PlayerPage.is_subtitle (file.get_uri ())) {
-                    message ("is subtitle");
-                    player_page.video_player.set_subtitle_uri (file.get_uri ());
-                } else {
-                    player_page.append_to_playlist (file);
-                    videos += file.get_uri ();
-                }
-            }
-
-            if (videos.length == 0)
-                return;
-
-            // notification when adding video to playlist
-            if (!player_page.video_player.playing // we are paused
-                && (mainwindow.get_window ().get_state () & Gdk.WindowState.FOCUSED) == 0) {
-                if (videos.length == 1)
-                    show_notification (_("Video added to playlist"), get_title (videos[0]));
-                else
-                    show_notification (_("%i videos added to playlist").printf (videos.length), "");
-            }
-
-            play_file (videos [0]);
-
-
-        }
-
-        internal bool is_privacy_mode_enabled () {
-            var privacy_settings = new GLib.Settings ("org.gnome.desktop.privacy");
-            bool privacy_mode = !privacy_settings.get_boolean ("remember-recent-files") || !privacy_settings.get_boolean ("remember-app-usage");
-
-            if (privacy_mode) {
-                return true;
-            }
-
-            return zeitgeist_manager.app_into_blacklist (exec_name);
+            activate ();
+            mainwindow.open_files (files);
         }
 
     }

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-10-27 18:43:49 +0000
+++ src/CMakeLists.txt	2016-03-20 01:32:19 +0000
@@ -11,7 +11,16 @@
 # pkgconfig, real C code
 find_package (PkgConfig)
 
-set (PKG_DEPS granite>=0.3.0 clutter-gtk-1.0 gstreamer-1.0 gstreamer-pbutils-1.0 gstreamer-video-1.0 gstreamer-tag-1.0)
+set (PKG_DEPS
+    granite>=0.3.0
+    clutter-gtk-1.0
+    gstreamer-1.0
+    gstreamer-pbutils-1.0
+    gstreamer-video-1.0
+    gstreamer-tag-1.0
+    clutter-gst-3.0
+)
+
 set (VALA_DEPS
     granite>=0.3.0
     clutter-gtk-1.0
@@ -20,6 +29,7 @@
     gstreamer-pbutils-1.0
     gstreamer-video-1.0
     gstreamer-tag-1.0
+    clutter-gst-3.0
 )
 
 pkg_check_modules (DEPS REQUIRED ${PKG_DEPS})
@@ -57,13 +67,13 @@
     Settings.vala
     Utils.vala
     DiskManager.vala
+    Window.vala
     Widgets/BottomBar.vala
     Widgets/SettingsPopover.vala
     Widgets/PreviewPopover.vala
     Widgets/TimeWidget.vala
     Widgets/Playlist.vala
     Widgets/PlaylistPopover.vala
-    Widgets/VideoPlayer.vala
     Widgets/WelcomePage.vala
     Widgets/PlayerPage.vala
   PACKAGES

=== modified file 'src/DiskManager.vala'
--- src/DiskManager.vala	2015-06-07 13:27:10 +0000
+++ src/DiskManager.vala	2016-03-20 01:32:19 +0000
@@ -32,11 +32,18 @@
     }
 
     private GLib.VolumeMonitor monitor;
-    private List<Volume> volumes;
+    private Gee.TreeSet<Volume> volumes;
 
     private DiskManager () {
+        
+    }
+
+    construct {
         monitor = GLib.VolumeMonitor.get ();
-        volumes = monitor.get_volumes ();
+        volumes = new Gee.TreeSet<Volume> ();
+        monitor.get_volumes ().foreach ((volume) => {
+            volumes.add (volume);
+        });
 
         monitor.drive_changed.connect ((drive) => {
             debug ("Drive changed: %s\n", drive.get_name ());
@@ -71,30 +78,32 @@
         monitor.volume_removed.connect ((volume) => {
             volumes.remove (volume);
             volume_removed (volume);
-            debug ("Volume removed: %s"+volumes.length ().to_string (), volume.get_name ());
+            debug ("Volume removed: %s", volume.get_name ());
         });
     }
 
-    public GLib.List<Volume> get_volumes () {
-        return volumes.copy ();
+    public Gee.TreeSet<Volume> get_volumes () {
+        return volumes;
     }
 
-    public GLib.List<Volume> get_media_volumes () {
-        GLib.List<Volume> returnValue = new GLib.List<Volume> ();
+    public Gee.TreeSet<Volume> get_media_volumes () {
+        var return_value = new Gee.TreeSet<Volume> ();
         foreach (Volume volume in volumes) {
-            if (has_dvd_media (volume))
-                returnValue.append (volume);
+            if (has_dvd_media (volume)) {
+                return_value.add (volume);
+            }
         }
-        return returnValue;
+
+        return return_value;
     }
 
     public bool has_media_volumes () {
-        return (get_media_volumes ().length () > 0);
+        return (get_media_volumes ().size > 0);
     }
 
     private void check_for_volume (Volume volume) {
         if (has_dvd_media (volume)) {
-            volumes.append (volume);
+            volumes.add (volume);
             volume_found (volume);
         }
     }

=== modified file 'src/Settings.vala'
--- src/Settings.vala	2015-05-16 10:13:38 +0000
+++ src/Settings.vala	2016-03-20 01:32:19 +0000
@@ -28,7 +28,6 @@
     public string last_folder {get; set;}
     public bool playback_wait {get; set;}
     public bool stay_on_top {get; set;}
-    public bool show_window_decoration {get; set;}
     public string subtitle_font {get; set; }
 
     public Settings () {

=== modified file 'src/Utils.vala'
--- src/Utils.vala	2015-06-06 14:08:15 +0000
+++ src/Utils.vala	2016-03-20 01:32:19 +0000
@@ -68,18 +68,9 @@
     }
 
     public static string get_basename (string filename) {
-        uint end = 0;
-        for (uint start=filename.length; start != 0; start--) {
-            if (filename[start] == '/') {
-                start ++;
-                return filename.substring (start, end - start);
-            }
-
-            if (filename[start] == '.' && end == 0)
-                end = start;
-        }
-
-        return filename.substring (0, end);
+        var name = Path.get_basename (filename);
+
+        return name.split (".", 2)[0];
     }
 
     public static string seconds_to_time (int seconds) {
@@ -103,8 +94,7 @@
     }
 
     public static bool has_dvd () {
-        var disk_manager = DiskManager.get_default ();
-        return disk_manager.get_volumes ().length () > 0;
+        return !DiskManager.get_default ().get_volumes ().is_empty;
     }
 
     public static bool file_exists (string uri) {
@@ -153,8 +143,4 @@
         }
 #endif
     }
-
-    private bool modifier_is_pressed (Gdk.EventKey event, Gdk.ModifierType modifier) {
-        return (event.state & modifier) == modifier;
-    }
 }

=== modified file 'src/Widgets/BottomBar.vala'
--- src/Widgets/BottomBar.vala	2015-11-30 06:29:31 +0000
+++ src/Widgets/BottomBar.vala	2016-03-20 01:32:19 +0000
@@ -24,22 +24,19 @@
     public signal void unfullscreen ();
     public signal void seeked (double val);
 
+    public bool playing { get; set; default=false; }
     public bool hovered { get; set; default=false; }
     public bool fullscreen { get; set; default=false; }
     public SettingsPopover preferences_popover;
     public PlaylistPopover playlist_popover;
     public TimeWidget time_widget;
 
-    private Widgets.VideoPlayer player;
     private Gtk.Button play_button;
     private Gtk.Button preferences_button;
     private Gtk.Revealer unfullscreen_revealer;
-    private bool is_playing = false;
     private uint hiding_timer = 0;
 
-    public BottomBar (Widgets.VideoPlayer player) {
-        this.player = player;
-
+    public BottomBar (ClutterGst.Playback playback) {
         this.events |= Gdk.EventMask.POINTER_MOTION_MASK;
         this.events |= Gdk.EventMask.LEAVE_NOTIFY_MASK;
         this.events |= Gdk.EventMask.ENTER_NOTIFY_MASK;
@@ -63,12 +60,11 @@
         preferences_button.tooltip_text = _("Settings");
         preferences_button.clicked.connect (() => {preferences_popover.show_all (); preferences_popover.queue_resize ();});
 
-        time_widget = new TimeWidget ();
-        time_widget.seeked.connect ((val) => {seeked (val);});
+        time_widget = new TimeWidget (playback);
 
         playlist_popover = new PlaylistPopover ();
         playlist_popover.relative_to = playlist_button;
-        preferences_popover = new SettingsPopover (player);
+        preferences_popover = new SettingsPopover (playback);
         preferences_popover.relative_to = preferences_button;
 
         main_actionbar.pack_start (play_button);
@@ -96,13 +92,25 @@
             }
         });
 
+        play_button.clicked.connect (() => {
+            playing = !playing;
+        });
+
+        notify["playing"].connect (() => {
+            if (playing == true) {
+                ((Gtk.Image) play_button.image).icon_name = "media-playback-pause-symbolic";
+                play_button.tooltip_text = _("Pause");
+                reveal_control ();
+            } else {
+                ((Gtk.Image) play_button.image).icon_name = "media-playback-start-symbolic";
+                play_button.tooltip_text = _("Play");
+                set_reveal_child (true);
+            }
+        });
+
         show_all ();
     }
 
-    public void set_preview_uri (string uri) {
-        time_widget.set_preview_uri (uri);
-    }
-
     public bool get_repeat () {
         return playlist_popover.rep.active;
     }
@@ -123,19 +131,6 @@
         return unfullscreen_revealer;
     }
 
-    public void toggle_play_pause () {
-        is_playing = !is_playing;
-        if (is_playing == true) {
-            play_button.image = new Gtk.Image.from_icon_name ("media-playback-pause-symbolic", Gtk.IconSize.BUTTON);
-            play_button.tooltip_text = _("Pause");
-            reveal_control ();
-        } else {
-            play_button.image = new Gtk.Image.from_icon_name ("media-playback-start-symbolic", Gtk.IconSize.BUTTON);
-            play_button.tooltip_text = _("Play");
-            set_reveal_child (true);
-        }
-    }
-
     private new void set_reveal_child (bool reveal) {
         base.set_reveal_child (reveal);
         if (reveal == true && fullscreen == true) {
@@ -156,10 +151,6 @@
         }
     }
 
-    public void set_progression_time (double current_time, double total_time) {
-        time_widget.set_progression_time (current_time, total_time);
-    }
-
     public void reveal_control () {
         if (child_revealed == false)
             set_reveal_child (true);
@@ -168,7 +159,7 @@
             Source.remove (hiding_timer);
 
         hiding_timer = GLib.Timeout.add (2000, () => {
-            if (hovered == true || preferences_popover.visible == true || playlist_popover.visible == true || is_playing == false) {
+            if (hovered == true || preferences_popover.visible == true || playlist_popover.visible == true || playing == false) {
                 hiding_timer = 0;
                 return false;
             }

=== modified file 'src/Widgets/PlayerPage.vala'
--- src/Widgets/PlayerPage.vala	2016-02-23 04:31:53 +0000
+++ src/Widgets/PlayerPage.vala	2016-03-20 01:32:19 +0000
@@ -7,21 +7,25 @@
         "ass",
         "asc"
     };
-    public class PlayerPage : Gtk.Bin {
-        public GtkClutter.Embed           clutter;
-        public Audience.Widgets.VideoPlayer video_player;
+
+    public class PlayerPage : Gtk.EventBox {
+        public signal void unfullscreen_clicked ();
+        public signal void ended ();
+
+        public GtkClutter.Embed clutter;
+        private Clutter.Actor video_actor;
         private Audience.Widgets.BottomBar bottom_bar;
         private Clutter.Stage stage;
         private Gtk.Revealer unfullscreen_bar;
         private GtkClutter.Actor unfullscreen_actor;
         private GtkClutter.Actor bottom_actor;
-        private GnomeMediaKeys             mediakeys;
+        private GnomeMediaKeys mediakeys;
+        private ClutterGst.Playback playback;
 
         public GnomeSessionManager session_manager;
         uint32 inhibit_cookie;
 
         private bool mouse_primary_down = false;
-        private bool fullscreened = false;
 
         public bool repeat {
             get{
@@ -33,29 +37,75 @@
             }
         }
 
-        public signal void ended ();
+        public bool playing {
+            get {
+                return playback.playing;
+            }
+            set {
+                if (playback.playing == value)
+                    return;
+
+                playback.playing = value;
+            }
+        }
+
+        private bool _fullscreened = false;
+        public bool fullscreened {
+            get {
+                return _fullscreened;
+            }
+            set {
+                _fullscreened = value;
+                bottom_bar.fullscreen = value;
+            }
+        }
 
         public PlayerPage () {
-            video_player = new Widgets.VideoPlayer();
-            video_player.notify["playing"].connect (() => {
-                bottom_bar.toggle_play_pause ();
-                inhibit_session (video_player.playing);
+        }
+
+        construct {
+            events |= Gdk.EventMask.POINTER_MOTION_MASK;
+            events |= Gdk.EventMask.KEY_PRESS_MASK;
+            events |= Gdk.EventMask.KEY_RELEASE_MASK;
+            playback = new ClutterGst.Playback ();
+            playback.set_seek_flags (ClutterGst.SeekFlags.ACCURATE);
+            playback.notify["playing"].connect (() => {
+                inhibit_session (playback.playing);
             });
 
             clutter = new GtkClutter.Embed ();
             stage = (Clutter.Stage)clutter.get_stage ();
             stage.background_color = {0, 0, 0, 0};
 
-            video_player.add_constraint (new Clutter.BindConstraint (stage, Clutter.BindCoordinate.WIDTH, 0));
-            video_player.add_constraint (new Clutter.BindConstraint (stage, Clutter.BindCoordinate.HEIGHT, 0));
-
-            stage.add_child (video_player);
-
-            bottom_bar = new Widgets.BottomBar (video_player);
-            bottom_bar.play_toggled.connect (() => { video_player.playing = !video_player.playing; });
-            bottom_bar.seeked.connect ((val) => { video_player.progress = val; });
-            bottom_bar.unfullscreen.connect (()=>{set_fullscreen (false);});
-            bottom_bar.set_repeat (false);
+            video_actor = new Clutter.Actor ();
+            var aspect_ratio = ClutterGst.Aspectratio.@new ();
+            ((ClutterGst.Aspectratio) aspect_ratio).paint_borders = false;
+            ((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);
+            });
+            */
+            video_actor.content = aspect_ratio;
+
+            video_actor.add_constraint (new Clutter.BindConstraint (stage, Clutter.BindCoordinate.WIDTH, 0));
+            video_actor.add_constraint (new Clutter.BindConstraint (stage, Clutter.BindCoordinate.HEIGHT, 0));
+
+            Signal.connect (clutter, "button-press-event", (GLib.Callback) navigation_event, this);
+            Signal.connect (clutter, "button-release-event", (GLib.Callback) navigation_event, this);
+            Signal.connect (clutter, "key-press-event", (GLib.Callback) navigation_event, this);
+            Signal.connect (clutter, "key-release-event", (GLib.Callback) navigation_event, this);
+            Signal.connect (clutter, "motion-notify-event", (GLib.Callback) navigation_event, this);
+
+            stage.add_child (video_actor);
+
+            bottom_bar = new Widgets.BottomBar (playback);
+            bottom_bar.bind_property ("playing", playback, "playing", BindingFlags.BIDIRECTIONAL);
+            bottom_bar.unfullscreen.connect (() => unfullscreen_clicked ());
 
             unfullscreen_bar = bottom_bar.get_unfullscreen_button ();
 
@@ -71,12 +121,6 @@
             unfullscreen_actor.add_constraint (new Clutter.AlignConstraint (stage, Clutter.AlignAxis.Y_AXIS, 0));
             stage.add_child (unfullscreen_actor);
 
-            this.size_allocate.connect (on_size_allocate);
-            App.get_instance ().mainwindow.key_press_event.connect (on_key_press_event);
-            App.get_instance ().mainwindow.window_state_event.connect (on_window_state_event);
-            if (App.get_instance ().mainwindow.is_maximized)
-                set_fullscreen (true);
-
             //media keys
             try {
                 mediakeys = Bus.get_proxy_sync (BusType.SESSION,
@@ -92,7 +136,7 @@
                             get_playlist_widget ().next ();
                             break;
                         case "Play":
-                            video_player.playing = !video_player.playing;
+                            playback.playing = !playback.playing;
                             break;
                         default:
                             break;
@@ -104,7 +148,7 @@
                 warning (e.message);
             }
 
-            App.get_instance ().mainwindow.motion_notify_event.connect ((event) => {
+            this.motion_notify_event.connect ((event) => {
                 if (mouse_primary_down && settings.move_window) {
                     mouse_primary_down = false;
                     App.get_instance ().mainwindow.begin_move_drag (Gdk.BUTTON_PRIMARY,
@@ -117,13 +161,6 @@
             });
 
             this.button_press_event.connect ((event) => {
-                if (event.button == Gdk.BUTTON_PRIMARY
-                    && event.type == Gdk.EventType.2BUTTON_PRESS) // double left click
-                    set_fullscreen(!fullscreened);
-
-                if (event.button == Gdk.BUTTON_SECONDARY) // right click
-                    bottom_bar.play_toggled ();
-
                 if (event.button == Gdk.BUTTON_PRIMARY)
                     mouse_primary_down = true;
 
@@ -151,31 +188,25 @@
 
             this.destroy.connect (() => {
                 // FIXME:should find better way to decide if its end of playlist
-                if (video_player.progress > 0.99)
+                if (playback.progress > 0.99)
                     settings.last_stopped = 0;
                 else
-                    settings.last_stopped = video_player.progress;
+                    settings.last_stopped = playback.progress;
 
                 get_playlist_widget ().save_playlist ();
             });
 
-            /*events*/
-            video_player.text_tags_changed.connect (bottom_bar.preferences_popover.setup_text);
-            video_player.audio_tags_changed.connect (bottom_bar.preferences_popover.setup_audio);
-            video_player.progression_changed.connect ((current_time, total_time) => {
-                bottom_bar.set_progression_time (current_time, total_time);
-            });
-
             //end
-            video_player.ended.connect (() => {
+            playback.eos.connect (() => {
                 Idle.add (() => {
-                    video_player.progress = 0;
+                    playback.progress = 0;
                     if (!get_playlist_widget ().next ()) {
                         if (repeat) {
                             play_file (get_playlist_widget ().get_first_item ().get_uri ());
-                            video_player.playing = true;
+                            playback.playing = true;
                         } else {
-                            video_player.playing = false;
+                            playback.playing = false;
+                            settings.last_stopped = 0;
                             ended ();
                         }
                     }
@@ -183,26 +214,6 @@
                 });
             });
 
-            video_player.error.connect (() => {
-                App.get_instance ().page = Page.WELCOME;
-            });
-
-            video_player.plugin_install_done.connect (() => {
-                App.get_instance ().page = Page.PLAYER;
-            });
-
-            video_player.notify["playing"].connect (() => {
-                App.get_instance ().mainwindow.set_keep_above (video_player.playing && settings.stay_on_top);
-            });
-
-            bottom_bar.time_widget.slider_motion_event.connect ((event) => {
-                int x, y;
-                bottom_bar.translate_coordinates (App.get_instance ().mainwindow, (int)event.x, (int)event.y, out x, out y);
-                Gtk.Allocation allocation;
-                clutter.get_allocation (out allocation);
-                update_pointer_position (y, allocation.height);
-            });
-
             //playlist wants us to open a file
             get_playlist_widget ().play.connect ((file) => {
                 this.play_file (file.get_uri ());
@@ -212,56 +223,35 @@
                 if (bottom_bar.child_revealed == true) {
                     App.get_instance ().mainwindow.get_window ().set_cursor (null);
                 } else {
-                    App.get_instance ().mainwindow.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.BLANK_CURSOR));
+                    var window = App.get_instance ().mainwindow.get_window ();
+                    var display = window.get_display ();
+                    var cursor = new Gdk.Cursor.for_display (display, Gdk.CursorType.BLANK_CURSOR);
+                    window.set_cursor (cursor);
                 }
             });
 
             add (clutter);
-
             show_all ();
-
-        }
-
-        ~PlayerPage () {
-            video_player.playing = false;
-
-            App.get_instance ().set_content_size (0, 0, 0);
-            this.size_allocate.disconnect (on_size_allocate);
-            App.get_instance ().mainwindow.window_state_event.disconnect (on_window_state_event);
-            App.get_instance ().mainwindow.key_press_event.disconnect (on_key_press_event);
-            if (App.get_instance ().mainwindow.get_window () != null)
-                App.get_instance ().mainwindow.get_window ().set_cursor (null);
-
-            App.get_instance ().mainwindow.unfullscreen ();
-            if (fullscreened)
-                App.get_instance ().mainwindow.maximize ();
-
-            video_player.text_tags_changed.disconnect (bottom_bar.preferences_popover.setup_text);
-            video_player.audio_tags_changed.disconnect (bottom_bar.preferences_popover.setup_audio);
         }
 
         public void play_file (string uri, bool from_beginning = true) {
             debug ("Opening %s", uri);
-            video_player.uri = uri;
             get_playlist_widget ().set_current (uri);
-            bottom_bar.set_preview_uri (uri);
+            playback.uri = uri;
 
             string? sub_uri = get_subtitle_for_uri (uri);
-            if (sub_uri != null)
-                video_player.set_subtitle_uri (sub_uri);
-
-            App.get_instance ().set_window_title (get_title (uri));
-            video_player.relayout ();
-
-            int target_width, target_height, center_x, center_y;
-            get_target_size (out target_width, out target_height, out center_x, out center_y);
-            get_window ().move_resize (center_x, center_y, target_width, target_height);
-
-            update_aspect_ratio ();
-            video_player.playing = !settings.playback_wait;
-            if (from_beginning)
-                video_player.progress = 0.0;
-
+            if (sub_uri != null && sub_uri != uri)
+                playback.set_subtitle_uri (sub_uri);
+
+            App.get_instance ().mainwindow.title = get_title (uri);
+
+            if (from_beginning) {
+                playback.progress = 0.0;
+            } else {
+                playback.progress = settings.last_stopped;
+            }
+
+            playback.playing = !settings.playback_wait;
             Gtk.RecentManager recent_manager = Gtk.RecentManager.get_default ();
             recent_manager.add_item (uri);
 
@@ -270,6 +260,10 @@
             bottom_bar.preferences_popover.setup_audio ();
         }
 
+        public string get_played_uri () {
+            return playback.uri;
+        }
+
         public void next () {
             get_playlist_widget ().next ();
         }
@@ -280,26 +274,46 @@
 
         public void resume_last_videos () {
             play_file (settings.current_video);
-            video_player.playing = false;
-            Idle.add (() => {
-                    if (settings.resume_videos)
-                        video_player.progress = settings.last_stopped;
-                    else
-                        video_player.progress = 0.0;
+            playback.playing = false;
+            if (settings.resume_videos) {
+                playback.progress = settings.last_stopped;
+            } else {
+                playback.progress = 0.0;
+            }
 
-                    return false;
-                    });
-            video_player.playing = !settings.playback_wait;
+            playback.playing = !settings.playback_wait;
         }
 
         public void append_to_playlist (File file) {
-            get_playlist_widget ().add_item (file);
+            if (playback.playing && is_subtitle (file.get_uri ())) {
+                playback.set_subtitle_uri (file.get_uri ());
+            } else {
+                get_playlist_widget ().add_item (file);
+            }
         }
 
         public void play_first_in_playlist () {
             var file = get_playlist_widget ().get_first_item ();
             play_file (file.get_uri ());
-            video_player.progress = 0.0;
+        }
+
+        public void reveal_control () {
+            bottom_bar.reveal_control ();
+        }
+
+        public void next_audio () {
+            bottom_bar.preferences_popover.next_audio ();
+        }
+
+        public void next_text () {
+            bottom_bar.preferences_popover.next_text ();
+        }
+
+        public void seek_jump_seconds (int seconds) {
+            var duration = playback.duration;
+            var progress = playback.progress;
+            var new_progress = ((duration * progress) + (double)seconds)/duration;
+            playback.progress = double.min (new_progress, 1.0);
         }
 
         private Widgets.Playlist get_playlist_widget () {
@@ -324,7 +338,7 @@
             return null;
         }
 
-        public static bool is_subtitle (string uri) {
+        private bool is_subtitle (string uri) {
             if (uri.length < 4 || uri.get_char (uri.length-4) != '.')
                 return false;
 
@@ -344,174 +358,42 @@
             return false;
         }
 
-        private void get_target_size (out int target_width, out int target_height,
-                out int center_x, out int center_y) {
-            Gdk.Rectangle monitor;
-            var screen = Gdk.Screen.get_default ();
-            screen.get_monitor_geometry (screen.get_monitor_at_window (get_window ()),
-                    out monitor);
-
-            if (monitor.width > video_player.video_width
-                && monitor.height > video_player.video_height) {
-                target_width = (int) video_player.video_width;
-                target_height = (int) video_player.video_height;
-            } else {
-                target_width = (int)(monitor.width * 0.9);
-                target_height = (int)((double) video_player.video_height / video_player.video_width * target_width);
-            }
-            center_x = monitor.width / 2 - target_width /2 + monitor.x;
-            center_y = monitor.height / 2 - target_height /2 + monitor.y;
-        }
-
-        private bool on_key_press_event (Gdk.EventKey e) {
-            switch (e.keyval) {
-                case Gdk.Key.p:
-                case Gdk.Key.space:
-                    video_player.playing = !video_player.playing;
-                    break;
-                case Gdk.Key.Escape:
-                    if (fullscreened) {
-                        set_fullscreen (false);
-                    } else {
-                        App.get_instance ().mainwindow.destroy ();
-                    }
-                    return true;
-                case Gdk.Key.Down:
-                    if (modifier_is_pressed (e, Gdk.ModifierType.SHIFT_MASK)) {
-                        video_player.seek_jump_seconds (-5); // 5 secs
-                    } else {
-                        video_player.seek_jump_seconds (-60); // 1 min
-                    }
-                    bottom_bar.reveal_control ();
-                    break;
-                case Gdk.Key.Left:
-                    if (modifier_is_pressed (e, Gdk.ModifierType.SHIFT_MASK)) {
-                        video_player.seek_jump_seconds (-1); // 1 sec
-                    } else {
-                        video_player.seek_jump_seconds (-10); // 10 secs
-                    }
-                    bottom_bar.reveal_control ();
-                    break;
-                case Gdk.Key.Right:
-                    if (modifier_is_pressed (e, Gdk.ModifierType.SHIFT_MASK)) {
-                        video_player.seek_jump_seconds (1); // 1 sec
-                    } else {
-                        video_player.seek_jump_seconds (10); // 10 secs
-                    }
-                    bottom_bar.reveal_control ();
-                    break;
-                case Gdk.Key.Up:
-                    if (modifier_is_pressed (e, Gdk.ModifierType.SHIFT_MASK)) {
-                        video_player.seek_jump_seconds (5); // 5 secs
-                    } else {
-                        video_player.seek_jump_seconds (60); // 1 min
-                    }
-                    bottom_bar.reveal_control ();
-                    break;
-                case Gdk.Key.Page_Down:
-                    video_player.seek_jump_seconds (-600); // 10 mins
-                    bottom_bar.reveal_control ();
-                    break;
-                case Gdk.Key.Page_Up:
-                    video_player.seek_jump_seconds (600); // 10 mins
-                    bottom_bar.reveal_control ();
-                    break;
-                case Gdk.Key.a:
-                    bottom_bar.preferences_popover.next_audio ();
-                    break;
-                case Gdk.Key.s:
-                    bottom_bar.preferences_popover.next_text ();
-                    break;
-                case Gdk.Key.f:
-                    if (fullscreened)
-                        set_fullscreen (false);
-                    else
-                        set_fullscreen (true);
-
-                    break;
-                default:
-                    break;
-            }
-
-            return false;
-        }
-
-        private bool on_window_state_event (Gdk.EventWindowState e){
-            switch (e.changed_mask){
-                case Gdk.WindowState.FULLSCREEN:
-                fullscreened= ((e.new_window_state & Gdk.WindowState.FULLSCREEN)!=0);
-                break;
-                case Gdk.WindowState.MAXIMIZED:
-                bool currently_maximixed = ((e.new_window_state & Gdk.WindowState.MAXIMIZED)!=0);
-                set_fullscreen (currently_maximixed);
-                break;
-            }
-            return false;
-        }
-
-        private void set_fullscreen (bool full){
-            fullscreened = full;
-            if (full) {
-                App.get_instance ().mainwindow.fullscreen ();
-            } else {
-                // unfullscreen shoulnd't be call from elsewhere other than here
-                App.get_instance ().mainwindow.maximize ();
-                App.get_instance ().mainwindow.unfullscreen ();
-            }
-            bottom_bar.fullscreen = full;
-        }
-
-        private uint update_aspect_ratio_timeout = 0;
-        private bool update_aspect_ratio_locked = false;
-        private int prev_width = 0;
-        private int prev_height = 0;
-        private int old_h = -1;
-        private int old_w = -1;
-        /**
-         * Updates the window's aspect ratio locking if enabled.
-         * Return type is just there to make it compatible with Idle.add()
-         */
-        private bool update_aspect_ratio () {
-            if (!settings.keep_aspect
-                || video_player.video_width < 1
-                || video_player.height < 1
-                || !clutter.visible)
-                return false;
-
-            if (update_aspect_ratio_timeout != 0)
-                Source.remove (update_aspect_ratio_timeout);
-
-            update_aspect_ratio_timeout = Timeout.add (200, () => {
-                Gtk.Allocation a;
-                clutter.get_allocation (out a);
-                debug ("%i %i %i,%i\n", a.x, a.y, (this.get_allocated_width () - this.clutter.get_allocated_width ()) / 2, (this.get_allocated_height () - this.clutter.get_allocated_height ()) / 2);
-
-                double width, height;
-                width = clutter.get_allocated_width ();
-                height = width * video_player.video_height / (double) video_player.video_width;
-
-                App.get_instance ().set_content_size (width, height,clutter.get_allocated_height ());
-
-                prev_width = this.get_allocated_width ();
-                prev_height = this.get_allocated_height ();
-
-                update_aspect_ratio_timeout = 0;
-
-                return false;
-            });
-
-            return false;
-        }
-        private void on_size_allocate (Gtk.Allocation alloc) {
-            if (alloc.width != old_w || alloc.height != old_h) {
-                if (video_player.relayout ()) {
-                    old_w = alloc.width;
-                    old_h = alloc.height;
-                }
-            }
-
-            if (prev_width != this.get_allocated_width () || prev_height != this.get_allocated_height ())
-                Idle.add (update_aspect_ratio);
+        [CCode (instance_pos = -1)]
+        private bool navigation_event (GtkClutter.Embed embed, Clutter.Event event) {
+            var video_sink = playback.get_video_sink ();
+            var frame = video_sink.get_frame ();
+
+            if (frame == null)
+                return true;
+
+            float x, y;
+            event.get_coords (out x, out y);
+            // Transform event coordinates into the actor's coordinates
+            video_actor.transform_stage_point (x, y, out x, out y);
+            float actor_width, actor_height;
+            video_actor.get_size (out actor_width, out actor_height);
+
+            /* Convert event's coordinates into the frame's coordinates. */
+            x = x * frame.resolution.width / actor_width;
+            y = y * frame.resolution.height / actor_height;
+
+            switch (event.type) {
+                case Clutter.EventType.MOTION:
+                    ((Gst.Video.Navigation) video_sink).send_mouse_event ("mouse-move", 0, x, y);
+                    break;
+                case Clutter.EventType.BUTTON_PRESS:
+                    ((Gst.Video.Navigation) video_sink).send_mouse_event ("mouse-button-press", (int)event.button.button, x, y);
+                    break;
+                case Clutter.EventType.KEY_PRESS:
+                    warning (X.keysym_to_string (event.key.keyval));
+                    ((Gst.Video.Navigation) video_sink).send_key_event ("key-press", X.keysym_to_string (event.key.keyval));
+                    break;
+                case Clutter.EventType.KEY_RELEASE:
+                    ((Gst.Video.Navigation) video_sink).send_key_event ("key-release", X.keysym_to_string (event.key.keyval));
+                    break;
+            }
+
+            return false;
         }
 
         X.Display dpy;

=== modified file 'src/Widgets/Playlist.vala'
--- src/Widgets/Playlist.vala	2015-10-26 18:28:19 +0000
+++ src/Widgets/Playlist.vala	2016-03-20 01:32:19 +0000
@@ -197,7 +197,7 @@
         }
 
         public void save_playlist () {
-            if (Audience.App.get_instance ().is_privacy_mode_enabled ()) {
+            if (Audience.App.get_instance ().mainwindow.is_privacy_mode_enabled ()) {
                 return;
             }
 

=== modified file 'src/Widgets/PlaylistPopover.vala'
--- src/Widgets/PlaylistPopover.vala	2015-06-08 05:53:03 +0000
+++ src/Widgets/PlaylistPopover.vala	2016-03-20 01:32:19 +0000
@@ -35,8 +35,6 @@
         fil.set_tooltip_text (_("Open file"));
         dvd = new Gtk.Button.from_icon_name ("media-optical-symbolic", Gtk.IconSize.BUTTON);
         dvd.set_tooltip_text (_("Play from Disc"));
-        dvd.no_show_all = true;
-        set_dvd_visibility (App.get_instance ().has_media_volumes ());
 
         rep = new Gtk.ToggleButton ();
         rep.set_image (new Gtk.Image.from_icon_name ("media-playlist-no-repeat-symbolic", Gtk.IconSize.BUTTON));
@@ -45,19 +43,18 @@
         playlist_scrolled = new Gtk.ScrolledWindow (null, null);
         playlist_scrolled.set_min_content_height (100);
         playlist_scrolled.set_min_content_width (260);
-        var app = ((Audience.App) GLib.Application.get_default ());
 
         playlist = new Playlist ();
         playlist_scrolled.add (playlist);
 
         fil.clicked.connect ( () => {
             hide ();
-            app.run_open_file ();
+            App.get_instance ().mainwindow.run_open_file ();
         });
 
         dvd.clicked.connect ( () => {
             hide ();
-            app.run_open_dvd ();
+            App.get_instance ().mainwindow.run_open_dvd ();
         });
 
         rep.toggled.connect ( () => {
@@ -78,19 +75,19 @@
 
         add (grid);
 
-        App.get_instance ().media_volumes_changed.connect (on_media_volumes_changed);
-    }
-
-    ~PlaylistPopover () {
-        App.get_instance ().media_volumes_changed.disconnect (on_media_volumes_changed);
-    }
-
-    private void on_media_volumes_changed () {
-        set_dvd_visibility (App.get_instance ().has_media_volumes ());
+        var disk_manager = DiskManager.get_default ();
+        set_dvd_visibility (disk_manager.has_media_volumes ());
+        disk_manager.volume_found.connect ((vol) => {
+            set_dvd_visibility (disk_manager.has_media_volumes ());
+        });
+
+        disk_manager.volume_removed.connect ((vol) => {
+            set_dvd_visibility (disk_manager.has_media_volumes ());
+        });
     }
 
     private void set_dvd_visibility (bool visible) {
-        dvd.no_show_all = true;
+        dvd.no_show_all = !visible;
         dvd.visible = visible;
     }
 

=== modified file 'src/Widgets/PreviewPopover.vala'
--- src/Widgets/PreviewPopover.vala	2015-06-07 13:27:10 +0000
+++ src/Widgets/PreviewPopover.vala	2016-03-20 01:32:19 +0000
@@ -19,85 +19,79 @@
  */
 
 public class Audience.Widgets.PreviewPopover : Gtk.Popover {
-    public Clutter.Actor preview_actor;
-    dynamic Gst.Element preview_playbin;
-    Clutter.Texture video;
-    double ratio = 0;
+    private enum PlayFlags {
+        VIDEO         = (1 << 0),
+        AUDIO         = (1 << 1),
+        TEXT          = (1 << 2),
+        VIS           = (1 << 3),
+        SOFT_VOLUME   = (1 << 4),
+        NATIVE_AUDIO  = (1 << 5),
+        NATIVE_VIDEO  = (1 << 6),
+        DOWNLOAD      = (1 << 7),
+        BUFFERING     = (1 << 8),
+        DEINTERLACE   = (1 << 9),
+        SOFT_COLORBALANCE = (1 << 10)
+    }
+
+    ClutterGst.Playback playback;
+    GtkClutter.Embed clutter;
     uint? timer_id = null;
-    public PreviewPopover () {
+
+    public PreviewPopover (ClutterGst.Playback main_playback) {
         opacity = GLOBAL_OPACITY;
         can_focus = false;
         sensitive = false;
         modal = false;
 
-        // connect gstreamer stuff
-        preview_playbin = Gst.ElementFactory.make ("playbin", "play");
-        preview_playbin.get_bus ().add_signal_watch ();
-        preview_playbin.get_bus ().message.connect ((msg) => {
-            switch (msg.type) {
-                case Gst.MessageType.STATE_CHANGED:
-                    break;
-                case Gst.MessageType.ASYNC_DONE:
-                    break;
-            }
+        playback = new ClutterGst.Playback ();
+        playback.ready.connect (() => {
+            unowned Gst.Element pipeline = playback.get_pipeline ();
+            int flags;
+            pipeline.get ("flags", out flags);
+            flags &= ~PlayFlags.TEXT;   //disable subtitle
+            flags &= ~PlayFlags.AUDIO;  //disable audio sink
+            pipeline.set ("flags", flags);
         });
-        video = new Clutter.Texture ();
 
-        dynamic Gst.Element video_sink = Gst.ElementFactory.make ("cluttersink", "source");
-        video_sink.texture = video;
-        preview_playbin.video_sink = video_sink;
-        var clutter = new GtkClutter.Embed ();
-        clutter.margin = 6;
+        playback.set_seek_flags (ClutterGst.SeekFlags.ACCURATE);
+        playback.uri = main_playback.uri;
+        playback.playing = false;
+        clutter = new GtkClutter.Embed ();
+        clutter.margin = 3;
         var stage = (Clutter.Stage)clutter.get_stage ();
         stage.background_color = {0, 0, 0, 0};
-        stage.use_alpha = true;
-
-        video.add_constraint (new Clutter.BindConstraint (stage, Clutter.BindCoordinate.WIDTH, 0));
-        video.add_constraint (new Clutter.BindConstraint (stage, Clutter.BindCoordinate.HEIGHT, 0));
-
-        stage.add_child (video);
+
+        var video_actor = new Clutter.Actor ();
+        var aspect_ratio = ClutterGst.Aspectratio.@new ();
+        ((ClutterGst.Aspectratio) aspect_ratio).paint_borders = false;
+        ((ClutterGst.Content) aspect_ratio).player = playback;
+        video_actor.content = aspect_ratio;
+        ((ClutterGst.Content) aspect_ratio).size_change.connect ((width, height) => {
+            clutter.set_size_request (200, (int)(((double) (height*200))/((double) width)));
+        });
+
+        video_actor.add_constraint (new Clutter.BindConstraint (stage, Clutter.BindCoordinate.WIDTH, 0));
+        video_actor.add_constraint (new Clutter.BindConstraint (stage, Clutter.BindCoordinate.HEIGHT, 0));
+
+        stage.add_child (video_actor);
         add (clutter);
-        //show_all ();
+
         closed.connect (() => {
-            preview_playbin.set_state (Gst.State.PAUSED);
+            playback.playing = false;
             cancel_loop_timer ();
         });
     }
+
     ~PreviewPopover () {
-        preview_playbin.set_state (Gst.State.NULL);
-    }
-
-    public void set_preview_uri (string uri) {
-        preview_playbin.set_state (Gst.State.READY);
-        preview_playbin.uri = uri;
-        int flags;
-        preview_playbin.get ("flags", out flags);
-        flags &= ~PlayFlags.TEXT;   //disable subtitle
-        flags &= ~PlayFlags.AUDIO;  //disable audio sink
-        preview_playbin.set ("flags", flags);
-
-        try {
-            var info = new Gst.PbUtils.Discoverer (10 * Gst.SECOND).discover_uri (uri);
-            var video = info.get_video_streams ();
-            if (video != null && video.data != null) {
-                var video_info = (Gst.PbUtils.DiscovererVideoInfo)video.data;
-                uint video_width = video_info.get_width ();
-                uint video_height = video_info.get_height ();
-                ratio = ((double) video_height) / ((double) video_width);
-                set_size_request (200, (int) (ratio*200));
-            }
-        } catch (Error e) {
-            warning (e.message);
-            return;
-        }
+        playback.playing = false;
+        cancel_loop_timer ();
     }
 
     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);
+        playback.progress = progress;
+        playback.playing = true;
+
         timer_id = Timeout.add_seconds (5, () => {
             set_preview_progress (progress);
             return false;

=== modified file 'src/Widgets/SettingsPopover.vala'
--- src/Widgets/SettingsPopover.vala	2015-06-14 07:02:09 +0000
+++ src/Widgets/SettingsPopover.vala	2016-03-20 01:32:19 +0000
@@ -22,14 +22,14 @@
     private Gtk.ComboBoxText languages;
     private Gtk.ComboBoxText subtitles;
     private Gtk.FileChooserButton external_subtitle_file;
-    private Widgets.VideoPlayer player;
+    private ClutterGst.Playback playback;
 
-    public SettingsPopover (Widgets.VideoPlayer player) {
+    public SettingsPopover (ClutterGst.Playback playback) {
+        this.playback = playback;
         opacity = GLOBAL_OPACITY;
 
         languages = new Gtk.ComboBoxText ();
         subtitles = new Gtk.ComboBoxText ();
-        this.player = player;
 
         var all_files_filter = new Gtk.FileFilter ();
         all_files_filter.set_filter_name (_("All files"));
@@ -68,118 +68,84 @@
         setupgrid.column_spacing = 12;
 
         external_subtitle_file.file_set.connect (() => {
-            player.set_subtitle_uri (external_subtitle_file.get_uri ());
+            playback.set_subtitle_uri (external_subtitle_file.get_uri ());
         });
 
-        player.external_subtitle_changed.connect ((uri) => {
-            external_subtitle_file.select_uri (uri);
+        playback.notify["subtitle_uri"].connect (() => {
+            external_subtitle_file.select_uri (playback.subtitle_uri);
         });
 
         subtitles.changed.connect (() => {
-            if (subtitles.active_id == null)
-                return;
-
-            var id = int.parse (subtitles.active_id);
-            player.current_text = id;
+            if (subtitles.active <= -1)
+                return;
+
+            if (subtitles.active_id == "none") {
+                playback.subtitle_track = -1;
+                return;
+            }
+
+            playback.subtitle_track = subtitles.active;
         });
 
         languages.changed.connect ( () => { //place it here to not get problems
-            if (languages.active_id == null)
+            if (languages.active <= -1 || languages.active_id == "def")
                 return;
 
-            player.current_audio = int.parse (languages.active_id);
+            playback.audio_stream = languages.active;
         });
 
         add (setupgrid);
     }
 
     public void setup_text () {
-        subtitles.sensitive = false;
         if (subtitles.model.iter_n_children (null) > 0)
             subtitles.remove_all ();
 
-        int n_text;
-        player.playbin.get ("n-text", out n_text);
-        for (var i=0; i<n_text; i++) {
-            Gst.TagList tags = null;
-            Signal.emit_by_name (player.playbin, "get-text-tags", i, out tags);
-            if (tags == null)
-                continue;
-
-            string desc;
-            string readable = null;
-            tags.get_string (Gst.Tags.LANGUAGE_CODE, out desc);
-            if (desc == null)
-                tags.get_string (Gst.Tags.CODEC, out desc);
-
-            if (desc != null) {
-                readable = Gst.Tag.get_language_name (desc);
-                var language = Gst.Tag.get_language_name (desc);
-                subtitles.append (i.to_string (), language == null ? desc : language);
-                subtitles.sensitive = true;
-            }
-        }
-
-        subtitles.append ("-1", _("None"));
-        subtitles.active_id = player.current_text.to_string ();
+        playback.get_subtitle_tracks ().foreach ((lang) => {
+            subtitles.append (lang, lang);
+        });
+
+        subtitles.append ("none", _("None"));
+        subtitles.active = playback.subtitle_track;
+        subtitles.sensitive = subtitles.model.iter_n_children (null) > 1;
     }
 
     public void setup_audio () {
-        languages.sensitive = false;
         if (languages.model.iter_n_children (null) > 0)
             languages.remove_all ();
 
-        int n_audio;
-        player.playbin.get ("n-audio", out n_audio);
-        for (var i=0; i<n_audio; i++) {
-            Gst.TagList tags = null;
-            Signal.emit_by_name (player.playbin, "get-audio-tags", i, out tags);
-            if (tags == null)
-                continue;
-
-            string desc;
-            string readable = null;
-            tags.get_string (Gst.Tags.LANGUAGE_CODE, out desc);
-            if (desc == null)
-                tags.get_string (Gst.Tags.CODEC, out desc);
-
-            if (desc != null) {
-                readable = Gst.Tag.get_language_name (desc);
-                languages.append (i.to_string (), readable == null ? desc : readable);
-            }
-        }
-
-        var audio_items = languages.model.iter_n_children (null);
-        if (audio_items <= 0) {
+        playback.get_audio_streams ().foreach ((lang) => {
+            languages.append (lang, lang);
+        });
+
+        languages.sensitive = languages.model.iter_n_children (null) > 0;
+        if (!languages.sensitive) {
             languages.append ("def", _("Default"));
             languages.active = 0;
         } else {
-            if (audio_items != 1)
-                languages.sensitive = true;
-
-            languages.active_id = player.current_audio.to_string ();
+            languages.active = playback.subtitle_track;
         }
     }
 
     public void next_audio () {
-        int current = int.parse (languages.active_id);
+        int current = languages.active;
         if (current < languages.model.iter_n_children (null) - 1) {
             current++;
         } else {
             current = 0;
         }
 
-        languages.active_id = current.to_string ();
+        languages.active = current;
     }
 
     public void next_text () {
-        int current = int.parse (subtitles.active_id);
+        int current = subtitles.active;
         if (current < subtitles.model.iter_n_children (null)) {
             current++;
         } else {
             current = 0;
         }
 
-        subtitles.active_id = current.to_string ();
+        subtitles.active = current;
     }
 }

=== modified file 'src/Widgets/TimeWidget.vala'
--- src/Widgets/TimeWidget.vala	2014-11-30 22:46:15 +0000
+++ src/Widgets/TimeWidget.vala	2016-03-20 01:32:19 +0000
@@ -20,25 +20,39 @@
  */
 
 public class Audience.Widgets.TimeWidget : Gtk.Grid {
-    public signal void slider_motion_event (Gdk.EventMotion event);
-
+    unowned ClutterGst.Playback main_playback;
     public Gtk.Label progression_label;
     public Gtk.Label time_label;
     public Gtk.Scale scale;
-    public signal void seeked (double val);
     private Audience.Widgets.PreviewPopover preview_popover;
-    private bool is_seeking = false;
     private bool released = true;
     private uint timeout_id = 0;
     private int original = 0;
 
-    public TimeWidget () {
+    public TimeWidget (ClutterGst.Playback main_playback) {
+        this.main_playback = main_playback;
         orientation = Gtk.Orientation.HORIZONTAL;
         column_spacing = 12;
         halign = Gtk.Align.CENTER;
         progression_label = new Gtk.Label ("");
         time_label = new Gtk.Label ("");
 
+        main_playback.notify["progress"].connect (progress_callback);
+
+        main_playback.notify["duration"].connect (() => {
+            if (preview_popover != null) {
+                preview_popover.destroy ();
+            }
+            time_label.label = seconds_to_time ((int) main_playback.duration);
+            progress_callback ();
+            // Don't allow to change the time if there is none.
+            sensitive = (main_playback.duration != 0);
+            if (sensitive) {
+                preview_popover = new Audience.Widgets.PreviewPopover (main_playback);
+                preview_popover.relative_to = this;
+            }
+        });
+
         scale = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 0, 1, 0.1);
         scale.expand = true;
         scale.draw_value = false;
@@ -47,8 +61,8 @@
         scale.events |= Gdk.EventMask.LEAVE_NOTIFY_MASK;
         scale.events |= Gdk.EventMask.ENTER_NOTIFY_MASK;
         scale.button_press_event.connect ((event) => {
-            is_seeking = true;
             released = false;
+            main_playback.notify["progress"].disconnect (progress_callback);
 
             if (timeout_id != 0)
                 Source.remove (timeout_id);
@@ -56,9 +70,8 @@
             timeout_id = Timeout.add (300, () => {
                 if (released == false)
                     return true;
-                seeked (scale.get_value ());
-                is_seeking = false;
 
+                main_playback.progress = scale.get_value ();
                 timeout_id = 0;
 
                 return false;
@@ -68,12 +81,20 @@
         });
 
         scale.enter_notify_event.connect ((event) => {
-            preview_popover.show_all ();
+            if (event.detail != Gdk.NotifyType.INFERIOR && event.detail != Gdk.NotifyType.NONLINEAR) {
+                preview_popover.show_all ();
+                return false;
+            }
+
             return false;
         });
 
         scale.leave_notify_event.connect ((event) => {
-            preview_popover.hide ();
+            if (event.detail != Gdk.NotifyType.INFERIOR && event.detail != Gdk.NotifyType.NONLINEAR) {
+                preview_popover.hide ();
+                return false;
+            }
+
             return false;
         });
 
@@ -87,25 +108,20 @@
             pointing.x = (int)(event.x) - event.window.get_width ()/2 - distance/2;
             preview_popover.set_pointing_to ((Gdk.Rectangle)pointing);
             preview_popover.set_preview_progress (((double)event.x)/((double)event.window.get_width ()));
-
-            slider_motion_event (event);
-
-            return false;
-        });
-
-        scale.button_release_event.connect ((event) => {released = true; return false;});
-        preview_popover = new Audience.Widgets.PreviewPopover ();
-        preview_popover.relative_to = this;
+            return false;
+        });
+
+        scale.button_release_event.connect ((event) => {
+            released = true;
+            main_playback.notify["progress"].connect (progress_callback);
+            return false;
+        });
 
         add (progression_label);
         add (scale);
         add (time_label);
     }
 
-    public void set_preview_uri (string uri) {
-        preview_popover.set_preview_uri (uri);
-    }
-
     public override void get_preferred_width (out int minimum_width, out int natural_width) {
         base.get_preferred_width (out minimum_width, out natural_width);
 
@@ -117,11 +133,8 @@
         }
     }
 
-    public void set_progression_time (double current_time, double total_time) {
-        if (is_seeking == true)
-            return;
-        scale.set_value (current_time/total_time);
-        progression_label.label = seconds_to_time ((int)(current_time / 1000000000));
-        time_label.label = seconds_to_time ((int)((total_time - current_time) / 1000000000));
+    private void progress_callback () {
+        scale.set_value (main_playback.progress);
+        progression_label.label = seconds_to_time ((int) (main_playback.duration * main_playback.progress));
     }
 }

=== removed file 'src/Widgets/VideoPlayer.vala'
--- src/Widgets/VideoPlayer.vala	2016-02-23 04:31:53 +0000
+++ src/Widgets/VideoPlayer.vala	1970-01-01 00:00:00 +0000
@@ -1,491 +0,0 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/*-
- * Copyright (c) 2013-2014 Audience Developers (http://launchpad.net/pantheon-chat)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Tom Beckmann <[e-mail]>
- *              Corentin Noël <[e-mail]>
- */
-
-using Clutter;
-
-enum PlayFlags {
-    VIDEO         = (1 << 0),
-    AUDIO         = (1 << 1),
-    TEXT          = (1 << 2),
-    VIS           = (1 << 3),
-    SOFT_VOLUME   = (1 << 4),
-    NATIVE_AUDIO  = (1 << 5),
-    NATIVE_VIDEO  = (1 << 6),
-    DOWNLOAD      = (1 << 7),
-    BUFFERING     = (1 << 8),
-    DEINTERLACE   = (1 << 9),
-    SOFT_COLORBALANCE = (1 << 10)
-}
-
-/* use internal function while
- * https://bugzilla.gnome.org/show_bug.cgi?id=754567
- * isn't fixed
- */
-[CCode (cprefix = "Gst", gir_namespace="GstVideo", gir_version="1.0", lower_case_cprefix="gst_video_", cheader_filename = "gst/video/video.h")]
-namespace GstVideo {
-    [CCode (cheader_filename = "gst/video/video.h")]
-    public static extern bool calculate_display_ratio (out uint dar_n, out uint dar_d, uint video_width, uint video_height, uint video_par_n, uint video_par_d, uint display_par_n, uint display_par_d);
-}
-
-namespace Audience.Widgets {
-    public class VideoPlayer : Actor {
-
-        bool _playing;
-        public bool playing {
-            get {
-                return _playing;
-            }
-            set {
-                if (value == playing)
-                    return;
-
-                playbin.set_state (value ? Gst.State.PLAYING : Gst.State.PAUSED);
-                _playing = value;
-            }
-        }
-
-        public double progress {
-            get {
-                int64 length, prog;
-                playbin.query_duration (Gst.Format.TIME, out length);
-                playbin.query_position (Gst.Format.TIME, out prog);
-                if (length == 0)
-                    return 0;
-
-                return prog / (double)length;
-            }
-            set {
-                int64 length;
-                playbin.query_duration (Gst.Format.TIME, out length);
-                playbin.seek_simple (Gst.Format.TIME, Gst.SeekFlags.FLUSH | Gst.SeekFlags.ACCURATE, (int64)(double.max (value, 0.0) * length));
-            }
-        }
-
-        public double volume {
-            get {
-                return playbin.volume;
-            }
-            set {
-                playbin.volume = value;
-            }
-        }
-
-        public string uri {
-            owned get {
-                return playbin.current_uri;
-            }
-            set {
-                if (value == (string)playbin.uri)
-                    return;
-
-                playbin.get_bus ().set_flushing (true);
-                playing = false;
-                playbin.set_state (Gst.State.READY);
-                playbin.suburi = null;
-                subtitle_uri = null;
-                playbin.get_bus ().set_flushing (false);
-                playbin.uri = value;
-                volume = 1.0;
-
-                relayout ();
-                playing = false;
-
-                // this has to be done after setting uri playbin, if not codec checking will fail
-                try {
-                    var info = new Gst.PbUtils.Discoverer (10 * Gst.SECOND).discover_uri (value);
-                    var video = info.get_video_streams ();
-                    if (video != null && video.data != null) {
-                        var video_info = (Gst.PbUtils.DiscovererVideoInfo)video.data;
-                        uint w, h;
-                        get_media_size (video_info, out w, out h);
-                        video_width = w;
-                        video_height = h;
-                    }
-                } catch (Error e) {
-                    warning (e.message);
-                    return;
-                }
-            }
-        }
-
-        public int current_audio {
-            get {
-                return playbin.current_audio;
-            }
-            set {
-                playbin.current_audio = value;
-            }
-        }
-
-        string? subtitle_uri = null;
-
-        // currently used text stream. Set to -1 to disable subtitles
-        public int current_text {
-            get {
-                return playbin.current_text;
-            }
-            set {
-                if (value == current_text)
-                    return;
-
-                int flags;
-                playbin.get ("flags", out flags);
-
-                var disable = value < 0;
-                if (disable)
-                    playbin.current_text = -1;
-
-                check_text_layer (!disable);
-                if (!disable) {
-                    playbin.current_text = value;
-                }
-            }
-        }
-
-        private string _subtitle_font;
-        public string subtitle_font {
-            get {
-                return _subtitle_font;
-            }
-            set {
-                _subtitle_font = value;
-                playbin.set ("subtitle-font-desc", _subtitle_font);
-            }
-        }
-
-        public dynamic Gst.Element playbin;
-        Clutter.Texture video;
-
-        public uint video_width { get; private set; }
-        public uint video_height { get; private set; }
-
-        public signal void ended ();
-        public signal void toggle_side_pane (bool show);
-        public signal void text_tags_changed ();
-        public signal void audio_tags_changed ();
-        public signal void error ();
-        public signal void plugin_install_done ();
-        public signal void progression_changed (double current_time, double total_time);
-        public signal void external_subtitle_changed (string? uri);
-
-        public VideoPlayer () {
-            video = new Clutter.Texture ();
-            playbin = Gst.ElementFactory.make ("playbin", "playbin");
-            build ();
-
-            playbin.text_tags_changed.connect ((el) => {
-                var structure = new Gst.Structure.empty ("tags-changed");
-                structure.set_value ("type", "text");
-                el.post_message (new Gst.Message.application (el, (owned) structure));
-            });
-
-            playbin.audio_tags_changed.connect ((el) => {
-                var structure = new Gst.Structure.empty ("tags-changed");
-                structure.set_value ("type", "audio");
-                el.post_message (new Gst.Message.application (el, (owned) structure));
-            });
-
-            Timeout.add (100, () => {
-                int64 length, prog;
-                playbin.query_position (Gst.Format.TIME, out prog);
-                playbin.query_duration (Gst.Format.TIME, out length);
-                if (length == 0)
-                    return true;
-
-                progression_changed ((double)prog, (double)length);
-                return true;
-            });
-
-            playbin.get_bus ().add_signal_watch ();
-            playbin.get_bus ().message.connect (watch);
-        }
-
-        ~VideoPlayer () {
-            playbin.set_state (Gst.State.NULL);
-            playbin.get_bus ().message.disconnect (watch);
-            message ("video player destroyed");
-        }
-
-        public void build (){
-
-            if (video.get_parent ()!=null)
-                remove_child (video);
-            dynamic Gst.Element video_sink = Gst.ElementFactory.make ("cluttersink", "source");
-            video_sink.texture = video;
-            playbin.video_sink = video_sink;
-            add_child(video);
-            update_subtitle_font ();
-            settings.changed.connect (() => {
-                update_subtitle_font ();
-            });
-        }
-
-        void watch (Gst.Message msg) {
-
-            switch (msg.type) {
-                case Gst.MessageType.APPLICATION:
-                    if (msg.get_structure ().get_name () == "tags-changed") {
-                        if (msg.get_structure ().get_string ("type") == "text")
-                            text_tags_changed ();
-                        else
-                            audio_tags_changed ();
-                    }
-                    break;
-                case Gst.MessageType.ERROR:
-                    GLib.Error e; string detail;
-                    msg.parse_error (out e, out detail);
-                    playbin.set_state (Gst.State.NULL);
-
-                    warning (detail);
-
-                    show_error (e.message);
-                    break;
-                case Gst.MessageType.EOS:
-                    Idle.add (()=>{
-                            ended ();
-                            return false;
-                            });
-                    break;
-                case Gst.MessageType.ELEMENT:
-                    if (msg.get_structure () == null)
-                        break;
-
-                    if (Gst.PbUtils.is_missing_plugin_message (msg)) {
-                        error ();
-                        playbin.set_state (Gst.State.NULL);
-
-                        handle_missing_plugin (msg);
-                    /*TODO } else { //may be navigation command
-                        var nav_msg = Gst.Navigation.message_get_type (msg);
-
-                        if (nav_msg == Gst.NavigationMessageType.COMMANDS_CHANGED) {
-                            var q = Gst.Navigation.query_new_commands ();
-                            pipeline.query (q);
-
-                            uint n;
-                            gst_navigation_query_parse_commands_length (q, out n);
-                            for (var i=0;i<n;i++) {
-                                Gst.NavigationCommand cmd;
-                                gst_navigation_query_parse_commands_nth (q, 0, out cmd);
-                                debug ("Got command: %i", (int)cmd);
-                            }
-                        }*/
-                    }
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        public void set_subtitle_uri (string? uri) {
-            subtitle_uri = uri;
-            if (!check_text_layer (subtitle_uri != null)) {
-                apply_subtitles ();
-                external_subtitle_changed (uri);
-            };
-        }
-
-        // checks whether text layer has to be enabled
-        // returns if apply_subtitles has been called
-        bool check_text_layer (bool enable) {
-            int flags;
-            playbin.get ("flags", out flags);
-
-            if (!enable && (flags & PlayFlags.TEXT) > 0) {
-                flags &= ~PlayFlags.TEXT;
-                playbin.set ("flags", flags);
-            } else if (enable && (flags & PlayFlags.TEXT) < 1) {
-                flags |= PlayFlags.TEXT;
-                playbin.set ("flags", flags);
-                apply_subtitles ();
-                return true;
-            }
-
-            return false;
-        }
-
-        // ported from totem bvw widget set_subtitle_uri
-        void apply_subtitles () {
-            int64 time;
-            playbin.query_position (Gst.Format.TIME, out time);
-
-            playbin.get_state (null, null, Gst.CLOCK_TIME_NONE);
-
-            Gst.State current;
-            playbin.get_state (out current, null, Gst.CLOCK_TIME_NONE);
-            if (current > Gst.State.READY) {
-                playbin.set_state (Gst.State.READY);
-                playbin.get_state (null, null, Gst.CLOCK_TIME_NONE);
-            }
-
-            playbin.suburi = subtitle_uri;
-            if (current > Gst.State.READY) {
-                playbin.set_state (current);
-                playbin.get_state (null, null, Gst.CLOCK_TIME_NONE);
-            }
-
-            playbin.set_state (Gst.State.PAUSED);
-            playbin.seek (1.0, Gst.Format.TIME,
-                    Gst.SeekFlags.FLUSH | Gst.SeekFlags.ACCURATE,
-                    Gst.SeekType.SET, time,
-                    Gst.SeekType.NONE, (int64)Gst.CLOCK_TIME_NONE);
-
-            if (current > Gst.State.READY) {
-                playbin.set_state (current);
-                playbin.get_state (null, null, Gst.CLOCK_TIME_NONE);
-            }
-        }
-
-        public bool relayout () {
-            if (video_width < 1 || video_height < 1 || uri == null)
-                return false;
-
-            var stage = get_stage ();
-            var aspect = stage.width / video_width < stage.height / video_height ?
-                stage.width / video_width : stage.height / video_height;
-            video.width  = video_width * aspect;
-            video.height = video_height * aspect;
-            video.x = (stage.width  - video.width)  / 2;
-            video.y = (stage.height - video.height) / 2;
-
-            return true;
-        }
-
-        void show_error (string? message=null) {
-            var dlg  = new Gtk.Dialog.with_buttons (_("Error"), null, Gtk.DialogFlags.MODAL, _("_OK"), Gtk.ResponseType.OK);
-            var grid = new Gtk.Grid ();
-            var err  = new Gtk.Image.from_icon_name ("dialog-error", Gtk.IconSize.DIALOG);
-            err.margin_right = 12;
-
-            var err_label = new Gtk.Label ("");
-            err_label.set_markup ("<b>%s</b>".printf (_("Oops! Audience can't play this file!")));
-
-            grid.margin = 12;
-            grid.attach (err, 0, 0, 1, 1);
-            grid.attach (err_label, 1, 0, 1, 1);
-            if (message != null)
-                grid.attach (new Gtk.Label (message), 1, 1, 1, 2);
-
-            error ();
-            ((Gtk.Box)dlg.get_content_area ()).add (grid);
-            dlg.show_all ();
-            dlg.run ();
-            dlg.destroy ();
-        }
-
-        void handle_missing_plugin (Gst.Message msg) {
-            var detail = Gst.PbUtils.missing_plugin_message_get_description (msg);
-            var dlg = new Gtk.Dialog.with_buttons ("Missing plugin", null, Gtk.DialogFlags.MODAL);
-            var grid = new Gtk.Grid ();
-            var err  = new Gtk.Image.from_icon_name ("dialog-error", Gtk.IconSize.DIALOG);
-            var phrase = new Gtk.Label (_("Some media files need extra software to be played. Audience can install this software automatically."));
-
-            err.margin_right = 12;
-
-            var err_label = new Gtk.Label ("");
-            err_label.set_markup ("<b>%s</b>".printf (_("Audience needs %s to play this file.").printf (detail)));
-
-            grid.margin = 12;
-            grid.attach (err, 0, 0, 1, 1);
-            grid.attach (err_label, 1, 0, 1, 1);
-            grid.attach (phrase, 1, 1, 1, 2);
-
-            dlg.add_button (_("Don't install"), 1);
-            dlg.add_button (_("Install")+" "+detail, 0);
-
-            (dlg.get_content_area () as Gtk.Container).add (grid);
-            dlg.show_all ();
-            if (dlg.run () == 0) {
-                var installer = Gst.PbUtils.missing_plugin_message_get_installer_detail (msg);
-                var context = new Gst.PbUtils.InstallPluginsContext ();
-                Gst.PbUtils.install_plugins_async ({installer}, context, () => { //finished
-                    debug ("Finished plugin install");
-                    Gst.update_registry ();
-                    plugin_install_done ();
-                    playing = true;
-                });
-            }
-
-            dlg.destroy ();
-        }
-
-        public void seek_jump_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, int64.max (new_position, 1));
-                return;
-            }
-
-            playbin.seek_simple (Gst.Format.TIME, Gst.SeekFlags.FLUSH | Gst.SeekFlags.ACCURATE, new_position);
-        }
-
-
-
-        private void get_media_size (Gst.PbUtils.DiscovererVideoInfo video_info, out uint video_width, out uint video_height) {
-            var video_w = video_info.get_width ();
-            var video_h = video_info.get_height ();
-            var video_par_n = video_info.get_par_num ();
-            var video_par_d = video_info.get_par_denom ();
-            if (video_par_n == 0 || video_par_d == 0) {
-                debug ("width and/or height 0, assumming 1/1");
-                video_par_n = 1;
-                video_par_d = 1;
-            }
-            debug ("video PAR %u/%u", video_par_n, video_par_d);
-
-            uint num;
-            uint den;
-            if (!GstVideo.calculate_display_ratio (out num, out den, video_w, video_h, video_par_n, video_par_d, 1, 1)) {
-                warning ("overflow calculating display ratio");
-                num = 1;
-                den = 1;
-            }
-            debug ("calculated scale ratio %u / %u for %ux%u", num, den, video_w, video_h);
-
-            if (video_w % num == 0) {
-                debug ("keeping video width");
-                video_width = video_w;
-                video_height = (uint) Gst.Util.uint64_scale (video_w, den, num);
-            } else {
-                debug ("keeping video height");
-                video_width = (uint) Gst.Util.uint64_scale (video_h, num, den);
-                video_height = video_h;
-            }
-            debug ("scaling to %ux%u", video_width, video_height);
-        }
-
-        void update_subtitle_font () {
-            debug ("Updating subtitle font");
-            var font = settings.subtitle_font;
-
-            if (font == "") {
-                var gnome_settings = new GLib.Settings ("org.gnome.desktop.interface");
-                font = gnome_settings.get_string ("font-name");
-            }
-            subtitle_font = font;
-        }
-    }
-}

=== modified file 'src/Widgets/WelcomePage.vala'
--- src/Widgets/WelcomePage.vala	2015-06-15 08:29:35 +0000
+++ src/Widgets/WelcomePage.vala	2016-03-20 01:32:19 +0000
@@ -1,10 +1,12 @@
 namespace Audience {
     public class WelcomePage : Granite.Widgets.Welcome {
+        private DiskManager disk_manager;
         public WelcomePage () {
             base (_("No Videos Open"), _("Select a source to begin playing."));
-            this.append ("document-open", _("Open file"), _("Open a saved file."));
+        }
 
-            this.set_size_request (350, 300);
+        construct {
+            append ("document-open", _("Open file"), _("Open a saved file."));
 
             var filename = settings.current_video;
             var last_file = File.new_for_uri (filename);
@@ -13,58 +15,42 @@
                 show_last_file = false;
             }
 
-            if (settings.last_stopped == 0.0 || !settings.resume_videos)
-                this.append ("media-playlist-repeat", _("Replay last video"), get_title (last_file.get_basename ()));
-            else
-                this.append ("media-playback-start", _("Resume last video"), get_title (last_file.get_basename ()));
-            this.set_item_visible (1, show_last_file);
+            if (settings.last_stopped == 0.0 || !settings.resume_videos) {
+                append ("media-playlist-repeat", _("Replay last video"), get_title (last_file.get_basename ()));
+            } else {
+                append ("media-playback-start", _("Resume last video"), get_title (last_file.get_basename ()));
+            }
+
+            set_item_visible (1, show_last_file);
 
             //look for dvd
-            this.append ("media-cdrom", _("Play from Disc"), _("Watch a DVD or open a file from disc"));
-            this.set_item_visible (2, App.get_instance ().has_media_volumes ());
-            App.get_instance ().media_volumes_changed.connect (() => {
-                this.set_item_visible (2, App.get_instance ().has_media_volumes ());
-            });
-
-           //handle welcome
-            this.activated.connect (on_activate);
-
-            App.get_instance ().set_window_title (App.get_instance ().program_name);
-            // FIXME : dont know why but cant move this to Audience.vala
-            App.get_instance ().mainwindow.set_default_size (960, 640);
-
-            App.get_instance ().mainwindow.key_press_event.connect (on_key_press_event);
-
-        }
-        ~WelcomePage () {
-            this.activated.disconnect (on_activate);
-            App.get_instance ().mainwindow.key_press_event.disconnect (on_key_press_event);
-        }
-        private void on_activate (int index) {
-            switch (index) {
-                case 0:
-                    // Open file
-                    App.get_instance ().run_open_file ();
-                    break;
-                case 1:
-                    App.get_instance ().resume_last_videos ();
-                    break;
-                case 2:
-                    App.get_instance ().run_open_dvd ();
-                    break;
-            }
-        }
-        private bool on_key_press_event (Gdk.EventKey e) {
-            switch (e.keyval) {
-                case Gdk.Key.p:
-                case Gdk.Key.space:
-                    App.get_instance ().resume_last_videos ();
-                    break;
-                default:
-                    break;
-            }
-
-            return false;
+            disk_manager = DiskManager.get_default ();
+            disk_manager.volume_found.connect ((vol) => {
+                set_item_visible (2, disk_manager.has_media_volumes ());
+            });
+
+            disk_manager.volume_removed.connect ((vol) => {
+                set_item_visible (2, disk_manager.has_media_volumes ());
+            });
+
+            append ("media-cdrom", _("Play from Disc"), _("Watch a DVD or open a file from disc"));
+            set_item_visible (2, disk_manager.has_media_volumes ());
+
+            activated.connect ((index) => {
+                var window = App.get_instance ().mainwindow;
+                switch (index) {
+                    case 0:
+                        // Open file
+                        window.run_open_file ();
+                        break;
+                    case 1:
+                        window.resume_last_videos ();
+                        break;
+                    case 2:
+                        window.run_open_dvd ();
+                        break;
+                }
+            });
         }
     }
 }

=== added file 'src/Window.vala'
--- src/Window.vala	1970-01-01 00:00:00 +0000
+++ src/Window.vala	2016-03-20 01:32:19 +0000
@@ -0,0 +1,318 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2013-2016 elementary LLC.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Tom Beckmann <[e-mail]>
+ *              Cody Garver <[e-mail]>
+ *              Artem Anufrij <[e-mail]>
+ *              Corentin Noël <[e-mail]>
+ */
+
+public class Audience.Window : Gtk.Window {
+    private Gtk.Stack main_stack;
+    private Gtk.HeaderBar header;
+    private PlayerPage player_page;
+    private WelcomePage welcome_page;
+    private ZeitgeistManager zeitgeist_manager;
+
+    public signal void media_volumes_changed ();
+
+    public Window () {
+        
+    }
+
+    construct {
+        zeitgeist_manager = new ZeitgeistManager ();
+        window_position = Gtk.WindowPosition.CENTER;
+        gravity = Gdk.Gravity.CENTER;
+        set_default_geometry (1000, 680);
+
+        header = new Gtk.HeaderBar ();
+        header.set_show_close_button (true);
+        header.get_style_context ().add_class ("compact");
+        set_titlebar (header);
+
+        welcome_page = new WelcomePage ();
+
+        player_page = new PlayerPage ();
+        player_page.ended.connect (on_player_ended);
+        player_page.unfullscreen_clicked.connect (() => {
+            unfullscreen ();
+        });
+
+        player_page.notify["playing"].connect (() => {
+            set_keep_above (player_page.playing && settings.stay_on_top);
+        });
+
+        main_stack = new Gtk.Stack ();
+        main_stack.add (welcome_page);
+        main_stack.add (player_page);
+
+        add (main_stack);
+        show_all ();
+        main_stack.set_visible_child (welcome_page);
+
+        Gtk.TargetEntry uris = {"text/uri-list", 0, 0};
+        Gtk.drag_dest_set (this, Gtk.DestDefaults.ALL, {uris}, Gdk.DragAction.MOVE);
+        drag_data_received.connect ((ctx, x, y, sel, info, time) => {
+            File[] files = {};
+            foreach (var uri in sel.get_uris ()) {
+                var file = File.new_for_uri (uri);
+                files += file;
+            }
+
+            open_files (files);
+        });
+
+        player_page.button_press_event.connect ((event) => {
+            // double left click
+            if (event.button == Gdk.BUTTON_PRIMARY && event.type == Gdk.EventType.2BUTTON_PRESS) {
+                if (player_page.fullscreened) {
+                    unfullscreen ();
+                } else {
+                    fullscreen ();
+                }
+            }
+
+            // right click
+            if (event.button == Gdk.BUTTON_SECONDARY) {
+                player_page.playing = !player_page.playing;
+            }
+            return false;
+        });
+    }
+
+    public override bool key_press_event (Gdk.EventKey e) {
+        switch (e.keyval) {
+            case Gdk.Key.o:
+                run_open_file ();
+                return true;
+            case Gdk.Key.p:
+            case Gdk.Key.space:
+                resume_last_videos ();
+                return true;
+            case Gdk.Key.q:
+                destroy ();
+                return true;
+        }
+
+        if (main_stack.get_visible_child () == player_page) {
+            switch (e.keyval) {
+                case Gdk.Key.p:
+                case Gdk.Key.space:
+                    player_page.playing = !player_page.playing;
+                    break;
+                case Gdk.Key.Escape:
+                    if (player_page.fullscreened) {
+                        unfullscreen ();
+                    } else {
+                        destroy ();
+                    }
+
+                    return true;
+                case Gdk.Key.Down:
+                    if (Gdk.ModifierType.SHIFT_MASK in e.state) {
+                        player_page.seek_jump_seconds (-5); // 5 secs
+                    } else {
+                        player_page.seek_jump_seconds (-60); // 1 min
+                    }
+
+                    player_page.reveal_control ();
+                    break;
+                case Gdk.Key.Left:
+                    if (Gdk.ModifierType.SHIFT_MASK in e.state) {
+                        player_page.seek_jump_seconds (-1); // 1 sec
+                    } else {
+                        player_page.seek_jump_seconds (-10); // 10 secs
+                    }
+
+                    player_page.reveal_control ();
+                    break;
+                case Gdk.Key.Right:
+                    if (Gdk.ModifierType.SHIFT_MASK in e.state) {
+                        player_page.seek_jump_seconds (1); // 1 sec
+                    } else {
+                        player_page.seek_jump_seconds (10); // 10 secs
+                    }
+
+                    player_page.reveal_control ();
+                    break;
+                case Gdk.Key.Up:
+                    if (Gdk.ModifierType.SHIFT_MASK in e.state) {
+                        player_page.seek_jump_seconds (5); // 5 secs
+                    } else {
+                        player_page.seek_jump_seconds (60); // 1 min
+                    }
+
+                    player_page.reveal_control ();
+                    break;
+                case Gdk.Key.Page_Down:
+                    player_page.seek_jump_seconds (-600); // 10 mins
+                    player_page.reveal_control ();
+                    break;
+                case Gdk.Key.Page_Up:
+                    player_page.seek_jump_seconds (600); // 10 mins
+                    player_page.reveal_control ();
+                    break;
+                case Gdk.Key.a:
+                    player_page.next_audio ();
+                    break;
+                case Gdk.Key.s:
+                    player_page.next_text ();
+                    break;
+                case Gdk.Key.f:
+                    if (player_page.fullscreened) {
+                        unfullscreen ();
+                    } else {
+                        fullscreen ();
+                    }
+
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        return false;
+    }
+
+    public override bool window_state_event (Gdk.EventWindowState e) {
+        if (Gdk.WindowState.FULLSCREEN in e.changed_mask) {
+            player_page.fullscreened = Gdk.WindowState.FULLSCREEN in e.new_window_state;
+            header.visible = !player_page.fullscreened;
+        }
+
+        if (Gdk.WindowState.MAXIMIZED in e.changed_mask) {
+            bool currently_maximixed = Gdk.WindowState.MAXIMIZED in e.new_window_state;
+            if (main_stack.get_visible_child () == player_page && currently_maximixed) {
+                fullscreen ();
+            }
+        }
+
+        return false;
+    }
+
+    public void open_files (File[] files) {
+        string[] videos = {};
+        foreach (var file in files) {
+            if (file.query_file_type (0) == FileType.DIRECTORY) {
+                Audience.recurse_over_dir (file, (file_ret) => {
+                    player_page.append_to_playlist (file);
+                    videos += file_ret.get_uri ();
+                });
+            } else {
+                player_page.append_to_playlist (file);
+                videos += file.get_uri ();
+            }
+        }
+
+
+        if (videos.length == 0) {
+            return;
+        }
+
+        // notification when adding video to playlist
+        if (!player_page.playing && (Gdk.WindowState.FOCUSED in get_window ().get_state ())) {
+            var text = ngettext (_("%u Video added to Playlist"), _("%u Videos added to Playlist"), videos.length).printf (videos.length);
+            show_notification (text, (videos.length == 1) ? Audience.get_title (videos[0]) : "");
+        }
+
+        play_file (videos [0]);
+    }
+
+    public void resume_last_videos () {
+        play_file (settings.current_video, false);
+    }
+
+    public void run_open_dvd () {
+        read_first_disk.begin ();
+    }
+
+    public void run_open_file () {
+        var file = new Gtk.FileChooserDialog (_("Open"), this, Gtk.FileChooserAction.OPEN,
+            _("_Cancel"), Gtk.ResponseType.CANCEL, _("_Open"), Gtk.ResponseType.ACCEPT);
+        file.set_transient_for (this);
+        file.select_multiple = true;
+
+        var all_files_filter = new Gtk.FileFilter ();
+        all_files_filter.set_filter_name (_("All files"));
+        all_files_filter.add_pattern ("*");
+
+        var video_filter = new Gtk.FileFilter ();
+        video_filter.set_filter_name (_("Video files"));
+        video_filter.add_mime_type ("video/*");
+
+        file.add_filter (video_filter);
+        file.add_filter (all_files_filter);
+
+        file.set_current_folder (settings.last_folder);
+        if (file.run () == Gtk.ResponseType.ACCEPT) {
+            File[] files = {};
+            foreach (File item in file.get_files ()) {
+                files += item;
+            }
+
+            open_files (files);
+            settings.last_folder = file.get_current_folder ();
+        }
+
+        file.destroy ();
+    }
+
+    public bool is_privacy_mode_enabled () {
+        var privacy_settings = new GLib.Settings ("org.gnome.desktop.privacy");
+        bool privacy_mode = !privacy_settings.get_boolean ("remember-recent-files") || !privacy_settings.get_boolean ("remember-app-usage");
+
+        if (privacy_mode) {
+            return true;
+        }
+
+        return zeitgeist_manager.app_into_blacklist (Audience.App.get_instance ().exec_name);
+    }
+
+    private async void read_first_disk () {
+        var disk_manager = DiskManager.get_default ();
+        if (disk_manager.get_volumes ().is_empty)
+            return;
+
+        var volume = disk_manager.get_volumes ().first ();
+        if (volume.can_mount () == true && volume.get_mount ().can_unmount () == false) {
+            try {
+                yield volume.mount (MountMountFlags.NONE, null);
+            } catch (Error e) {
+                critical (e.message);
+            }
+        }
+
+        var root = volume.get_mount ().get_default_location ();
+        play_file (root.get_uri ().replace ("file:///", "dvd:///"));
+    }
+
+    private void on_player_ended () {
+        main_stack.set_visible_child (welcome_page);
+        title = App.get_instance ().program_name;
+        get_window ().set_cursor (null);
+        unfullscreen ();
+    }
+
+    private void play_file (string uri, bool from_beginning = true) {
+        main_stack.set_visible_child (player_page);
+        player_page.play_file (uri, from_beginning);
+        if (is_maximized) {
+            fullscreen ();
+        }
+    }
+}