Changed gconf path (/system/mafw/mafw-gst-renderer ->

[mafwsubrenderer] / libmafw-gst-renderer / mafw-gst-renderer.c

diff --git a/libmafw-gst-renderer/mafw-gst-renderer.c b/libmafw-gst-renderer/mafw-gst-renderer.c
index 1e593de..939a6fe 100644 (file)
--- a/libmafw-gst-renderer/mafw-gst-renderer.c
+++ b/libmafw-gst-renderer/mafw-gst-renderer.c
@@ -56,7 +56,7 @@
 
 #define GCONF_OSSO_AF "/system/osso/af"
 #define GCONF_BATTERY_COVER_OPEN "/system/osso/af/mmc-cover-open"
-#define GCONF_MAFW_GST_SUBTITLE_RENDERER "/system/mafw/mafw-gst-renderer"
+#define GCONF_MAFW_GST_SUBTITLES_RENDERER "/system/mafw/mafw-gst-subtitles-renderer"
 #define HAL_VIDEOOUT_UDI "/org/freedesktop/Hal/devices" \
         "/platform_soc_audio_logicaldev_input"
 
@@ -359,7 +359,7 @@ static void mafw_gst_renderer_init(MafwGstRenderer *self)
        }
 
        gconf_client_add_dir(renderer->gconf_client,
-                            GCONF_MAFW_GST_SUBTITLE_RENDERER,
+                            GCONF_MAFW_GST_SUBTITLES_RENDERER,
                             GCONF_CLIENT_PRELOAD_ONELEVEL,
                             &error);
        if (error) {
@@ -369,7 +369,7 @@ static void mafw_gst_renderer_init(MafwGstRenderer *self)
        }
 
        gconf_client_notify_add(renderer->gconf_client,
-                               GCONF_MAFW_GST_SUBTITLE_RENDERER "/autoload_subtitles",
+                               GCONF_MAFW_GST_SUBTITLES_RENDERER "/autoload_subtitles",
                                (GConfClientNotifyFunc) _autoload_subtitles_changed_cb,
                                renderer,
                                NULL, &error);
@@ -379,7 +379,7 @@ static void mafw_gst_renderer_init(MafwGstRenderer *self)
        }
 
        gconf_client_notify_add(renderer->gconf_client,
-                               GCONF_MAFW_GST_SUBTITLE_RENDERER "/subtitle_encoding",
+                               GCONF_MAFW_GST_SUBTITLES_RENDERER "/subtitle_encoding",
                                (GConfClientNotifyFunc) _subtitle_font_changed_cb,
                                renderer,
                                NULL, &error);
@@ -389,7 +389,7 @@ static void mafw_gst_renderer_init(MafwGstRenderer *self)
        }
 
        gconf_client_notify_add(renderer->gconf_client,
-                               GCONF_MAFW_GST_SUBTITLE_RENDERER "/subtitle_font",
+                               GCONF_MAFW_GST_SUBTITLES_RENDERER "/subtitle_font",
                                (GConfClientNotifyFunc) _subtitle_font_changed_cb,
                                renderer,
                                NULL, &error);
@@ -400,13 +400,13 @@ static void mafw_gst_renderer_init(MafwGstRenderer *self)
 
        if (self->worker->pipeline) {
                gconf_client_notify(renderer->gconf_client,
-                                   GCONF_MAFW_GST_SUBTITLE_RENDERER "/autoload_subtitles");
+                                   GCONF_MAFW_GST_SUBTITLES_RENDERER "/autoload_subtitles");
 
                gconf_client_notify(renderer->gconf_client,
-                                   GCONF_MAFW_GST_SUBTITLE_RENDERER "/subtitle_encoding");
+                                   GCONF_MAFW_GST_SUBTITLES_RENDERER "/subtitle_encoding");
 
                gconf_client_notify(renderer->gconf_client,
-                                   GCONF_MAFW_GST_SUBTITLE_RENDERER "/subtitle_font");
+                                   GCONF_MAFW_GST_SUBTITLES_RENDERER "/subtitle_font");
        }
 
        if (gnome_vfs_init()) {
@@ -924,26 +924,32 @@ static void _subtitle_font_changed_cb(GConfClient *client,
        key = gconf_entry_get_key(entry);
 
        /* Only key without absolute path is required */
-       key += strlen(GCONF_MAFW_GST_SUBTITLE_RENDERER) + 1;
+       key += strlen(GCONF_MAFW_GST_SUBTITLES_RENDERER) + 1;
 
        value = gconf_entry_get_value(entry);
-       if (value == NULL)
-               return;
-
-       str_value = gconf_value_get_string(value);
+       if (value)
+               str_value = gconf_value_get_string(value);
+       else
+               str_value = NULL;
 
        if (strcmp(key, "subtitle_font") == 0) {
                if (renderer->worker->subtitles.font)
                        g_free(renderer->worker->subtitles.font);
 
-               renderer->worker->subtitles.font = g_strdup(str_value);
+               if (str_value)
+                       renderer->worker->subtitles.font = g_strdup(str_value);
+               else
+                       renderer->worker->subtitles.font = NULL;
        } else if (strcmp(key, "subtitle_encoding") == 0) {
                if (renderer->worker->subtitles.encoding)
                        g_free(renderer->worker->subtitles.encoding);
 
-               renderer->worker->subtitles.encoding = g_strdup(str_value);
+               if (str_value)
+                       renderer->worker->subtitles.encoding = g_strdup(str_value);
+               else
+                       renderer->worker->subtitles.encoding = NULL;
        } else {
-               g_warning("Wrong %s key, %s", GCONF_MAFW_GST_SUBTITLE_RENDERER, key);
+               g_warning("Wrong %s key, %s", GCONF_MAFW_GST_SUBTITLES_RENDERER, key);
        }
 }