Merge lp:~philip.scott/audience/audio-subs-selector into lp:~audience-members/audience/trunk

[Felipe Escoto]

Fix Subtitle & Audio combobox loading (lp:1610617)

Let's have the audio and subtitles working again!

They were broken because they were being loaded before the video appeared. Now they get loaded when you open the Popover

[lp:~philip.scott/audience/audio-subs-selector]

619. By Felipe Escoto on 2016-08-07

Working subtitles and audio

=== modified file 'src/Widgets/BottomBar.vala'
--- src/Widgets/BottomBar.vala	2016-08-01 18:46:23 +0000
+++ src/Widgets/BottomBar.vala	2016-08-07 00:34:20 +0000
@@ -63,7 +63,11 @@
 
         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.show_all (); preferences_popover.queue_resize ();});
+        preferences_button.clicked.connect (() => {
+            preferences_popover.setup ();
+            preferences_popover.show_all (); 
+            preferences_popover.queue_resize ();
+        });
 
         time_widget = new TimeWidget (playback);
 

=== modified file 'src/Widgets/PlayerPage.vala'
--- src/Widgets/PlayerPage.vala	2016-07-29 05:02:48 +0000
+++ src/Widgets/PlayerPage.vala	2016-08-07 00:34:20 +0000
@@ -223,7 +223,7 @@
                     var cursor = new Gdk.Cursor.for_display (display, Gdk.CursorType.BLANK_CURSOR);
                     window.set_cursor (cursor);
                 }
-            });        
+            });
 
             notify["playing"].connect (() => {
                 if (playing) {
@@ -258,10 +258,8 @@
             Gtk.RecentManager recent_manager = Gtk.RecentManager.get_default ();
             recent_manager.add_item (uri);
 
-            /*subtitles/audio tracks*/
-            bottom_bar.preferences_popover.setup_text ();
-            bottom_bar.preferences_popover.setup_audio ();
-            
+            bottom_bar.preferences_popover.is_setup = false;
+
             Audience.Services.Inhibitor.get_instance ().inhibit ();
         }
 

=== modified file 'src/Widgets/SettingsPopover.vala'
--- src/Widgets/SettingsPopover.vala	2016-03-14 13:10:18 +0000
+++ src/Widgets/SettingsPopover.vala	2016-08-07 00:34:20 +0000
@@ -19,6 +19,8 @@
  */
 
 public class Audience.Widgets.SettingsPopover : Gtk.Popover {
+    public bool is_setup = false;
+
     private Gtk.ComboBoxText languages;
     private Gtk.ComboBoxText subtitles;
     private Gtk.FileChooserButton external_subtitle_file;
@@ -97,33 +99,55 @@
         add (setupgrid);
     }
 
-    public void setup_text () {
+    public void setup () {
+        if (!is_setup) {
+            is_setup = true;
+            setup_text ();
+            setup_audio ();
+        }
+    }
+
+    private void setup_text () {
+        int previous_track = playback.subtitle_track;
         if (subtitles.model.iter_n_children (null) > 0)
             subtitles.remove_all ();
 
+        uint track = 1;
         playback.get_subtitle_tracks ().foreach ((lang) => {
-            subtitles.append (lang, lang);
+            // FIXME: Using Track since lang is actually a bad pointer :/
+            subtitles.append (lang, _("Track %d").printf (track++));
         });
 
         subtitles.append ("none", _("None"));
-        subtitles.active = playback.subtitle_track;
+        subtitles.active = previous_track;
         subtitles.sensitive = subtitles.model.iter_n_children (null) > 1;
+
+        if (!subtitles.sensitive) {
+            subtitles.append ("def", _("Default"));
+            subtitles.active = 0;
+        } else {
+            subtitles.active = previous_track;
+        }
     }
 
-    public void setup_audio () {
+    private void setup_audio () {
+        int previous_track = playback.subtitle_track;
+
         if (languages.model.iter_n_children (null) > 0)
             languages.remove_all ();
 
+        uint track = 1;
         playback.get_audio_streams ().foreach ((lang) => {
-            languages.append (lang, lang);
+            languages.append (lang, _("Track %d").printf (track++));
         });
 
-        languages.sensitive = languages.model.iter_n_children (null) > 0;
+        languages.sensitive = languages.model.iter_n_children (null) > 1;
+
         if (!languages.sensitive) {
             languages.append ("def", _("Default"));
-            languages.active = 0;
+            languages.active = 1;
         } else {
-            languages.active = playback.subtitle_track;
+            languages.active = previous_track;
         }
     }