Merge lp:~voldyman/audience/subtitle-font into lp:~audience-members/audience/trunk

[Akshay Shekher]

Audience will now use either the default system font for subtitles or the one set using dconf

=== modified file 'data/org.pantheon.audience.gschema.xml'
--- data/org.pantheon.audience.gschema.xml	2014-08-06 19:13:49 +0000
+++ data/org.pantheon.audience.gschema.xml	2015-05-16 10:15:39 +0000
@@ -1,5 +1,9 @@
 <schemalist>
-    <schema path="/org/pantheon/audience/" id="org.pantheon.audience" gettext-domain="audience">
+  <schema path="/org/pantheon/audience/" id="org.pantheon.audience" gettext-domain="audience">
+        <key name="subtitle-font" type="s">
+            <default>""</default>
+            <summary>Set the default font of video subtitles</summary>
+        </key>
         <key name="move-window" type="b">
             <default>true</default>
             <summary>Move the window</summary>
@@ -51,4 +55,4 @@
             <description>Hide the window decorations. You can close the window with escape</description>
         </key>
     </schema>
-</schemalist>
 \ No newline at end of file
+</schemalist>
 
=== modified file 'src/Settings.vala'
--- src/Settings.vala	2014-08-06 19:13:49 +0000
+++ src/Settings.vala	2015-05-16 10:15:39 +0000
@@ -29,6 +29,7 @@
     public bool playback_wait {get; set;}
     public bool stay_on_top {get; set;}
     public bool show_window_decoration {get; set;}
+    public string subtitle_font {get; set; }
 
     public Settings () {
         base ("org.pantheon.audience");
 
=== modified file 'src/Widgets/VideoPlayer.vala'
--- src/Widgets/VideoPlayer.vala	2014-11-25 14:34:08 +0000
+++ src/Widgets/VideoPlayer.vala	2015-05-16 10:15:39 +0000
@@ -158,6 +158,17 @@
             }
         }
 
+        private string _subtitle_font;
+        public string subtitle_font {
+            get {
+                return _subtitle_font;
+            }
+            set {
+                _subtitle_font = value;
+                playbin.set ("subtitle-font-desc", _subtitle_font);
+            }
+        }
+
         public dynamic Gst.Element playbin;
         Clutter.Texture video;
 
@@ -198,6 +209,11 @@
                 return true;
             });
 
+            update_subtitle_font ();
+            settings.changed.connect (() => {
+                update_subtitle_font ();
+            });
+
             playbin.about_to_finish.connect (() => {
                 if (!at_end) {
                     at_end = true;
@@ -476,5 +492,16 @@
             }
             return num / (double)denom;
         }
+
+        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;
+        }
     }
 }