[gnac/devel] Code refactoring

[BenoÃt Dupasquier <bdupasqu src gnome org>]

commit 2e4356ab45d5c1770fb53fe1ae3adf3773fa63b3
Author: BenoÃt Dupasquier <bdupasqu src gnome org>
Date:   Tue Nov 15 16:36:14 2011 +0000

    Code refactoring

 src/profiles/formats/gnac-profiles-aac.c     |    3 +-
 src/profiles/formats/gnac-profiles-flac.c    |    3 +-
 src/profiles/formats/gnac-profiles-lame.c    |    3 +-
 src/profiles/formats/gnac-profiles-speex.c   |    3 +-
 src/profiles/formats/gnac-profiles-vorbis.c  |    3 +-
 src/profiles/formats/gnac-profiles-wav.c     |    3 +-
 src/profiles/formats/gnac-profiles-wavpack.c |    3 +-
 src/profiles/gnac-profiles-default.c         |    3 +-
 src/profiles/gnac-profiles-default.h         |    3 +-
 src/profiles/gnac-profiles-utils.c           |  144 +++++++++-----------------
 src/profiles/gnac-profiles-utils.h           |   26 -----
 11 files changed, 59 insertions(+), 138 deletions(-)
---
diff --git a/src/profiles/formats/gnac-profiles-aac.c b/src/profiles/formats/gnac-profiles-aac.c
index 1c775aa..becbe40 100755
--- a/src/profiles/formats/gnac-profiles-aac.c
+++ b/src/profiles/formats/gnac-profiles-aac.c
@@ -122,8 +122,7 @@ gnac_profiles_aac_init(UpdateTextBufferFunc call_back)
 
   update_text_buffer_call_back = call_back;
 
