Merge lp:~vikoadi/audience/gstreamer-install into lp:~audience-members/audience/trunk

[Viko Adi Rahmawan]

- use EOS message (fix Bug #1461680)
- check video size after codec check (fix Bug #1409290)

- dont use about_to_finish and Gst.Bus.peek, use EOS message instead
- get video size after codec check not before, dont emit error if getting video size fail

=== modified file 'src/Widgets/BottomBar.vala'
--- src/Widgets/BottomBar.vala	2015-06-14 07:02:09 +0000
+++ src/Widgets/BottomBar.vala	2015-11-06 10:25:14 +0000
@@ -132,7 +132,7 @@
         } 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 (!player.at_end);
+            set_reveal_child (true);
         }
     }
 

=== modified file 'src/Widgets/VideoPlayer.vala'
--- src/Widgets/VideoPlayer.vala	2015-09-21 18:11:20 +0000
+++ src/Widgets/VideoPlayer.vala	2015-11-06 10:25:14 +0000
@@ -47,7 +47,6 @@
 
 namespace Audience.Widgets {
     public class VideoPlayer : Actor {
-        public bool at_end;
 
         bool _playing;
         public bool playing {
@@ -99,6 +98,19 @@
                 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 ();
@@ -110,23 +122,9 @@
                         video_height = h;
                     }
                 } catch (Error e) {
-                    error ();
                     warning (e.message);
                     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;
-                at_end = false;
-
-                relayout ();
-                playing = false;
             }
         }
 
@@ -243,19 +241,9 @@
             settings.changed.connect (() => {
                 update_subtitle_font ();
             });
-
-            playbin.about_to_finish.connect (() => {
-                if (!at_end) {
-                    at_end = true;
-                    ended ();
-                }
-            });
         }
 
-        void watch () {
-            var msg = playbin.get_bus ().peek ();
-            if (msg == null)
-                return;
+        void watch (Gst.Message msg) {
 
             switch (msg.type) {
                 case Gst.MessageType.APPLICATION:
@@ -277,7 +265,6 @@
                     break;
                 case Gst.MessageType.EOS:
                     Idle.add (()=>{
-                            playbin.set_state (Gst.State.READY);
                             ended ();
                             return false;
                             });