Merge lp:~vikoadi/audience/move-subtitle-font-to-playerpage into lp:~audience-members/audience/trunk

[Viko Adi Rahmawan]

move subtitle font listening to playerpage

move subtitle font listening to playerpage

VideoPlayer should not listen to gsetting

[Cody Garver (codygarver)]

Needs trunk merged in and conflicts resolved

review: Needs Fixing

[Danielle Foré (danrabbit)]

Rejecting since it seems to be abandoned

Unmerged revisions

550. By Viko Adi Rahmawan on 2015-11-01

move subtitle font listening to playerpage

=== modified file 'src/Widgets/PlayerPage.vala'
--- src/Widgets/PlayerPage.vala	2015-10-31 19:47:46 +0000
+++ src/Widgets/PlayerPage.vala	2015-11-01 17:28:24 +0000
@@ -212,6 +212,8 @@
 
             stage.notify["allocation"].connect (() => {allocate_bottombar ();});
 
+            settings.changed.connect (on_setting_changed);
+
             add (clutter);
 
             show_all ();
@@ -246,6 +248,8 @@
             if (sub_uri != null)
                 video_player.set_subtitle_uri (sub_uri);
 
+            video_player.subtitle_font = get_audience_font ();
+
             App.get_instance ().set_window_title (get_title (uri));
             video_player.relayout ();
 
@@ -523,5 +527,28 @@
                 Idle.add (update_aspect_ratio);
         }
 
+        void update_subtitle_font () {
+            debug ("Updating subtitle font");
+            var font = get_audience_font ();
+
+            if (get_audience_font () == "") {
+                font = get_gnome_font ();
+            }
+            video_player.subtitle_font = font;
+        }
+
+        string get_audience_font () {
+            return settings.subtitle_font;
+        }
+
+        string get_gnome_font () {
+            var gnome_settings = new GLib.Settings ("org.gnome.desktop.interface");
+            return gnome_settings.get_string ("font-name");
+        }
+
+        void on_setting_changed () {
+            if (video_player.subtitle_font != get_audience_font ())
+                update_subtitle_font ();
+        }
     }
 }

=== modified file 'src/Widgets/VideoPlayer.vala'
--- src/Widgets/VideoPlayer.vala	2015-09-21 18:11:20 +0000
+++ src/Widgets/VideoPlayer.vala	2015-11-01 17:28:24 +0000
@@ -239,10 +239,6 @@
             video_sink.texture = video;
             playbin.video_sink = video_sink;
             add_child(video);
-            update_subtitle_font ();
-            settings.changed.connect (() => {
-                update_subtitle_font ();
-            });
 
             playbin.about_to_finish.connect (() => {
                 if (!at_end) {
@@ -522,16 +518,5 @@
             }
             debug ("scaling to %ux%u", video_width, video_height);
         }
-
-        void update_subtitle_font () {
-            debug ("Updating subtitle font");
-            var font = settings.subtitle_font;
-
-            if (font == "") {
-                var gnome_settings = new GLib.Settings ("org.gnome.desktop.interface");
-                font = gnome_settings.get_string ("font-name");
-            }
-            subtitle_font = font;
-        }
     }
 }