Merge lp:~prsyahmi/audience/audience into lp:~audience-members/audience/trunk

[Syahmi Azhar]

[Viko Adi Rahmawan (vikoadi)]

hello Syahmi,
would it be better if instead of

} else if (is_subtitle (filename)) {
  if (video_player.uri != null) {
  video_player.set_subtitle_uri (filename);
  }
}

just do

} else if (is_subtitle (filename) && video_player.uri != null) {
     video_player.set_subtitle_uri (filename);
}

Thanks

[Syahmi Azhar (prsyahmi)]

> hello Syahmi,
> would it be better if instead of
>
> } else if (is_subtitle (filename)) {
> if (video_player.uri != null) {
> video_player.set_subtitle_uri (filename);
> }
> }
>
> just do
>
> } else if (is_subtitle (filename) && video_player.uri != null) {
> video_player.set_subtitle_uri (filename);
> }
>
> Thanks

Hi Viko Adi Rahmawan,

You are right. I'm not sure why I'm doing that in the first place, perhaps I'm doing multiple checks before committing. Thank you.

Regards.

Unmerged revisions

483. By Syahmi Azhar <email address hidden> on 2015-01-10

Fixed loading/dropping non media file cause welcome screen become hidden

482. By Syahmi Azhar <email address hidden> on 2015-01-10

Ability to load subtitle regardless video state

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2015-01-07 10:29:27 +0000
+++ src/Audience.vala	2015-01-10 10:25:41 +0000
@@ -223,6 +223,11 @@
                 bottom_bar.set_progression_time (current_time, total_time);
             });
 
+            video_player.media_loading.connect (() => {
+                clutter.show ();
+                welcome.hide ();
+            });
+
             //end
             video_player.ended.connect (() => {
                 Idle.add (() => {
@@ -407,8 +412,6 @@
                         run_open_file ();
                         break;
                     case 1:
-                        welcome.hide ();
-                        clutter.show_all ();
                         restore_playlist ();
                         open_file (filename);
                         video_player.playing = false;
@@ -417,8 +420,6 @@
                         break;
                     case 2:
                     case 3:
-                        welcome.hide ();
-                        clutter.show_all ();
                         open_file (playlist.get_first_item ().get_path ());
                         video_player.playing = false;
                         Idle.add (() => {video_player.progress = 0; return false;});
@@ -447,8 +448,6 @@
                         if (d.run () == Gtk.ResponseType.OK) {
                             open_file (entry.text, true);
                             video_player.playing = !settings.playback_wait;
-                            welcome.hide ();
-                            clutter.show_all ();
                         }
 
                         d.destroy ();
@@ -577,9 +576,6 @@
                 foreach (var uri in sel.get_uris ()) {
                     open_file (uri);
                 }
-
-                welcome.hide ();
-                clutter.show_all ();
             });
         }
 
@@ -675,9 +671,6 @@
                 if (video_player.uri == null || welcome.is_visible ())
                     open_file (file.get_uri ());
 
-                welcome.hide ();
-                clutter.show_all ();
-
                 settings.last_folder = file.get_current_folder ();
             }
 
@@ -704,9 +697,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 ();
         }
 
         private void toggle_fullscreen () {
@@ -735,8 +725,10 @@
 
                 file = playlist.get_first_item ();
                 play_file (file.get_uri ());
-            } else if (is_subtitle (filename) && video_player.playing) {
-                video_player.set_subtitle_uri (filename);
+            } else if (is_subtitle (filename)) {
+                if (video_player.uri != null) {
+                    video_player.set_subtitle_uri (filename);
+                }
             } else {
                 playlist.add_item (file);
                 play_file (file.get_uri ());
@@ -804,8 +796,6 @@
                 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;});
@@ -819,8 +809,6 @@
             if (mainwindow == null)
                 build ();
 
-            welcome.hide ();
-            clutter.show_all ();
             foreach (var file in files) {
                 playlist.add_item (file);
             }

=== modified file 'src/Widgets/VideoPlayer.vala'
--- src/Widgets/VideoPlayer.vala	2014-10-05 06:13:09 +0000
+++ src/Widgets/VideoPlayer.vala	2015-01-10 10:25:41 +0000
@@ -105,11 +105,12 @@
                         video_width = get_video_width (video_info);
                     }
                 } catch (Error e) {
-                    error ();
                     warning (e.message);
                     return;
                 }
 
+                media_loading ();
+
                 intial_relayout = true;
                 playing = false;
                 playbin.set_state (Gst.State.READY);
@@ -176,6 +177,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);
+        public signal void media_loading ();
         
         private VideoPlayer () {
             video = new Clutter.Texture ();
@@ -477,4 +479,4 @@
             return num / (double)denom;
         }
     }
-}
\ No newline at end of file
+}