Merge lp:~artem-anufrij/audience/playlist-rewrite into lp:~audience-members/audience/trunk

[Artem Anufrij]

* Playlist redesign
* Bottom bar: Adden "Next" button
* Playlist: Added "Delete" button
* EpisodesView: Added "Play all" button

[lp:~artem-anufrij/audience/playlist-rewrite]

680. By Artem Anufrij on 2016-09-29

no autohide for playlist

681. By Artem Anufrij on 2016-09-30

* save playlist
* restore playlist
* Welcome button: resume playlist
* Welcome button: replay playlist
* Welcome button: resume last video
* welcome button: replay last video

682. By Artem Anufrij on 2016-09-30

DnD on welcome screen

683. By Artem Anufrij on 2016-09-30

visiualisize playlist

[Artem Anufrij (artem-anufrij)]

Perhaps someone could check this branch.

[Jeremy Wootten (jeremywootten)]

Conflicts with trunk. I tested after merging and resolving conflicts.

Compilation warnings:
Bottom Bar: playlist_item.added not used.
PlayList::add_from_file - unhandled GLib.Error, misaligned lines

variable name instand_play should be "instant play".
some formatting issues (see inline)

UI:
Add and remove icons not consistent with other elementary apps - use + - buttons at bottom?
Use of trash icon misleading. User might think the original video will be trashed?
Playlist too narrow when empty - need empty message?

FUNCTION:
After adding file(s) they do not appear until playlist hidden/opened or app restarted.

review: Needs Fixing (code, ui, function)

[Artem Anufrij (artem-anufrij)]

@Jeremy: Dan said I should to break up to work on this branch. Thank you for your time...

[Jeremy Wootten (jeremywootten)]

Hi Artem.

Do you mean this branch is abandoned/rejected or just on hold? Or it needs
breaking up into smaller branches?

If so it should be marked as "in progress" or be withdrawn...

On 16 December 2016 at 16:40, Artem Anufrij <email address hidden> wrote:

> @Jeremy: Dan said I should to break up to work on this branch. Thank you
> for your time...
> --
> https://code.launchpad.net/~artem-anufrij/audience/
> playlist-rewrite/+merge/307248
> You are reviewing the proposed merge of lp:~artem-anufrij/audience/playlist-rewrite
> into lp:audience.
>

[Danielle Foré (danrabbit)]

We can probably resume trying to break up this branch into separate PRs on GitHub. Rejecting for now

Unmerged revisions

683. By Artem Anufrij on 2016-09-30

visiualisize playlist

682. By Artem Anufrij on 2016-09-30

DnD on welcome screen

681. By Artem Anufrij on 2016-09-30

* save playlist
* restore playlist
* Welcome button: resume playlist
* Welcome button: replay playlist
* Welcome button: resume last video
* welcome button: replay last video

680. By Artem Anufrij on 2016-09-29

no autohide for playlist

679. By Artem Anufrij on 2016-09-29

development

678. By Artem Anufrij on 2016-09-29

added missing file

677. By Artem Anufrij on 2016-09-28

begin playlist rewrite

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-09-26 20:52:11 +0000
+++ src/CMakeLists.txt	2016-09-30 22:31:06 +0000
@@ -50,11 +50,11 @@
     DiskManager.vala
     Window.vala
     Widgets/BottomBar.vala
+    Widgets/Playlist.vala
+    Widgets/PlaylistItem.vala
     Widgets/SettingsPopover.vala
     Widgets/PreviewPopover.vala
     Widgets/TimeWidget.vala
-    Widgets/Playlist.vala
-    Widgets/PlaylistPopover.vala
     Widgets/WelcomePage.vala
     Widgets/PlayerPage.vala
     Widgets/LibraryPage.vala
 
=== modified file 'src/Objects/Video.vala'
--- src/Objects/Video.vala	2016-09-27 20:26:37 +0000
+++ src/Objects/Video.vala	2016-09-30 22:31:06 +0000
@@ -27,7 +27,7 @@
         public signal void thumbnail_changed ();
         public signal void trashed ();
 
-        public File video_file { get; private set; }
+        public File? video_file { get; private set; default = null;}
         public string directory { get; construct set; }
         public string file { get; construct set; }
 
@@ -55,10 +55,15 @@
             manager = Audience.Services.LibraryManager.get_instance ();
             manager.thumbler.finished.connect (dbus_finished);
 
+            if (directory.has_prefix ("file:///")) {
+                video_file = File.new_for_uri (directory + "/" + file);
+            } else {
+                video_file = File.new_for_path (get_path ());
+            }
+
             title = Audience.get_title (file);
 
             extract_metadata ();
