Merge lp:~artem-anufrij/audience/dont-autoplay-on-startup into lp:~audience-members/audience/trunk

[Artem Anufrij]

Don't autoplay on startup

Don't autoplay on startup

[Cody Garver (codygarver)]

Controls are hidden until you mouse hover, it's supposed to always show while paused

review: Needs Fixing

[Cody Garver (codygarver)]

No controls visible when Audience starts paused

review: Needs Fixing

[Artem Anufrij (artem-anufrij)]

added a menu item 'Resume last video' if last video wasn't finished

[xapantu (xapantu)]

Please don't fix style issues when you try to fix a bug, it is just more annoying to read the diff ;)

[xapantu (xapantu)]

See inline comment.

review: Needs Fixing

[lp:~artem-anufrij/audience/dont-autoplay-on-startup]

537. By Artem Anufrij on 2015-09-11

playbin.set_state (Gst.State.PAUSED); -> playing = false;

[Artem Anufrij (artem-anufrij)]

fixed:
playbin.set_state (Gst.State.PAUSED); -> playing = false;

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2015-07-28 06:24:05 +0000
+++ src/Audience.vala	2015-09-11 13:53:33 +0000
@@ -128,7 +128,7 @@
             settings = new Settings ();
             mainwindow = new Gtk.Window ();
             video_player = Widgets.VideoPlayer.get_default ();
-            video_player.notify["playing"].connect (() => {bottom_bar.toggle_play_pause ();});
+            video_player.notify["playing"].connect (() => { bottom_bar.toggle_play_pause (); });
 
             clutter = new GtkClutter.Embed ();
 
@@ -339,7 +339,7 @@
             });
 
             //save position in video when not finished playing
-            mainwindow.destroy.connect (() => {on_destroy ();});
+            mainwindow.destroy.connect (() => { on_destroy (); });
 
             //playlist wants us to open a file
             playlist.play.connect ((file) => {
@@ -354,7 +354,7 @@
                 }
             });
 
-            stage.notify["allocation"].connect (() => {allocate_bottombar ();});
+            stage.notify["allocation"].connect (() => { allocate_bottombar (); });
         }
 
         private void allocate_bottombar () {
@@ -412,7 +412,7 @@
                         restore_playlist ();
                         open_file (filename);
                         video_player.playing = false;
-                        Idle.add (() => {video_player.progress = settings.last_stopped; return false;});
+                        Idle.add (() => { video_player.progress = settings.last_stopped; return false; });
                         video_player.playing = true;
                         break;
                     case 2:
@@ -420,7 +420,7 @@
                         clutter.show_all ();
                         open_file (playlist.get_first_item ().get_path ());
                         video_player.playing = false;
-                        Idle.add (() => {video_player.progress = 0; return false;});
+                        Idle.add (() => { video_player.progress = 0; return false; });
                         video_player.playing = true;
                         break;
                     case 3:
@@ -445,7 +445,6 @@
 
                         if (d.run () == Gtk.ResponseType.OK) {
                             open_file (entry.text, true);
-                            video_player.playing = !settings.playback_wait;
                             welcome.hide ();
                             clutter.show_all ();
                         }
@@ -760,7 +759,6 @@
 
             var root = volume.get_mount ().get_default_location ();
             open_file (root.get_uri (), true);
-            video_player.playing = !settings.playback_wait;
 
             welcome.hide ();
             clutter.show_all ();
@@ -782,7 +780,7 @@
             return (event.state & modifier) == modifier;
         }
 
-        internal void open_file (string filename, bool dont_modify = false) {
+        internal void open_file (string filename, bool play = true) {
             var file = File.new_for_commandline_arg (filename);
 
             if (file.query_file_type (0) == FileType.DIRECTORY) {
@@ -791,12 +789,12 @@
                 });
 
                 file = playlist.get_first_item ();
-                play_file (file.get_uri ());
+                play_file (file.get_uri (), play);
             } else if (is_subtitle (filename) && video_player.playing) {
                 video_player.set_subtitle_uri (filename);
             } else {
                 playlist.add_item (file);
-                play_file (file.get_uri ());
+                play_file (file.get_uri (), play);
             }
         }
 
@@ -830,7 +828,7 @@
             return false;
         }
 
-        public void play_file (string uri) {
+        public void play_file (string uri, bool play = true) {
             debug ("Opening %s", uri);
             video_player.uri = uri;
             playlist.set_current (uri);
@@ -841,7 +839,7 @@
                 video_player.set_subtitle_uri (sub_uri);
 
             mainwindow.title = get_title (uri);
-            video_player.playing = !settings.playback_wait;
+            video_player.playing = play;
 
             Gtk.RecentManager recent_manager = Gtk.RecentManager.get_default ();
             recent_manager.add_item (uri);
@@ -861,12 +859,8 @@
                 restore_playlist ();
 
                 if (settings.last_stopped > 0) {
-                    welcome.hide ();
-                    clutter.show_all ();
-                    open_file (settings.current_video);
-                    video_player.playing = false;
-                    Idle.add (() => {video_player.progress = settings.last_stopped; return false;});
-                    video_player.playing = !settings.playback_wait;
+                    open_file (settings.current_video, false);
+                    Idle.add (() => { video_player.progress = settings.last_stopped; return false; });
                 }
             }
         }
 
=== modified file 'src/Widgets/VideoPlayer.vala'
--- src/Widgets/VideoPlayer.vala	2015-05-16 10:13:38 +0000
+++ src/Widgets/VideoPlayer.vala	2015-09-11 13:53:33 +0000
@@ -120,7 +120,7 @@
                 at_end = false;
 
                 relayout ();
-                playing = true;
+                playing = false;
             }
         }
 
@@ -187,7 +187,7 @@
         public signal void configure_window (uint video_w, uint video_h);
         public signal void progression_changed (double current_time, double total_time);
         public signal void external_subtitle_changed (string? uri);
-        
+
         private VideoPlayer () {
             video = new Clutter.Texture ();
 
@@ -255,9 +255,9 @@
                     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:
@@ -266,19 +266,19 @@
                 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++) {
@@ -379,10 +379,10 @@
             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);
@@ -448,7 +448,7 @@
         //prevent screenlocking in Gnome 3 using org.gnome.SessionManager
         void set_screenlock (bool enable) {
             try {
-                session_manager = Bus.get_proxy_sync (BusType.SESSION, 
+                session_manager = Bus.get_proxy_sync (BusType.SESSION,
                         "org.gnome.SessionManager", "/org/gnome/SessionManager");
                 if (enable) {
                     session_manager.Uninhibit (inhibit_cookie);
@@ -471,7 +471,7 @@
                 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);
         }
 
@@ -500,7 +500,7 @@
             if (font == "") {
                 var gnome_settings = new GLib.Settings ("org.gnome.desktop.interface");
                 font = gnome_settings.get_string ("font-name");
-            } 
+            }
             subtitle_font = font;
         }
     }