Merge lp:~artem-anufrij/audience/Bugfix-1297408 into lp:~audience-members/audience/trunk

[Artem Anufrij]

Respect playback_wait setting

if "playback_wait" has been set, Audience doesn't starts automatically playback after:
- start Audience
- open a video file (doubleclick) in Files
- open a video in Audience (open file dialog)
- drag and drop

[PerfectCarl (name-is-carl)]

The code is clean.

Assuming it does what it says on the tin, it's all good.

review: Approve

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2014-10-05 05:04:18 +0000
+++ src/Audience.vala	2014-10-18 09:12:19 +0000
@@ -409,7 +409,7 @@
 
                         if (d.run () == Gtk.ResponseType.OK) {
                             open_file (entry.text, true);
-                            video_player.playing = true;
+                            video_player.playing = !settings.playback_wait;
                             welcome.hide ();
                             clutter.show_all ();
                         }
@@ -672,7 +672,7 @@
 
             var root = volume.get_mount ().get_default_location ();
             open_file (root.get_uri (), true);
-            video_player.playing = true;
+            video_player.playing = !settings.playback_wait;
 
             welcome.hide ();
             clutter.show_all ();
@@ -753,8 +753,7 @@
                 video_player.set_subtitle_uri (sub_uri);
 
             mainwindow.title = get_title (uri);
-            if (!settings.playback_wait)
-                video_player.playing = true;
+            video_player.playing = !settings.playback_wait;
 
             Gtk.RecentManager recent_manager = Gtk.RecentManager.get_default ();
             recent_manager.add_item (uri);
@@ -779,7 +778,7 @@
                     open_file (settings.current_video);
                     video_player.playing = false;
                     Idle.add (() => {video_player.progress = settings.last_stopped; return false;});
-                    video_player.playing = true;
+                    video_player.playing = !settings.playback_wait;
                 }
             }
         }
@@ -819,4 +818,4 @@
     var app = Audience.App.get_instance ();
 
     app.run (args);
-}
+}
\ No newline at end of file