-  gnac_profiles_default_init(&aac_bfi,
-      G_CALLBACK(gnac_profiles_aac_generate_pipeline));
+  gnac_profiles_default_init(&aac_bfi);
 
   // Bitrate
   gnac_profiles_utils_all_in_one_for_combo(&aac_bfi, 
diff --git a/src/profiles/formats/gnac-profiles-flac.c b/src/profiles/formats/gnac-profiles-flac.c
index 6fe43b1..090dc47 100755
--- a/src/profiles/formats/gnac-profiles-flac.c
+++ b/src/profiles/formats/gnac-profiles-flac.c
@@ -116,8 +116,7 @@ gnac_profiles_flac_init(UpdateTextBufferFunc call_back)
 {
   update_text_buffer_call_back = call_back;
 
-  gnac_profiles_default_init(&flac_bfi, 
-      G_CALLBACK(gnac_profiles_flac_generate_pipeline));
+  gnac_profiles_default_init(&flac_bfi);
 
   gnac_profiles_utils_all_in_one_for_slider(&flac_bfi, 
       "slider-compression", "//variable[ id='compression']/*");
diff --git a/src/profiles/formats/gnac-profiles-lame.c b/src/profiles/formats/gnac-profiles-lame.c
index e3291b3..5af0da8 100755
--- a/src/profiles/formats/gnac-profiles-lame.c
+++ b/src/profiles/formats/gnac-profiles-lame.c
@@ -149,8 +149,7 @@ gnac_profiles_lame_init(UpdateTextBufferFunc call_back)
   GtkWidget *widget;
   GtkWidget *widget2;
 
-  gnac_profiles_default_init(&lame_bfi,
-      G_CALLBACK(gnac_profiles_lame_generate_pipeline));
+  gnac_profiles_default_init(&lame_bfi);
 
   update_text_buffer_call_back = call_back;
   
diff --git a/src/profiles/formats/gnac-profiles-speex.c b/src/profiles/formats/gnac-profiles-speex.c
index e7bb127..bb78c0f 100644
--- a/src/profiles/formats/gnac-profiles-speex.c
+++ b/src/profiles/formats/gnac-profiles-speex.c
@@ -150,8 +150,7 @@ gnac_profiles_speex_init(UpdateTextBufferFunc call_back)
 
   update_text_buffer_call_back = call_back;
 
-  gnac_profiles_default_init(&speex_bfi, 
-      G_CALLBACK(gnac_profiles_speex_generate_pipeline));
+  gnac_profiles_default_init(&speex_bfi);
 
   // Bitrate
   widget = gnac_profiles_utils_all_in_one_for_slider(&speex_bfi, 
diff --git a/src/profiles/formats/gnac-profiles-vorbis.c b/src/profiles/formats/gnac-profiles-vorbis.c
index ef472c3..624c7b4 100755
--- a/src/profiles/formats/gnac-profiles-vorbis.c
+++ b/src/profiles/formats/gnac-profiles-vorbis.c
@@ -177,8 +177,7 @@ gnac_profiles_vorbis_init(UpdateTextBufferFunc call_back)
 
   update_text_buffer_call_back = call_back;
 
-  gnac_profiles_default_init(&vorbis_bfi, 
-      G_CALLBACK(gnac_profiles_vorbis_generate_pipeline));
+  gnac_profiles_default_init(&vorbis_bfi);
 
   // Bitrate
   gnac_profiles_utils_all_in_one_for_combo(&vorbis_bfi, 
diff --git a/src/profiles/formats/gnac-profiles-wav.c b/src/profiles/formats/gnac-profiles-wav.c
index 952db4a..c8fc0b2 100755
--- a/src/profiles/formats/gnac-profiles-wav.c
+++ b/src/profiles/formats/gnac-profiles-wav.c
@@ -111,8 +111,7 @@ gnac_profiles_wav_init(UpdateTextBufferFunc call_back)
 {
   update_text_buffer_call_back = call_back;
 
-  gnac_profiles_default_init(&wav_bfi, 
-      G_CALLBACK(gnac_profiles_wav_generate_pipeline));
+  gnac_profiles_default_init(&wav_bfi);
   
   gnac_profiles_xml_engine_free_doc_xpath(wav_bfi.doc);
   wav_bfi.doc = NULL;
diff --git a/src/profiles/formats/gnac-profiles-wavpack.c b/src/profiles/formats/gnac-profiles-wavpack.c
index ac14037..ab7ab24 100644
--- a/src/profiles/formats/gnac-profiles-wavpack.c
+++ b/src/profiles/formats/gnac-profiles-wavpack.c
@@ -144,8 +144,7 @@ gnac_profiles_wavpack_init(UpdateTextBufferFunc call_back)
 
   update_text_buffer_call_back = call_back;
 
-  gnac_profiles_default_init(&wavpack_bfi, 
-      G_CALLBACK(gnac_profiles_wavpack_generate_pipeline));
+  gnac_profiles_default_init(&wavpack_bfi);
 
   // Encoding mode
   gnac_profiles_utils_all_in_one_for_combo(&wavpack_bfi, 
diff --git a/src/profiles/gnac-profiles-default.c b/src/profiles/gnac-profiles-default.c
index a29fd62..5539981 100755
--- a/src/profiles/gnac-profiles-default.c
+++ b/src/profiles/gnac-profiles-default.c
@@ -32,8 +32,7 @@
 
 
 void
-gnac_profiles_default_init(BasicFormatInfo *bfi,
-                           GCallback        pipeline_callback)
+gnac_profiles_default_init(BasicFormatInfo *bfi)
 {
   GtkWidget *widget;
   XMLDoc    *base_values_doc;
diff --git a/src/profiles/gnac-profiles-default.h b/src/profiles/gnac-profiles-default.h
index d632d4b..b366719 100755
--- a/src/profiles/gnac-profiles-default.h
+++ b/src/profiles/gnac-profiles-default.h
@@ -64,8 +64,7 @@ typedef struct {
 typedef FormatModuleFuncs (*FormatModuleGetFuncs) (void);
 
 void
-gnac_profiles_default_init(BasicFormatInfo *bfi,
-                           GCallback        pipeline_callback);
+gnac_profiles_default_init(BasicFormatInfo *bfi);
 
 GtkWidget *
 gnac_profiles_default_get_properties_alignment(BasicFormatInfo *bfi);
diff --git a/src/profiles/gnac-profiles-utils.c b/src/profiles/gnac-profiles-utils.c
index 34858f8..ff383f1 100755
--- a/src/profiles/gnac-profiles-utils.c
+++ b/src/profiles/gnac-profiles-utils.c
@@ -37,19 +37,18 @@ gnac_profiles_utils_init_name_extension(XMLDoc       *doc,
                                         gchar       **name,
                                         gchar       **extension)
 {
-  gchar *xpath_query_name;
-  gchar *xpath_query_extension;
+  gchar *query_name;
+  gchar *query_extension;
 
-  xpath_query_name = g_strconcat("//profile[ id='", format, "']/name", NULL);
-  xpath_query_extension = g_strconcat("//profile[ id='", format,
+  query_name = g_strconcat("//profile[ id='", format, "']/name", NULL);
+  query_extension = g_strconcat("//profile[ id='", format,
       "']/output-file-extension", NULL);
 
-  *name = gnac_profiles_xml_engine_get_text_node(doc, xpath_query_name);
-  *extension = gnac_profiles_xml_engine_get_text_node(doc,
-      xpath_query_extension);
+  *name = gnac_profiles_xml_engine_get_text_node(doc, query_name);
+  *extension = gnac_profiles_xml_engine_get_text_node(doc, query_extension);
   
-  g_free(xpath_query_name);
-  g_free(xpath_query_extension);
+  g_free(query_name);
+  g_free(query_extension);
 }
 
 
@@ -80,6 +79,35 @@ gnac_profiles_utils_init_description(XMLDoc      *doc,
 }
 
 
+static void
+gnac_profiles_utils_add_values_combo(GtkWidget   *combo,
+                                     ComboValues *values)
+{
+  gint index = 0;
+
+  GList *list_names;
+  GList *list_values;
+
+  list_names = values->names;
+  list_values = values->values;
+
+  while (list_names) {
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo),
+        (const gchar*) list_names->data);
+
+    if (gnac_utils_str_equal(values->default_value,
+            (const gchar*) list_values->data))
+    {
+      gtk_combo_box_set_active(GTK_COMBO_BOX(combo), index);
+    }
+
+    list_names = list_names->next;
+    list_values = list_values->next;
+    ++index;
+  }
+}
+
+
 static gint
 gnac_profiles_utils_register_combo(GtkWidget   *widget,
                                    XMLDoc      *doc,
@@ -105,6 +133,17 @@ gnac_profiles_utils_register_combo(GtkWidget   *widget,
 }
 
 
+static void
+gnac_profiles_utils_add_values_slider(GtkWidget    *slider,
+                                      SliderValues *values)
+{
+  gtk_scale_set_digits(GTK_SCALE(slider), 0);
+  gtk_range_set_range(GTK_RANGE(slider), values->min, values->max);
+  gtk_range_set_value(GTK_RANGE(slider), values->default_value);
+  gtk_range_set_increments(GTK_RANGE(slider), values->step, values->step);
+}
+
+
 static gint
 gnac_profiles_utils_register_slider(GtkWidget   *widget,
                                     XMLDoc      *doc,
@@ -248,35 +287,6 @@ gnac_profiles_utils_all_in_one_for_check(BasicFormatInfo *bfi,
 
 
 void
-gnac_profiles_utils_add_values_combo(GtkWidget   *combo,
-                                     ComboValues *values)
-{
-  gint index = 0;
-
-  GList *list_names;
-  GList *list_values;
-
-  list_names = values->names;
-  list_values = values->values;
-
-  while (list_names) {
-    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo),
-        (const gchar*) list_names->data);
-    
-    if (gnac_utils_str_equal(values->default_value,
-            (const gchar*) list_values->data))
-    {
-      gtk_combo_box_set_active(GTK_COMBO_BOX(combo), index);
-    }
-
-    list_names = list_names->next;
-    list_values = list_values->next;
-    ++index;
-  }
-}
-
-
-void
 gnac_profiles_utils_reinit_values_combo(BasicFormatInfo *bfi, ...)
 {
   GtkWidget   *widget;
@@ -392,17 +402,6 @@ gnac_profiles_utils_get_value_combo(GtkWidget *combo)
 
 
 void
-gnac_profiles_utils_add_values_slider(GtkWidget    *slider,
-                                      SliderValues *values)
-{
-  gtk_scale_set_digits(GTK_SCALE(slider), 0);
-  gtk_range_set_range(GTK_RANGE(slider), values->min, values->max);
-  gtk_range_set_value(GTK_RANGE(slider), values->default_value);
-  gtk_range_set_increments(GTK_RANGE(slider), values->step, values->step);
-}
-
-
-void
 gnac_profiles_utils_get_values_combo_and_set(BasicFormatInfo *bfi, ...)
 {
   GtkWidget    *widget;
@@ -744,7 +743,7 @@ gnac_profiles_utils_add_pipes(gchar *pipeline,
 }
 
 
-gchar *
+static gchar *
 gnac_profiles_utils_add_property_combo(gchar     *pipeline,
                                        GtkWidget *combo)
 {
@@ -928,41 +927,7 @@ gnac_profiles_utils_add_properties_checked_slider(gchar           *pipeline,
 }
 
 
-gchar *
-gnac_profiles_utils_add_properties_checked_slider_format(
-    gchar           *pipeline,
-    BasicFormatInfo *bfi,
-    const gchar     *format,
-    ...)
-{
-  GtkWidget   *widget;
-  va_list      ap;
-  const gchar *name;
-  const gchar *checkbox_name;
-
-  va_start(ap, format);
-  name = va_arg(ap, const gchar *);
-
-  while (name) {
-    checkbox_name = va_arg(ap, const gchar *);
-    widget = gnac_profiles_utils_get_widget(bfi, checkbox_name);
-
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
-      widget = gnac_profiles_utils_get_widget(bfi, name);
-      pipeline = gnac_profiles_utils_add_property_slider(pipeline, format, 1,
-          widget);
-    }
-
-    name = va_arg(ap, const gchar *);
-  }
-
-  va_end(ap);
-
-  return pipeline;
-}
-
-
-gchar *
+static gchar *
 gnac_profiles_utils_add_property_check(gchar     *pipeline,
                                        GtkWidget *check)
 {
@@ -1222,15 +1187,6 @@ gnac_profiles_utils_gchararray_to_gdouble(const gchar *value)
 }
 
 
-void
-gnac_profiles_utils_display_error_dialog(GtkWidget *dialog)
-{
-  gtk_dialog_run(GTK_DIALOG(dialog));
-  gtk_widget_hide(dialog);
-  gtk_widget_destroy(dialog);
-}
-
-
 GtkWidget *
 gnac_profiles_utils_get_widget(BasicFormatInfo *bfi,
                                const gchar     *widget_name)
diff --git a/src/profiles/gnac-profiles-utils.h b/src/profiles/gnac-profiles-utils.h
index 484610a..b0a6eab 100755
--- a/src/profiles/gnac-profiles-utils.h
+++ b/src/profiles/gnac-profiles-utils.h
@@ -108,10 +108,6 @@ gnac_profiles_utils_register_advanced_sample_rate(GtkBuilder *builder,
                                                   XMLDoc     *doc);
 
 void
-gnac_profiles_utils_add_values_combo(GtkWidget   *combo,
-                                     ComboValues *values);
-
-void
 gnac_profiles_utils_reinit_values_combo(BasicFormatInfo *bfi, ...);
 
 void
@@ -134,10 +130,6 @@ void
 gnac_profiles_utils_get_values_checked_combo_and_set(BasicFormatInfo *bfi, ...);
 
 void
-gnac_profiles_utils_add_values_slider(GtkWidget    *slider,
-                                      SliderValues *values);
-
-void
 gnac_profiles_utils_reinit_values_slider(BasicFormatInfo *bfi, ...);
 
 void
@@ -182,10 +174,6 @@ gnac_profiles_utils_add_pipes(gchar *pipeline,
                               GList *values);
 
 gchar *
-gnac_profiles_utils_add_property_combo(gchar     *pipeline,
-                                       GtkWidget *combo);
-
-gchar *
 gnac_profiles_utils_add_properties_combo(gchar           *pipeline,
                                          BasicFormatInfo *bfi,
                                          ...);
@@ -218,17 +206,6 @@ gnac_profiles_utils_add_properties_checked_slider(gchar           *pipeline,
                                                   ...);
 
 gchar *
-gnac_profiles_utils_add_properties_checked_slider_format(
-    gchar           *pipeline,
-    BasicFormatInfo *bfi,
-    const gchar     *format,
-    ...);
-
-gchar *
-gnac_profiles_utils_add_property_check(gchar     *pipeline,
-                                       GtkWidget *check);
-
-gchar *
 gnac_profiles_utils_add_properties_check(gchar           *pipeline,
                                          BasicFormatInfo *bfi,
                                          ...);
@@ -278,9 +255,6 @@ gnac_profiles_utils_gdouble_to_gchararray_format(gdouble      value,
 gdouble
 gnac_profiles_utils_gchararray_to_gdouble(const gchar *value);
 
-void
-gnac_profiles_utils_display_error_dialog(GtkWidget *dialog);
-
 GtkWidget *
 gnac_profiles_utils_get_widget(BasicFormatInfo *bfi,
                                const gchar     *widget_name);