-            video_file = File.new_for_path (this.get_path ());
 
             if (directory != Audience.settings.library_folder) {
                 container = Path.get_basename (directory);
 
=== modified file 'src/Widgets/BottomBar.vala'
--- src/Widgets/BottomBar.vala	2016-09-28 02:43:54 +0000
+++ src/Widgets/BottomBar.vala	2016-09-30 22:31:06 +0000
@@ -24,6 +24,7 @@
     private const string PULSE_TYPE = "attention";
 
     public signal void play_toggled ();
+    public signal void playlist_clicked ();
     public signal void unfullscreen ();
     public signal void seeked (double val);
 
@@ -31,26 +32,27 @@
     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;
+    public Audience.Widgets.Playlist playlist;
 
     private Gtk.Button play_button;
+    private Gtk.Button next_button;
     private Gtk.Button preferences_button;
     private Gtk.Button playlist_button;
     private Gtk.Revealer unfullscreen_revealer;
     private uint hiding_timer = 0;
     private bool playlist_glowing = false;
 
-    public bool repeat {
-        get {
-            return playlist_popover.rep.active;
-        }
-        set {
-            playlist_popover.rep.active = value;
-        }
-    }
-
     public BottomBar (ClutterGst.Playback playback) {
+        playlist = Audience.Widgets.Playlist.get_instance ();
+        playlist.collection_changed.connect ((size) => { next_button.visible = size > 1; });
+        playlist.visibility_changed.connect ((visible) => {
+            if (visible) {
+                playlist_button.image = new Gtk.Image.from_icon_name ("pane-hide-symbolic", Gtk.IconSize.BUTTON);
+            } else {
+                playlist_button.image = new Gtk.Image.from_icon_name ("pane-show-symbolic", Gtk.IconSize.BUTTON);
+            }
+        });
         this.events |= Gdk.EventMask.POINTER_MOTION_MASK;
         this.events |= Gdk.EventMask.LEAVE_NOTIFY_MASK;
         this.events |= Gdk.EventMask.ENTER_NOTIFY_MASK;
@@ -66,34 +68,36 @@
         play_button.tooltip_text = _("Play");
         play_button.clicked.connect (() => {play_toggled ();});
 
-        playlist_button = new Gtk.Button.from_icon_name ("view-list-symbolic", Gtk.IconSize.BUTTON);
+        next_button = new Gtk.Button.from_icon_name ("media-seek-forward-symbolic", Gtk.IconSize.BUTTON);
+        next_button.tooltip_text = _("Next");
+        next_button.clicked.connect (() => { playlist.next ();});
+
+        playlist_button = new Gtk.Button.from_icon_name ("pane-show-symbolic", Gtk.IconSize.BUTTON);
         playlist_button.tooltip_text = _("Playlist");
-        playlist_button.clicked.connect (() => {playlist_popover.show_all (); playlist_popover.queue_resize ();});
+        playlist_button.clicked.connect (() => { playlist.toggle_reveal_control (); });
 
         preferences_button = new Gtk.Button.from_icon_name ("open-menu-symbolic", Gtk.IconSize.BUTTON);
         preferences_button.tooltip_text = _("Settings");
         preferences_button.clicked.connect (() => {
             preferences_popover.setup ();
-            preferences_popover.show_all (); 
+            preferences_popover.show_all ();
             preferences_popover.queue_resize ();
         });
 
         time_widget = new TimeWidget (playback);
 
-        playlist_popover = new PlaylistPopover ();
-        playlist_popover.relative_to = playlist_button;
+
         preferences_popover = new SettingsPopover (playback);
         preferences_popover.relative_to = preferences_button;
 
         main_actionbar.pack_start (play_button);
+        main_actionbar.pack_start (next_button);
         main_actionbar.set_center_widget (time_widget);
+        main_actionbar.pack_end (playlist_button);
         main_actionbar.pack_end (preferences_button);
-        main_actionbar.pack_end (playlist_button);
         add (main_actionbar);
 
-        playlist_popover.playlist.item_added.connect (() => {
-            playlist_item_added ();
-        });
+
 
         notify["hovered"].connect (() => {
             if (hovered == false) {
@@ -131,6 +135,7 @@
         });
 
         show_all ();
+        next_button.visible = playlist.size > 1;
     }
 
     private void playlist_item_added () {
@@ -138,7 +143,7 @@
             playlist_glowing = true;
             playlist_button.get_child ().get_style_context ().add_class (PULSE_CLASS);
             playlist_button.get_child ().get_style_context ().add_class (PULSE_TYPE);
-            
+
             Timeout.add (6000, () => {
                 playlist_button.get_child ().get_style_context ().remove_class (PULSE_CLASS);
                 playlist_button.get_child ().get_style_context ().remove_class (PULSE_TYPE);
@@ -188,11 +193,13 @@
             Source.remove (hiding_timer);
 
         hiding_timer = GLib.Timeout.add (2000, () => {
-            if (hovered == true || preferences_popover.visible == true || playlist_popover.visible == true || playing == false) {
+            if (hovered == true || preferences_popover.visible == true || playing == false) {
                 hiding_timer = 0;
                 return false;
             }
+            playlist_button.image = new Gtk.Image.from_icon_name ("pane-show-symbolic", Gtk.IconSize.BUTTON);
             set_reveal_child (false);
+            playlist.set_reveal_child (false);
             unfullscreen_revealer.set_reveal_child (false);
             hiding_timer = 0;
             return false;
 
=== modified file 'src/Widgets/EpisodesPage.vala'
--- src/Widgets/EpisodesPage.vala	2016-09-27 20:26:37 +0000
+++ src/Widgets/EpisodesPage.vala	2016-09-30 22:31:06 +0000
@@ -22,15 +22,18 @@
 namespace Audience {
     public class EpisodesPage : Gtk.Grid {
         public Gtk.Image poster { get; set; }
+        Gtk.Button play_all;
         Gtk.ScrolledWindow scrolled_window;
         Gtk.FlowBox view_episodes;
         Granite.Widgets.AlertView alert_view;
 
         public Audience.Services.LibraryManager manager;
+        public Audience.Widgets.Playlist playlist;
 
         string query;
 
         construct {
+            playlist = Audience.Widgets.Playlist.get_instance ();
             query = "";
 
             poster = new Gtk.Image ();
@@ -39,6 +42,13 @@
             poster.valign = Gtk.Align.START;
             poster.get_style_context ().add_class ("card");
 
+            play_all = new Gtk.Button ();
+            play_all.margin_left = 24;
+            play_all.vexpand = true;
+            play_all.valign = Gtk.Align.START;
+            play_all.label = _("Play all");
+            play_all.clicked.connect (play_all_episodes);
+
             view_episodes = new Gtk.FlowBox ();
             view_episodes.margin = 24;
             view_episodes.homogeneous = true;
@@ -58,9 +68,10 @@
             alert_view.hide ();
 
             expand = true;
-            attach (poster, 0, 1, 1, 1);
-            attach (scrolled_window, 1, 1, 1, 1);
-            attach (alert_view, 1, 1, 1, 1);
+            attach (poster, 0, 0, 1, 1);
+            attach (play_all, 0, 1, 1 ,1);
+            attach (scrolled_window, 1, 0, 1, 2);
+            attach (alert_view, 1, 0, 1, 2);
 
             manager = Audience.Services.LibraryManager.get_instance ();
             manager.video_file_deleted.connect (remove_item_from_path);
@@ -81,8 +92,7 @@
             var selected = (item as Audience.LibraryItem);
             var video = selected.episodes.first ();
             if (video.video_file.query_exists ()) {
-                bool from_beginning = video.video_file.get_uri () != settings.current_video;
-                App.get_instance ().mainwindow.play_file (video.video_file.get_uri (), from_beginning);
+                playlist.add_item (video);
             }
         }
 
@@ -153,6 +163,14 @@
             return false;
         }
 
+        public void play_all_episodes () {
+            playlist.clear ();
+            view_episodes.forall ((item)=> {
+                playlist.add_item ((item as LibraryItem).episodes.first (), false);
+            });
+            playlist.play_playlist ();
+        }
+
         public void show_alert (string primary_text, string secondary_text, string icon_name) {
             alert_view.no_show_all = false;
             alert_view.show_all ();
 
=== modified file 'src/Widgets/LibraryPage.vala'
--- src/Widgets/LibraryPage.vala	2016-09-27 20:26:37 +0000
+++ src/Widgets/LibraryPage.vala	2016-09-30 22:31:06 +0000
@@ -27,6 +27,7 @@
 
         public Gtk.FlowBox view_movies;
         public Audience.Services.LibraryManager manager;
+        public Audience.Widgets.Playlist playlist;
         public Gtk.ScrolledWindow scrolled_window;
         bool poster_initialized = false;
         string query;
@@ -45,11 +46,12 @@
 
         construct {
             manager = Audience.Services.LibraryManager.get_instance ();
-
+            playlist = Audience.Widgets.Playlist.get_instance ();
             query = "";
 
             scrolled_window = new Gtk.ScrolledWindow (null, null);
-            scrolled_window.expand = true;
+            scrolled_window.height_request = 100;
+            scrolled_window.width_request = 100;
 
             view_movies = new Gtk.FlowBox ();
             view_movies.margin = 24;
@@ -88,8 +90,7 @@
             var selected = (item as Audience.LibraryItem);
 
             if (selected.episodes.size == 1) {
-                bool from_beginning = selected.episodes.first ().video_file.get_uri () != settings.current_video;
-                App.get_instance ().mainwindow.play_file (selected.episodes.first ().video_file.get_uri (), from_beginning);
+                playlist.add_item (selected.episodes.first ());
             } else {
                 last_filter = query;
                 show_episodes (selected);
 
=== modified file 'src/Widgets/PlayerPage.vala'
--- src/Widgets/PlayerPage.vala	2016-09-28 02:43:54 +0000
+++ src/Widgets/PlayerPage.vala	2016-09-30 22:31:06 +0000
@@ -11,29 +11,22 @@
     public class PlayerPage : Gtk.EventBox {
         public signal void unfullscreen_clicked ();
         public signal void ended ();
+        public signal void started (Audience.Objects.Video video);
 
         public GtkClutter.Embed clutter;
         private Clutter.Actor video_actor;
         private Audience.Widgets.BottomBar bottom_bar;
+        private Audience.Widgets.Playlist playlist_bar;
         private Clutter.Stage stage;
         private Gtk.Revealer unfullscreen_bar;
         private GtkClutter.Actor unfullscreen_actor;
         private GtkClutter.Actor bottom_actor;
+        private GtkClutter.Actor playlist_actor;
         private GnomeMediaKeys mediakeys;
         private ClutterGst.Playback playback;
 
         private bool mouse_primary_down = false;
 
-        public bool repeat {
-            get{
-                return bottom_bar.repeat;
-            }
-
-            set{
-                bottom_bar.repeat = value;
-            }
-        }
-
         public bool playing {
             get {
                 return playback.playing;
@@ -101,8 +94,24 @@
             bottom_bar.bind_property ("playing", playback, "playing", BindingFlags.BIDIRECTIONAL);
             bottom_bar.unfullscreen.connect (() => unfullscreen_clicked ());
 
+            playlist_bar = Audience.Widgets.Playlist.get_instance ();
+            playlist_bar.play.connect ((video, progress) => { play_video (video, progress); });
+            playlist_bar.collection_changed.connect ((size) => {
+                if (size == 0 && playing) {
+                    playing = false;
+                    reset_played_uri ();
+                    ended ();
+                }
+            });
+
             unfullscreen_bar = bottom_bar.get_unfullscreen_button ();
 
+            playlist_actor = new GtkClutter.Actor.with_contents (playlist_bar);
+            playlist_actor.opacity = GLOBAL_OPACITY;
+            playlist_actor.add_constraint (new Clutter.BindConstraint (stage, Clutter.BindCoordinate.HEIGHT, 0));
+            playlist_actor.add_constraint (new Clutter.AlignConstraint (stage, Clutter.AlignAxis.X_AXIS, 1));
+            stage.add_child (playlist_actor);
+
             bottom_actor = new GtkClutter.Actor.with_contents (bottom_bar);
             bottom_actor.opacity = GLOBAL_OPACITY;
             bottom_actor.add_constraint (new Clutter.BindConstraint (stage, Clutter.BindCoordinate.WIDTH, 0));
@@ -117,17 +126,16 @@
 
             //media keys
             try {
-                mediakeys = Bus.get_proxy_sync (BusType.SESSION,
-                    "org.gnome.SettingsDaemon", "/org/gnome/SettingsDaemon/MediaKeys");
+                mediakeys = Bus.get_proxy_sync (BusType.SESSION, "org.gnome.SettingsDaemon", "/org/gnome/SettingsDaemon/MediaKeys");
                 mediakeys.MediaPlayerKeyPressed.connect ((bus, app, key) => {
                     if (app != "audience")
                        return;
                     switch (key) {
                         case "Previous":
-                            get_playlist_widget ().previous ();
+                            playlist_bar.previous ();
                             break;
                         case "Next":
-                            get_playlist_widget ().next ();
+                            playlist_bar.next ();
                             break;
                         case "Play":
                             playback.playing = !playback.playing;
@@ -181,13 +189,11 @@
             });
 
             this.destroy.connect (() => {
-                // FIXME:should find better way to decide if its end of playlist
-                if (playback.progress > 0.99)
+                if (playback.progress < 1) {
+                    settings.last_stopped = playback.progress;
+                } else {
                     settings.last_stopped = 0;
-                else
-                    settings.last_stopped = playback.progress;
-
-                get_playlist_widget ().save_playlist ();
+                }
                 Audience.Services.Inhibitor.get_instance ().uninhibit ();
             });
 
@@ -195,25 +201,13 @@
             playback.eos.connect (() => {
                 Idle.add (() => {
                     playback.progress = 0;
-                    if (!get_playlist_widget ().next ()) {
-                        if (repeat) {
-                            play_file (get_playlist_widget ().get_first_item ().get_uri ());
-                            playback.playing = true;
-                        } else {
-                            playback.playing = false;
-                            settings.last_stopped = 0;
-                            ended ();
-                        }
+                    if (!playlist_bar.next ()) {
+                        ended ();
                     }
                     return false;
                 });
             });
 
-            //playlist wants us to open a file
-            get_playlist_widget ().play.connect ((file) => {
-                this.play_file (file.get_uri ());
-            });
-
             bottom_bar.notify["child-revealed"].connect (() => {
                 if (bottom_bar.child_revealed == true) {
                     App.get_instance ().mainwindow.get_window ().set_cursor (null);
@@ -230,6 +224,7 @@
                     Audience.Services.Inhibitor.get_instance ().inhibit ();
                 } else {
                     Audience.Services.Inhibitor.get_instance ().uninhibit ();
+                    settings.last_stopped = playback.progress;
                 }
             });
 
@@ -237,24 +232,20 @@
             show_all ();
         }
 
-        public void play_file (string uri, bool from_beginning = true) {
-            debug ("Opening %s", uri);
-            get_playlist_widget ().set_current (uri);
+        private void play_video (Audience.Objects.Video video, double progress = 0) {
+            string? uri = video.video_file.get_uri ();
             playback.uri = uri;
 
             string? sub_uri = get_subtitle_for_uri (uri);
-            if (sub_uri != null && sub_uri != uri)
+            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;
-            }
-
+            }
+
+            if (playback.progress != progress) {
+                playback.progress = progress;
+            }
             playback.playing = !settings.playback_wait;
+
             Gtk.RecentManager recent_manager = Gtk.RecentManager.get_default ();
             recent_manager.add_item (uri);
 
@@ -262,53 +253,26 @@
 
             Audience.Services.Inhibitor.get_instance ().inhibit ();
             settings.current_video = uri;
+
+            started (video);
         }
 
         public double get_progress () {
             return playback.progress;
         }
 
-        public string get_played_uri () {
-            return playback.uri;
-        }
-        
         public void reset_played_uri () {
             playback.uri = "";
         }
 
-        public void next () {
-            get_playlist_widget ().next ();
-        }
-
-        public void prev () {
-            get_playlist_widget ().next ();
-        }
-
-        public void resume_last_videos () {
-            play_file (settings.current_video);
-            playback.playing = false;
-            if (settings.resume_videos) {
-                playback.progress = settings.last_stopped;
-            } else {
-                playback.progress = 0.0;
-            }
-
-            playback.playing = !settings.playback_wait;
-        }
-
         public void append_to_playlist (File file) {
             if (playback.playing && is_subtitle (file.get_uri ())) {
                 playback.set_subtitle_uri (file.get_uri ());
             } else {
-                get_playlist_widget ().add_item (file);
+                playlist_bar.add_from_file (file);
             }
         }
 
-        public void play_first_in_playlist () {
-            var file = get_playlist_widget ().get_first_item ();
-            play_file (file.get_uri ());
-        }
-
         public void reveal_control () {
             bottom_bar.reveal_control ();
         }
@@ -328,10 +292,6 @@
             playback.progress = double.min (new_progress, 1.0);
         }
 
-        public Widgets.Playlist get_playlist_widget () {
-            return bottom_bar.playlist_popover.playlist;
-        }
-
         private string? get_subtitle_for_uri (string uri) {
             string without_ext;
             int last_dot = uri.last_index_of (".", 0);
@@ -365,7 +325,7 @@
         public bool update_pointer_position (double y, int window_height) {
             App.get_instance ().mainwindow.get_window ().set_cursor (null);
 
-            bottom_bar.reveal_control ();
+            reveal_control ();
 
             return false;
         }
 
=== modified file 'src/Widgets/Playlist.vala'
--- src/Widgets/Playlist.vala	2016-08-19 16:27:45 +0000
+++ src/Widgets/Playlist.vala	2016-09-30 22:31:06 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
 /*-
- * Copyright (c) 2013-2014 Audience Developers (http://launchpad.net/pantheon-chat)
+ * Copyright (c) 2016-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
@@ -15,221 +15,224 @@
  * 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]>
+ * Authored by: Artem Anufrij <[e-mail]>
+ *
  */
 
 namespace Audience.Widgets {
-    public class Playlist : Gtk.TreeView {
-        // the player is requested to play path
-        public signal void play (File path);
-        public signal void item_added ();
-
-        private enum Columns {
-            PLAYING,
-            TITLE,
-            FILENAME,
-            N_COLUMNS
+    public class Playlist : Gtk.Revealer {
+
+        public signal void play (Audience.Objects.Video video, double process = 0);
+        public signal void collection_changed (uint size);
+        public signal void visibility_changed (bool visible);
+
+        Gtk.Grid grid;
+        Gtk.ScrolledWindow scrolled_window;
+        Gtk.ListBox listbox;
+        Gtk.ToggleButton repeat_button;
+
+        public uint size { get { return listbox.get_children ().length (); } }
+
+        static Playlist _instance = null;
+        public static Playlist get_instance () {
+            if (_instance == null) {
+                _instance = new Playlist ();
+            }
+            return _instance;
         }
 
-        private int current = 0;
-        private Gtk.ListStore playlist;
-
-        public Playlist () {
-            this.playlist = new Gtk.ListStore (Columns.N_COLUMNS, typeof (Icon), typeof (string), typeof (string));
-            this.model = this.playlist;
-            this.expand = true;
-            this.headers_visible = false;
-            this.activate_on_single_click = true;
-            this.can_focus = false;
-            get_selection ().mode = Gtk.SelectionMode.NONE;
-
-            var text_render = new Gtk.CellRendererText ();
-            text_render.ellipsize = Pango.EllipsizeMode.MIDDLE;
-
-            this.insert_column_with_attributes (-1, "Playing", new Gtk.CellRendererPixbuf (), "gicon", Columns.PLAYING);
-            this.insert_column_with_attributes (-1, "Title", text_render, "text", Columns.TITLE);
-            this.set_tooltip_column (1);
-
-            this.row_activated.connect ((path ,col) => {
-                Gtk.TreeIter iter;
-                playlist.get_iter (out iter, path);
-                string filename;
-                playlist.get (iter, Columns.FILENAME, out filename);
-                play (File.new_for_commandline_arg (filename));
-            });
-
-            this.reorderable = true;
-            this.model.row_inserted.connect ((path, iter) => {
-                Gtk.TreeIter it;
-                playlist.get_iter (out it, path);
-                Gdk.Pixbuf playing;
-                playlist.get (it, Columns.PLAYING, out playing);
-                if (playing != null) //if playing is not null it's the current item
-                    this.current = int.parse (path.to_string ());
-            });
-
-            // Automatically load from gsettings last_played_videos
+        private Playlist () {}
+
+        construct {
+            valign = Gtk.Align.FILL;
+            transition_type = Gtk.RevealerTransitionType.SLIDE_LEFT;
+
+            grid = new Gtk.Grid ();
+            grid.expand = true;
+            grid.valign = Gtk.Align.FILL;
+            grid.halign = Gtk.Align.FILL;
+            grid.orientation = Gtk.Orientation.VERTICAL;
+            grid.margin_bottom = 28;
+
+            scrolled_window = new Gtk.ScrolledWindow (null, null);
+            scrolled_window.expand = true;
+            scrolled_window.set_policy (Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
+
+
+            listbox = new Gtk.ListBox ();
+            listbox.row_selected.connect ( play_selected );
+            listbox.expand = true;
+            listbox.valign = Gtk.Align.FILL;
+
+            var toolbar = new Gtk.Toolbar ();
+            toolbar.get_style_context ().add_class (Gtk.STYLE_CLASS_INLINE_TOOLBAR);
+            toolbar.icon_size = Gtk.IconSize.SMALL_TOOLBAR;
+
+            var add_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("document-open-symbolic", Gtk.IconSize.BUTTON), null);
+            add_button.tooltip_text = _("Add Video…");
+            add_button.clicked.connect (() => { App.get_instance ().mainwindow.run_open_file (false, false); });
+            toolbar.add (add_button);
+
+            var repeat_item = new Gtk.ToolItem ();
+            repeat_item.halign = Gtk.Align.END;
+
+            repeat_button = new Gtk.ToggleButton ();
+            repeat_button.set_image (new Gtk.Image.from_icon_name ("media-playlist-no-repeat-symbolic", Gtk.IconSize.BUTTON));
+            repeat_button.set_tooltip_text (_("Enable Repeat"));
+            repeat_button.toggled.connect (() => {
+                if (repeat_button.active) {
+                    repeat_button.set_image (new Gtk.Image.from_icon_name ("media-playlist-repeat-symbolic", Gtk.IconSize.BUTTON));
+                    repeat_button.set_tooltip_text (_("Disable Repeat"));
+                } else {
+                    repeat_button.set_image (new Gtk.Image.from_icon_name ("media-playlist-no-repeat-symbolic", Gtk.IconSize.BUTTON));
+                    repeat_button.set_tooltip_text (_("Enable Repeat"));
+                }
+            });
+
+            repeat_item.add (repeat_button);
+            toolbar.add (repeat_item);
+            scrolled_window.add (listbox);
+            grid.attach (scrolled_window, 0, 0, 1, 1);
+            grid.add (toolbar);
+            add (grid);
             restore_playlist ();
-        }
-
-        ~Playlist () {
-             save_playlist ();
-         }
+            show_all ();
+
+            destroy.connect (() =>{ save_playlist (); });
+        }
+
+        public void toggle_reveal_control () {
+            if (!child_revealed) {
+                show_all ();
+            }
+            set_reveal_child (!child_revealed);
+            visibility_changed (!child_revealed);
+        }
+
+        public void hide_reval_control () {
+            set_reveal_child (false);
+            visibility_changed (false);
+        }
+
+        public void add_item (Audience.Objects.Video video, bool instand_play = true) {
+            var new_item = new Audience.Widgets.PlaylistItem (video);
+            if (instand_play) {
+                clear ();
+            }
+            listbox.add (new_item);
+            if (instand_play) {
+                listbox.select_row (new_item);
+            }
+            collection_changed (size);
+        }
+
+        public void remove_item (Gtk.ListBoxRow row) {
+            if (row.is_selected ()) {
+                next ();
+            }
+            listbox.remove (row);
+            save_playlist ();
+            collection_changed (size);
+        }
+
+        public void clear () {
+            listbox.forall ((item)=> {
+                item.dispose ();
+            });
+        }
+
+        private void play_selected (Gtk.ListBoxRow? row) {
+            if (row != null) {
+                listbox.forall ((item) => {
+                    (item as PlaylistItem).update_state ();
+                });
+                start_playing (((PlaylistItem)row).video);
+            }
+        }
+
+        private void start_playing (Audience.Objects.Video video) {
+            double progress = 0;
+            if (video.video_file.get_uri () == settings.current_video) {
+                progress = settings.last_stopped;
+            }
+            play (video, progress);
+        }
+
+        public void play_playlist () {
+            listbox.select_row (listbox.get_row_at_index(0));
+        }
 
         public bool next () {
-            Gtk.TreeIter iter;
-            if (playlist.get_iter_from_string (out iter, (this.current + 1).to_string ())){
-                string filename;
-                playlist.get (iter, Columns.FILENAME, out filename);
-                current++;
-                play (File.new_for_commandline_arg (filename));
-                return true;
-            }
-            current = 0;
-            return false;
-        }
-
-        public void previous () {
-            Gtk.TreeIter iter;
-            if (playlist.get_iter_from_string (out iter, (this.current - 1).to_string ())){
-                string filename;
-                playlist.get (iter, Columns.FILENAME, out filename);
-                current--;
-                play (File.new_for_commandline_arg (filename));
-            }
-        }
-
-        public void add_item (File path) {
-            if (!path.query_exists ())
-                return;
-            var file_name = path.get_uri ();
-            bool exist = false;
-            Gtk.TreeIter iter;
-
-            playlist.foreach ((model, path, iter) => {
-                Value filename;
-                playlist.get_value (iter, Columns.FILENAME, out filename);
-                string name = filename.get_string ();
-                if (name == file_name)
-                    exist = true;
-                return false;
-            });
-            if (exist)
-                return;
-
-            Icon? playing = null;
-            Gtk.TreeIter dummy;
-            if (!playlist.get_iter_first (out dummy)){
-                playing = new ThemedIcon ("media-playback-start-symbolic");
-            } else {
-                playing = null;
-            }
-
-            playlist.append (out iter);
-            playlist.set (iter, Columns.PLAYING, playing,
-                                Columns.TITLE, Audience.get_title (path.get_basename ()),
-                                Columns.FILENAME, path.get_uri ());
-            item_added ();
-        }
-
-        public void remove_item (File path) {
-            var file_name = path.get_uri ();
-
-            playlist.foreach ((model, path, iter) => {
-                Value filename;
-                playlist.get_value (iter, Columns.FILENAME, out filename);
-                string name = filename.get_string ();
-                if (name == file_name)
-                    playlist.remove (iter);
-                return false;
-            });
-        }
-
-        public void clear_items () {
-            current = 0;
-            playlist.clear ();
-        }
-
-        public File? get_first_item () {
-            Gtk.TreeIter iter;
-            if (playlist.get_iter_first (out iter)){
-                string filename;
-                playlist.get (iter, Columns.FILENAME, out filename);
-                return File.new_for_commandline_arg (filename);
-            }
-            return null;
-        }
-
-        public int get_current () {
-            return current;
-        }
-
-        public void set_current (string current_file) {
-            int count = 0;
-            int current_played = 0;
-            playlist.foreach ((model, path, iter) => {
-                playlist.set (iter, Columns.PLAYING, null);
-                Value filename;
-                playlist.get_value (iter, Columns.FILENAME, out filename);
-                string name = filename.get_string ();
-                if (name == current_file)
-                    current_played = count;
-                count++;
-                return false;
-            });
-
-            Gtk.TreeIter new_iter;
-            playlist.get_iter_from_string (out new_iter, current_played.to_string ());
-            playlist.set (new_iter, Columns.PLAYING, new ThemedIcon ("media-playback-start-symbolic"));
-
-            this.current = current_played;
-
-        }
-
-        public List<string> get_all_items () {
-            var list = new List<string> ();
-            playlist.foreach ((model, path, iter) => {
-                Value filename;
-                playlist.get_value (iter, Columns.FILENAME, out filename);
-                string name = filename.get_string ();
-                list.append (name);
-                return false;
-            });
-            return list.copy ();
+            if (size > listbox.get_selected_row ().get_index () + 1) {
+                var next_video = listbox.get_row_at_index (listbox.get_selected_row ().get_index () + 1);
+                listbox.select_row (next_video);
+                return true;
+            } else if (repeat_button.active && size > 0) {
+                if (size == 1) {
+                    listbox.select_row (null);
+                }
+                listbox.select_row (listbox.get_row_at_index (0));
+                return true;
+            }
+            return false;
+        }
+
+        public bool previous () {
+            if (listbox.get_selected_row ().get_index () > 0) {
+                var next_video = listbox.get_row_at_index (listbox.get_selected_row ().get_index () - 1);
+                listbox.select_row (next_video);
+                return true;
+            }
+            return false;
+        }
+
+        public void resume () {
+            listbox.forall ((item) => {
+                var video = (item as PlaylistItem).video;
+                if (video.video_file.get_uri () == settings.current_video) {
+                    if (listbox.get_selected_row () != (item as PlaylistItem)) {
+                        listbox.select_row (item as PlaylistItem);
+                    } else {
+                        start_playing (video);
+                    }
+                    return;
+                }
+            });
+
+            play_playlist ();
         }
 
         public void save_playlist () {
             if (Audience.App.get_instance ().mainwindow.is_privacy_mode_enabled ()) {
                 return;
             }
-
-            var list = new List<string> ();
-            playlist.foreach ((model, path, iter) => {
-                Value filename;
-                playlist.get_value (iter, Columns.FILENAME, out filename);
-                string name = filename.get_string ();
-                list.append (name);
-                return false;
+            var list = new Gee.ArrayList<string> ();
+            listbox.forall ((item) => {
+                list.add ((item as PlaylistItem).video.video_file.get_uri ());
             });
-
-            uint i = 0;
-            var videos = new string[list.length ()];
-            foreach (var filename in list) {
-                videos[i] = filename;
-                i++;
+            settings.last_played_videos = list.to_array ();
+            if (list.size == 0) {
+                settings.current_video = "";
+                settings.last_stopped = 0;
             }
-
-            settings.last_played_videos = videos;
         }
 
         private void restore_playlist () {
-            this.current = 0;
-            /* foreach (var filename in settings.last_played_videos) { */
-            for (int i = 0;i<settings.last_played_videos.length;i++) {
-                if (settings.last_played_videos[i] == settings.current_video)
-                    this.current = i;
-                add_item (File.new_for_uri (settings.last_played_videos[i]));
+            foreach (var filename in settings.last_played_videos) {
+                add_from_uri (filename);
             }
         }
+
+        public void add_from_uri (string uri, bool instand_play = false) {
+            File file = File.new_for_uri (uri);
+            add_from_file (file);
+        }
+
+        public void add_from_file (File file, bool instand_play = false) {
+             if (file.query_exists () && file.get_path () != null) {
+                 FileInfo file_info = file.query_info (FileAttribute.STANDARD_CONTENT_TYPE, 0);
+                 add_item (new Audience.Objects.Video (Path.get_dirname (file.get_path ()) ,Path.get_basename (file.get_path ()),file_info.get_content_type ()), instand_play);
+             }
+        }
     }
 }
 
=== added file 'src/Widgets/PlaylistItem.vala'
--- src/Widgets/PlaylistItem.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/PlaylistItem.vala	2016-09-30 22:31:06 +0000
@@ -0,0 +1,66 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2016-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: Artem Anufrij <[e-mail]>
+ *
+ */
+
+namespace Audience.Widgets {
+    public class PlaylistItem : Gtk.ListBoxRow {
+
+        public Audience.Objects.Video video { get; construct set; }
+        Gtk.Grid grid;
+        Gtk.Label title;
+        Gtk.Image image;
+        Gtk.Button delete_button;
+
+        public PlaylistItem (Audience.Objects.Video video) {
+            Object (video: video);
+        }
+
+        construct {
+            grid = new Gtk.Grid ();
+            title = new Gtk.Label (video.title);
+            title.expand = true;
+            title.halign = Gtk.Align.START;
+
+            image = new Gtk.Image.from_icon_name ("media-playback-start-symbolic", Gtk.IconSize.MENU);
+            image.margin_right = 4;
+
+            delete_button = new Gtk.Button.from_icon_name ("edit-delete-symbolic", Gtk.IconSize.BUTTON);
+            delete_button.tooltip_text = _("Remove from Playlist");
+            delete_button.relief = Gtk.ReliefStyle.NONE;
+            delete_button.clicked.connect (() => { Audience.Widgets.Playlist.get_instance ().remove_item (this); });
+
+            grid.margin = 4;
+            grid.attach (title, 1, 0, 1, 1);
+            grid.attach (delete_button, 2, 0, 1, 1);
+            add (grid);
+        }
+
+        public void update_state () {
+            if (is_selected () && image.parent != grid) {
+                grid.attach (image, 0, 0, 1, 1);
+                image.show ();
+            } else {
+                if (image.parent == grid) {
+                    grid.remove (image);
+                }
+            }
+        }
+    }
+}
 
=== removed file 'src/Widgets/PlaylistPopover.vala'
--- src/Widgets/PlaylistPopover.vala	2016-07-29 05:02:48 +0000
+++ src/Widgets/PlaylistPopover.vala	1970-01-01 00:00:00 +0000
@@ -1,118 +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: Corentin Noël <[e-mail]>
- */
-
-public class Audience.Widgets.PlaylistPopover : Gtk.Popover {
-    public Playlist playlist;
-    public Gtk.ToggleButton rep;
-    private Gtk.ScrolledWindow playlist_scrolled;
-    private Gtk.Button dvd;
-
-    public PlaylistPopover () {
-        opacity = GLOBAL_OPACITY;
-        var grid = new Gtk.Grid ();
-        grid.row_spacing = 6;
-        grid.column_spacing = 12;
-        grid.margin = 6;
-
-        var fil = new Gtk.Button.from_icon_name ("document-open-symbolic", Gtk.IconSize.BUTTON);
-        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"));
-
-        rep = new Gtk.ToggleButton ();
-        rep.set_image (new Gtk.Image.from_icon_name ("media-playlist-no-repeat-symbolic", Gtk.IconSize.BUTTON));
-        rep.set_tooltip_text (_("Enable Repeat"));
-
-        playlist_scrolled = new Gtk.ScrolledWindow (null, null);
-        playlist_scrolled.set_min_content_height (100);
-        playlist_scrolled.set_min_content_width (260);
-
-        playlist = new Playlist ();
-        playlist_scrolled.add (playlist);
-
-        fil.clicked.connect ( () => {
-            hide ();
-            App.get_instance ().mainwindow.run_open_file (false, false);
-        });
-
-        dvd.clicked.connect ( () => {
-            hide ();
-            App.get_instance ().mainwindow.run_open_dvd ();
-        });
-
-        rep.toggled.connect ( () => {
-            /* app.repeat = rep.active; */
-            if (rep.active) {
-                rep.set_image (new Gtk.Image.from_icon_name ("media-playlist-repeat-symbolic", Gtk.IconSize.BUTTON));
-                rep.set_tooltip_text (_("Disable Repeat"));
-            } else {
-                rep.set_image (new Gtk.Image.from_icon_name ("media-playlist-no-repeat-symbolic", Gtk.IconSize.BUTTON));
-                rep.set_tooltip_text (_("Enable Repeat"));
-            }
-        });
-
-        grid.attach (playlist_scrolled, 0, 0, 7, 1);
-        grid.attach (fil, 0, 1, 1, 1);
-        grid.attach (dvd, 1, 1, 1, 1);
-        grid.attach (rep, 6, 1, 1, 1);
-
-        add (grid);
-
-        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 = !visible;
-        dvd.visible = visible;
-    }
-
-    //Override because the Popover doesn't auto-rejust his size.
-    public override void get_preferred_height (out int minimum_height, out int natural_height) {
-        base.get_preferred_height (out minimum_height, out natural_height);
-        int p_minimum_height;
-        int p_natural_height;
-        var app = ((Audience.App) GLib.Application.get_default ());
-        playlist.get_preferred_height (out p_minimum_height, out p_natural_height);
-        int temp_minimum_height = minimum_height + p_minimum_height;
-        int r_minimum_height;
-        int r_natural_height;
-        relative_to.get_preferred_height (out r_minimum_height, out r_natural_height);
-        if (temp_minimum_height < app.mainwindow.get_window ().get_height () - r_minimum_height*2) {
-            minimum_height = temp_minimum_height;
-        } else {
-            minimum_height = app.mainwindow.get_window ().get_height () - r_minimum_height*2;
-        }
-
-        int temp_natural_height = natural_height + p_natural_height;
-        if (temp_natural_height < app.mainwindow.get_window ().get_height () - r_natural_height*2) {
-            natural_height = temp_natural_height;
-        } else {
-            natural_height = minimum_height;
-        }
-    }
-}
 
=== modified file 'src/Widgets/WelcomePage.vala'
--- src/Widgets/WelcomePage.vala	2016-09-28 02:32:33 +0000
+++ src/Widgets/WelcomePage.vala	2016-09-30 22:31:06 +0000
@@ -2,27 +2,19 @@
     public class WelcomePage : Granite.Widgets.Welcome {
         private DiskManager disk_manager;
         private Services.LibraryManager library_manager;
+        private Audience.Widgets.Playlist playlist;
+
         public WelcomePage () {
             base (_("No Videos Open"), _("Select a source to begin playing."));
         }
 
         construct {
+            playlist = Audience.Widgets.Playlist.get_instance ();
+            playlist.collection_changed.connect ((playlist_size) => { build_replay_button (playlist_size); });
             append ("document-open", _("Open file"), _("Open a saved file."));
 
-            var filename = settings.current_video;
-            var last_file = File.new_for_uri (filename);
-            bool show_last_file = settings.current_video != "";
-            if (last_file.query_exists () == false) {
-                show_last_file = false;
-            }
-
-            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);
+            append ("media-playlist-repeat", _("Replay last video"), "");
+            set_item_visible (1, false);
 
             //look for dvd
             disk_manager = DiskManager.get_default ();
@@ -54,11 +46,10 @@
                 var window = App.get_instance ().mainwindow;
                 switch (index) {
                     case 0:
-                        // Open file
-                        window.run_open_file (true);
+                        window.run_open_file ();
                         break;
                     case 1:
-                        window.resume_last_videos ();
+                        playlist.resume ();
                         break;
                     case 2:
                         window.run_open_dvd ();
@@ -67,30 +58,46 @@
                         window.show_library ();
                 }
             });
+            
+            build_replay_button (playlist.size);
         }
 
-        public void refresh () {
+        private void build_replay_button (uint playlist_size) {
+            string current_video = settings.current_video;
+
             var replay_button = get_button_from_index (1);
 
-            var filename = settings.current_video;
-            var last_file = File.new_for_uri (filename);
-
-            if (settings.last_stopped == 0.0) {
+            if (playlist_size > 1 && current_video != "") {
+                // Resume Playlist;
+                replay_button.title = _("Resume playlist");
+                replay_button.icon.icon_name = ("media-playback-start");
+                replay_button.description = get_title (Path.get_basename (current_video));
+                set_item_visible (1, true);
+                replay_button.show_all ();
+            } else if (playlist_size > 1 && current_video == "") {
+                // Replay Playlist
+                replay_button.title = _("Start playing playlist");
+                replay_button.icon.icon_name = ("media-playback-start");
+                replay_button.description = _("All videos of current playlist");
+                set_item_visible (1, true);
+                replay_button.show_all ();
+            } else if (current_video != "" && settings.last_stopped > 0) {
+                // Resume Video
+                replay_button.title = _("Resume last video");
+                replay_button.icon.icon_name = ("media-playback-start");
+                replay_button.description = get_title (Path.get_basename (current_video));
+                set_item_visible (1, true);
+                replay_button.show_all ();
+            } else if (current_video != "" && settings.last_stopped == 0) {
+                // Replay Video
                 replay_button.title = _("Replay last video");
                 replay_button.icon.icon_name = ("media-playlist-repeat");
+                replay_button.description = get_title (Path.get_basename (current_video));
+                set_item_visible (1, true);
+                replay_button.show_all ();
             } else {
-                replay_button.title = _("Resume last video");
-                replay_button.icon.icon_name = ("media-playback-start");
-            }
-            replay_button.description = get_title (last_file.get_basename ());
-
-            bool show_last_file = settings.current_video != "";
-            if (last_file.query_exists () == false) {
-                show_last_file = false;
-            }
-
-            set_item_visible (1, show_last_file);
-            set_item_visible (2, disk_manager.has_media_volumes ());
+                set_item_visible (1, false);
+            }
         }
     }
 }
 
=== modified file 'src/Window.vala'
--- src/Window.vala	2016-09-27 19:58:34 +0000
+++ src/Window.vala	2016-09-30 22:31:06 +0000
@@ -27,6 +27,7 @@
     private PlayerPage player_page;
     private WelcomePage welcome_page;
     private LibraryPage library_page;
+    private Audience.Widgets.Playlist playlist;
     private EpisodesPage episodes_page;
     private Granite.Widgets.AlertView alert_view;
     private Toast app_notification;
@@ -42,9 +43,7 @@
 
     public signal void media_volumes_changed ();
 
-    public Window () {
-
-    }
+    public Window () {}
 
     construct {
         zeitgeist_manager = new ZeitgeistManager ();
@@ -78,6 +77,9 @@
 
         set_titlebar (header);
 
+        welcome_page = new WelcomePage ();
+        playlist = Audience.Widgets.Playlist.get_instance ();
+
         library_page = LibraryPage.get_instance ();
         library_page.map.connect (() => {
             search_entry.visible = true;
@@ -110,18 +112,12 @@
             search_entry.text = "";
         });
 
-        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);
-        });
-
         player_page.map.connect (() => {
             app_notification.visible = false;
         });
@@ -130,6 +126,11 @@
             app_notification.visible = true;
         });
 
+        player_page.started.connect ((video) => {
+            this.title = video.title;
+            show_player ();
+        });
+
         alert_view = new Granite.Widgets.AlertView ("", "", "");
         alert_view.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL);
         alert_view.set_vexpand (true);
@@ -154,7 +155,7 @@
         app_notification.accept.connect (() => {
             library_page.manager.undo_delete_item ();
             if (main_stack.visible_child != episodes_page) {
-                main_stack.set_visible_child (library_page);
+                main_stack.visible_child = library_page;
             }
         });
 
@@ -314,7 +315,7 @@
             }
         } else if (main_stack.visible_child == welcome_page) {
             if (match_keycode (Gdk.Key.p, keycode) || match_keycode (Gdk.Key.space, keycode)) {
-                resume_last_videos ();
+                playlist.resume ();
                 return true;
             } else if (ctrl_pressed && match_keycode (Gdk.Key.o, keycode)) {
                 run_open_file ();
@@ -344,7 +345,7 @@
 
     public void open_files (File[] files, bool clear_playlist = false, bool force_play = true) {
         if (clear_playlist) {
-            player_page.get_playlist_widget ().clear_items ();
+            playlist.clear ();
         }
 
         string[] videos = {};
@@ -365,15 +366,7 @@
         }
 
         if (force_play) {
-            play_file (videos [0]);
-        }
-    }
-
-    public void resume_last_videos () {
-        if (settings.current_video != "") {
-            play_file (settings.current_video, false);
-        } else {
-            run_open_file ();
+            playlist.play_playlist ();
         }
     }
 
@@ -381,13 +374,6 @@
         read_first_disk.begin ();
     }
 
-    public void show_library () {
-        navigation_button.label = navigation_button_welcomescreen;
-        navigation_button.show ();
-        main_stack.visible_child = library_page;
-        library_page.scrolled_window.grab_focus ();
-    }
-
     public void run_open_file (bool clear_playlist = false, bool force_play = true) {
         var file = new Gtk.FileChooserDialog (_("Open"), this, Gtk.FileChooserAction.OPEN,
             _("_Cancel"), Gtk.ResponseType.CANCEL, _("_Open"), Gtk.ResponseType.ACCEPT);
@@ -412,7 +398,7 @@
                 files += item;
             }
 
-            open_files (files, clear_playlist, force_play);
+            open_files (files, force_play);
             settings.last_folder = file.get_current_folder ();
         }
 
@@ -445,29 +431,37 @@
         }
 
         var root = volume.get_mount ().get_default_location ();
-        play_file (root.get_uri ().replace ("file:///", "dvd:///"));
+        //play_file (root.get_uri ().replace ("file:///", "dvd:///"));
     }
 
     private void on_player_ended () {
+        unfullscreen ();
         navigate_back ();
-        unfullscreen ();
-    }
-
-    public void play_file (string uri, bool from_beginning = true) {
+    }
+
+
+    public void show_library () {
+        navigation_button.label = navigation_button_welcomescreen;
+        navigation_button.show ();
+        main_stack.visible_child = library_page;
+        library_page.scrolled_window.grab_focus ();
+    }
+
+    public void show_player () {
         search_entry.visible = false;
-        if (navigation_button.visible) {
-            if (navigation_button.label == navigation_button_library) {
-                navigation_button.label = navigation_button_episodes;
+        if (main_stack.visible_child != player_page) {
+            if (navigation_button.visible) {
+                if (navigation_button.label == navigation_button_library) {
+                    navigation_button.label = navigation_button_episodes;
+                } else {
+                    navigation_button.label = navigation_button_library;
+                }
             } else {
-                navigation_button.label = navigation_button_library;
+                navigation_button.show ();
+                navigation_button.label = navigation_button_welcomescreen;
             }
-        } else {
-            navigation_button.show ();
-            navigation_button.label = navigation_button_welcomescreen;
+            main_stack.set_visible_child_full ("player", Gtk.StackTransitionType.SLIDE_LEFT);
         }
-
-        main_stack.set_visible_child_full ("player", Gtk.StackTransitionType.SLIDE_LEFT);
-        player_page.play_file (uri, from_beginning);
         if (is_maximized) {
             fullscreen ();
         }
@@ -475,8 +469,6 @@
         if (settings.stay_on_top && !settings.playback_wait) {
             set_keep_above (true);
         }
-
-        welcome_page.refresh ();
     }
 
     public void navigate_back () {
@@ -502,7 +494,8 @@
             main_stack.set_visible_child (welcome_page);
             search_entry.visible = false;
         }
-        welcome_page.refresh ();
+        
+        playlist.hide_reval_control ();
     }
 
     public void hide_alert () {