[gnac/devel] Code refactoring



commit 245b9b59060cf7d95ca6d9dfd4d5d6899caf8276
Author: BenoÃt Dupasquier <bdupasqu src gnome org>
Date:   Tue Nov 15 15:22:12 2011 +0000

    Code refactoring

 data/profiles/ui/gnac-profiles-speex.xml     |    2 +-
 src/profiles/formats/gnac-profiles-aac.c     |    4 -
 src/profiles/formats/gnac-profiles-flac.c    |    1 -
 src/profiles/formats/gnac-profiles-lame.c    |   10 --
 src/profiles/formats/gnac-profiles-speex.c   |   12 +--
 src/profiles/formats/gnac-profiles-speex.h   |    4 +
 src/profiles/formats/gnac-profiles-vorbis.c  |    5 -
 src/profiles/formats/gnac-profiles-wavpack.c |    7 -
 src/profiles/gnac-profiles-default.c         |    4 +-
 src/profiles/gnac-profiles-utils.c           |  155 ++++++++++++--------------
 src/profiles/gnac-profiles-utils.h           |   32 +-----
 11 files changed, 79 insertions(+), 157 deletions(-)
---
diff --git a/data/profiles/ui/gnac-profiles-speex.xml b/data/profiles/ui/gnac-profiles-speex.xml
index 09da7fd..9f8e46e 100644
--- a/data/profiles/ui/gnac-profiles-speex.xml
+++ b/data/profiles/ui/gnac-profiles-speex.xml
@@ -233,7 +233,7 @@
             <child>
               <object class="GtkComboBoxText" id="combo-bitrate-mode">
                 <property name="visible">True</property>
-                <signal name="changed" handler="gnac_profiles_speex_generate_pipeline"/>
+                <signal name="changed" handler="gnac_profiles_speex_on_bitrate_mode_changed"/>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/src/profiles/formats/gnac-profiles-aac.c b/src/profiles/formats/gnac-profiles-aac.c
index 05c4fb0..1c775aa 100755
--- a/src/profiles/formats/gnac-profiles-aac.c
+++ b/src/profiles/formats/gnac-profiles-aac.c
@@ -127,12 +127,10 @@ gnac_profiles_aac_init(UpdateTextBufferFunc call_back)
 
   // Bitrate
   gnac_profiles_utils_all_in_one_for_combo(&aac_bfi, 
-      G_CALLBACK(gnac_profiles_aac_generate_pipeline),
       "combo-bitrate", "//variable[ id='bitrate']/*");
 
   // Profile
   widget = gnac_profiles_utils_all_in_one_for_combo(&aac_bfi, 
-      G_CALLBACK(gnac_profiles_aac_generate_pipeline),
       "combo-profile", "//variable[ id='profile']/*");
   widget2 = gnac_profiles_utils_get_widget(&aac_bfi, "label-profile"),
   gnac_profiles_utils_add_description_tooltip(&aac_bfi,
@@ -140,14 +138,12 @@ gnac_profiles_aac_init(UpdateTextBufferFunc call_back)
   
   // Tns
   widget = gnac_profiles_utils_all_in_one_for_check(&aac_bfi,
-      G_CALLBACK(gnac_profiles_aac_generate_pipeline),
       "checkbutton-tns", "//variable[ id='tns']/*");
   gnac_profiles_utils_add_description_tooltip(&aac_bfi,
       "//variable[ id='tns']/description", widget, NULL);
   
   // Outputformat
   widget = gnac_profiles_utils_all_in_one_for_combo(&aac_bfi, 
-      G_CALLBACK(gnac_profiles_aac_generate_pipeline),
       "combo-outputformat", "//variable[ id='outputformat']/*");
 
   gnac_profiles_xml_engine_free_doc_xpath(aac_bfi.doc);
diff --git a/src/profiles/formats/gnac-profiles-flac.c b/src/profiles/formats/gnac-profiles-flac.c
index f29e985..6fe43b1 100755
--- a/src/profiles/formats/gnac-profiles-flac.c
+++ b/src/profiles/formats/gnac-profiles-flac.c
@@ -120,7 +120,6 @@ gnac_profiles_flac_init(UpdateTextBufferFunc call_back)
       G_CALLBACK(gnac_profiles_flac_generate_pipeline));
 
   gnac_profiles_utils_all_in_one_for_slider(&flac_bfi, 
-      G_CALLBACK(gnac_profiles_flac_generate_pipeline),
       "slider-compression", "//variable[ id='compression']/*");
   
   gnac_profiles_xml_engine_free_doc_xpath(flac_bfi.doc);
diff --git a/src/profiles/formats/gnac-profiles-lame.c b/src/profiles/formats/gnac-profiles-lame.c
index 4c9ff8f..e3291b3 100755
--- a/src/profiles/formats/gnac-profiles-lame.c
+++ b/src/profiles/formats/gnac-profiles-lame.c
@@ -156,17 +156,14 @@ gnac_profiles_lame_init(UpdateTextBufferFunc call_back)
   
   // Bitrate
   gnac_profiles_utils_all_in_one_for_combo(&lame_bfi, 
-      G_CALLBACK(gnac_profiles_lame_generate_pipeline),
       "combo-bitrate", "//variable[ id='bitrate']/*");
   
   // Quality
   gnac_profiles_utils_all_in_one_for_slider(&lame_bfi,
-      G_CALLBACK(gnac_profiles_lame_generate_pipeline),
       "slider-vbr-quality", "//variable[ id='quality']/*");
 
   // Compression ratio
   widget = gnac_profiles_utils_all_in_one_for_slider(&lame_bfi,
-      G_CALLBACK(gnac_profiles_lame_generate_pipeline),
       "slider-compression-ratio", "//variable[ id='compression-ratio']/*");
   widget2 = gnac_profiles_utils_get_widget(&lame_bfi, "label-compression-ratio"),
   gnac_profiles_utils_add_description_tooltip(&lame_bfi,
@@ -175,37 +172,30 @@ gnac_profiles_lame_init(UpdateTextBufferFunc call_back)
 
   // Preset
   gnac_profiles_utils_all_in_one_for_combo(&lame_bfi,
-      G_CALLBACK(gnac_profiles_lame_generate_pipeline),
       "combo-preset", "//variable[ id='preset']/*");
 
   // Abr bitrate
   widget = gnac_profiles_utils_all_in_one_for_slider(&lame_bfi,
-      G_CALLBACK(gnac_profiles_lame_generate_pipeline),
       "slider-mean-abr", "//variable[ id='mean-bitrate']/*");
   
   // Mode
   gnac_profiles_utils_all_in_one_for_combo(&lame_bfi,
-      G_CALLBACK(gnac_profiles_lame_generate_pipeline),
       "combo-mode", "//variable[ id='mode']/*");
   
   // Mean bitrate
   widget = gnac_profiles_utils_all_in_one_for_slider(&lame_bfi,
-      G_CALLBACK(gnac_profiles_lame_generate_pipeline),
       "slider-mean-vbr", "//variable[ id='mean-bitrate']/*");
   
   // Min bitrate
   widget = gnac_profiles_utils_all_in_one_for_combo(&lame_bfi,
-      G_CALLBACK(gnac_profiles_lame_generate_pipeline),
       "combo-min-vbr", "//variable[ id='min-bitrate']/*");
 
   // Max bitrate
   widget = gnac_profiles_utils_all_in_one_for_combo(&lame_bfi,
-      G_CALLBACK(gnac_profiles_lame_generate_pipeline),
       "combo-max-vbr", "//variable[ id='max-bitrate']/*");
 
   // Encoding mode
   widget = gnac_profiles_utils_all_in_one_for_combo(&lame_bfi,
-      G_CALLBACK(gnac_profiles_lame_on_encoding_mode_changed),
       "combo-encoding-mode", "//variable[ id='encoding-mode']/*");
  
   gnac_profiles_lame_vbr_on_changed(GTK_COMBO_BOX(widget));
diff --git a/src/profiles/formats/gnac-profiles-speex.c b/src/profiles/formats/gnac-profiles-speex.c
index 056f02d..ee0b01f 100644
--- a/src/profiles/formats/gnac-profiles-speex.c
+++ b/src/profiles/formats/gnac-profiles-speex.c
@@ -134,7 +134,7 @@ gnac_profiles_speex_get_funcs(void)
 }
 
 
-static void
+void
 gnac_profiles_speex_on_bitrate_mode_changed(GtkComboBox *widget,
                                             gpointer     user_data)
 {
@@ -156,33 +156,27 @@ gnac_profiles_speex_init(UpdateTextBufferFunc call_back)
 
   // Bitrate
   widget = gnac_profiles_utils_all_in_one_for_slider(&speex_bfi, 
-      G_CALLBACK(gnac_profiles_speex_generate_pipeline),
       "slider-bitrate-cbr", "//variable[ id='bitrate']/*");
 
   // Bitrate-abr
   gnac_profiles_utils_all_in_one_for_slider(&speex_bfi, 
-      G_CALLBACK(gnac_profiles_speex_generate_pipeline),
       "slider-bitrate-abr", "//variable[ id='abr']/*");
   
   // Quality-cbr
   widget = gnac_profiles_utils_all_in_one_for_slider(&speex_bfi, 
-      G_CALLBACK(gnac_profiles_speex_generate_pipeline),
       "slider-quality-cbr", "//variable[ id='quality-cbr']/*");
 
   // Quality-vbr
   widget = gnac_profiles_utils_all_in_one_for_slider(&speex_bfi, 
-      G_CALLBACK(gnac_profiles_speex_generate_pipeline),
       "slider-quality-vbr", "//variable[ id='quality-vbr']/*");
   gtk_scale_set_digits(GTK_SCALE(widget), 2);
 
   // vbr
   widget = gnac_profiles_utils_all_in_one_for_check(&speex_bfi,
-      G_CALLBACK(gnac_profiles_speex_generate_pipeline),
       "checkbutton-vbr", "//variable[ id='vbr']/*");
  
   // Complexity
   widget2 = gnac_profiles_utils_all_in_one_for_slider(&speex_bfi, 
-      G_CALLBACK(gnac_profiles_speex_generate_pipeline),
       "slider-complexity", "//variable[ id='complexity']/*");
   widget = gnac_profiles_utils_get_widget(&speex_bfi, "hbox-complexity");
   widget = gnac_profiles_utils_get_widget(&speex_bfi, "checkbutton-complexity");
@@ -192,21 +186,18 @@ gnac_profiles_speex_init(UpdateTextBufferFunc call_back)
 
   // vad
   widget = gnac_profiles_utils_all_in_one_for_check(&speex_bfi,
-      G_CALLBACK(gnac_profiles_speex_generate_pipeline),
       "checkbutton-vad", "//variable[ id='vad']/*");
   gnac_profiles_utils_add_description_tooltip(&speex_bfi,
       "//variable[ id='vad']/description", widget, NULL);
 
   // dtx
   widget = gnac_profiles_utils_all_in_one_for_check(&speex_bfi,
-      G_CALLBACK(gnac_profiles_speex_generate_pipeline),
       "checkbutton-dtx", "//variable[ id='dtx']/*");
   gnac_profiles_utils_add_description_tooltip(&speex_bfi,
       "//variable[ id='dtx']/description", widget, NULL);
 
   // mode
   widget = gnac_profiles_utils_all_in_one_for_combo(&speex_bfi, 
-      G_CALLBACK(gnac_profiles_speex_generate_pipeline),
       "combo-mode", "//variable[ id='mode']/*");
   widget2 = gnac_profiles_utils_get_widget(&speex_bfi, "hbox-mode");
   gnac_profiles_utils_add_description_tooltip(&speex_bfi,
@@ -215,7 +206,6 @@ gnac_profiles_speex_init(UpdateTextBufferFunc call_back)
  
   // Bitrate mode
   widget = gnac_profiles_utils_all_in_one_for_combo(&speex_bfi, 
-      G_CALLBACK(gnac_profiles_speex_on_bitrate_mode_changed),
       "combo-bitrate-mode", "//variable[ id='bitrate-mode']/*");
   
   gnac_profiles_speex_bitrate_on_changed(GTK_COMBO_BOX(widget));
diff --git a/src/profiles/formats/gnac-profiles-speex.h b/src/profiles/formats/gnac-profiles-speex.h
index 62f0fba..e6a88d3 100644
--- a/src/profiles/formats/gnac-profiles-speex.h
+++ b/src/profiles/formats/gnac-profiles-speex.h
@@ -37,6 +37,10 @@ void
 gnac_profiles_speex_generate_pipeline(void);
 
 void
+gnac_profiles_speex_on_bitrate_mode_changed(GtkComboBox *widget,
+                                            gpointer     user_data);
+
+void
 gnac_profiles_speex_advanced_on_toggle(GtkWidget       *widget,
                                        GtkToggleButton *togglebutton);
 
diff --git a/src/profiles/formats/gnac-profiles-vorbis.c b/src/profiles/formats/gnac-profiles-vorbis.c
index 2b968ee..ef472c3 100755
--- a/src/profiles/formats/gnac-profiles-vorbis.c
+++ b/src/profiles/formats/gnac-profiles-vorbis.c
@@ -182,28 +182,23 @@ gnac_profiles_vorbis_init(UpdateTextBufferFunc call_back)
 
   // Bitrate
   gnac_profiles_utils_all_in_one_for_combo(&vorbis_bfi, 
-      G_CALLBACK(gnac_profiles_vorbis_generate_pipeline),
       "combo-bitrate", "//variable[ id='bitrate']/*");
   
   // Quality
   widget = gnac_profiles_utils_all_in_one_for_slider(&vorbis_bfi, 
-      G_CALLBACK(gnac_profiles_vorbis_generate_pipeline),
       "slider-quality", "//variable[ id='quality']/*");
   gtk_scale_set_digits(GTK_SCALE(widget), 1);
  
   // Min bitrate
   widget = gnac_profiles_utils_all_in_one_for_combo(&vorbis_bfi, 
-      G_CALLBACK(gnac_profiles_vorbis_generate_pipeline),
       "combo-min-vbr", "//variable[ id='vbr-min-bitrate']/*");
   
   // Max bitrate
   widget = gnac_profiles_utils_all_in_one_for_combo(&vorbis_bfi, 
-      G_CALLBACK(gnac_profiles_vorbis_generate_pipeline),
       "combo-max-vbr", "//variable[ id='vbr-max-bitrate']/*");
 
   // Encoding mode
   widget = gnac_profiles_utils_all_in_one_for_combo(&vorbis_bfi, 
-      G_CALLBACK(gnac_profiles_vorbis_on_encoding_mode_changed),
       "combo-encoding-mode", "//variable[ id='vbr']/*");
   
   gnac_profiles_vorbis_vbr_on_changed(GTK_COMBO_BOX(widget));
diff --git a/src/profiles/formats/gnac-profiles-wavpack.c b/src/profiles/formats/gnac-profiles-wavpack.c
index 7e1b6a1..ac14037 100644
--- a/src/profiles/formats/gnac-profiles-wavpack.c
+++ b/src/profiles/formats/gnac-profiles-wavpack.c
@@ -149,22 +149,18 @@ gnac_profiles_wavpack_init(UpdateTextBufferFunc call_back)
 
   // Encoding mode
   gnac_profiles_utils_all_in_one_for_combo(&wavpack_bfi, 
-      G_CALLBACK(gnac_profiles_wavpack_generate_pipeline),
       "combo-mode", "//variable[ id='mode']/*");
 
   // Bitrate
   gnac_profiles_utils_all_in_one_for_slider(&wavpack_bfi, 
-      G_CALLBACK(gnac_profiles_wavpack_generate_pipeline),
       "slider-bitrate", "//variable[ id='bitrate']/*");
 
   // Bits per sample
   gnac_profiles_utils_all_in_one_for_slider(&wavpack_bfi, 
-      G_CALLBACK(gnac_profiles_wavpack_generate_pipeline),
       "slider-bits-per-sample", "//variable[ id='bits-per-sample']/*");
  
   // Extra processing
   widget = gnac_profiles_utils_all_in_one_for_slider(&wavpack_bfi, 
-      G_CALLBACK(gnac_profiles_wavpack_generate_pipeline),
       "slider-extra-processing", "//variable[ id='extra-processing']/*");
   widget2 = gnac_profiles_utils_get_widget(&wavpack_bfi, "label-extra-processing"),
   gnac_profiles_utils_add_description_tooltip(&wavpack_bfi,
@@ -173,19 +169,16 @@ gnac_profiles_wavpack_init(UpdateTextBufferFunc call_back)
 
   // Joint stereo mode
   widget = gnac_profiles_utils_all_in_one_for_combo(&wavpack_bfi, 
-      G_CALLBACK(gnac_profiles_wavpack_generate_pipeline),
       "combo-joint-stereo-mode", "//variable[ id='joint-stereo-mode']/*");
 
   // MD5
   widget = gnac_profiles_utils_all_in_one_for_check(&wavpack_bfi,
-      G_CALLBACK(gnac_profiles_wavpack_generate_pipeline),
       "checkbutton-md5", "//variable[ id='md5']/*");
   gnac_profiles_utils_add_description_tooltip(&wavpack_bfi,
       "//variable[ id='md5']/description", widget, NULL);
 
  // Bitrate control
   widget = gnac_profiles_utils_all_in_one_for_combo(&wavpack_bfi, 
-      G_CALLBACK(gnac_profiles_wavpack_on_bitrate_control_changed),
       "combo-bitrate-control", "//variable[ id='bitrate-control']/*");
   widget2 = gnac_profiles_utils_get_widget(&wavpack_bfi,
       "checkbutton-bitrate-control");
diff --git a/src/profiles/gnac-profiles-default.c b/src/profiles/gnac-profiles-default.c
index 48b191f..a29fd62 100755
--- a/src/profiles/gnac-profiles-default.c
+++ b/src/profiles/gnac-profiles-default.c
@@ -83,11 +83,11 @@ gnac_profiles_default_init(BasicFormatInfo *bfi,
 
   // channels
   widget = gnac_profiles_utils_register_advanced_channels(bfi->builder,
-      base_values_doc, pipeline_callback, bfi);
+      base_values_doc);
   
   // sample rate
   widget = gnac_profiles_utils_register_advanced_sample_rate(bfi->builder,
-      base_values_doc, pipeline_callback, bfi);
+      base_values_doc);
 
   gnac_profiles_utils_init_raw_audioconvert(base_values_doc);
   
diff --git a/src/profiles/gnac-profiles-utils.c b/src/profiles/gnac-profiles-utils.c
index a5daa69..34858f8 100755
--- a/src/profiles/gnac-profiles-utils.c
+++ b/src/profiles/gnac-profiles-utils.c
@@ -80,75 +80,10 @@ gnac_profiles_utils_init_description(XMLDoc      *doc,
 }
 
 
-GtkWidget *
-gnac_profiles_utils_all_in_one_for_combo(BasicFormatInfo *bfi,
-                                         GCallback        call_back,
-                                         const gchar     *combo_name,
-                                         const gchar     *xpath_query)
-{
-  GtkWidget *widget;
-  
-  widget = gnac_profiles_utils_get_widget(bfi, combo_name);
-  if (!widget) {
-    libgnac_warning("Combo %s not found", combo_name);
-    return NULL;
-  }
-
-  gnac_profiles_utils_register_combo(widget, bfi->doc, xpath_query,
-      call_back, NULL);
-
-  return widget;
-}
-
-
-GtkWidget *
-gnac_profiles_utils_all_in_one_for_slider(BasicFormatInfo *bfi,
-                                          GCallback        call_back,
-                                          const gchar     *slider_name,
-                                          const gchar     *xpath_query)
-{
-  GtkWidget *widget;
-  
-  widget = gnac_profiles_utils_get_widget(bfi, slider_name);
-  if (!widget) {
-    libgnac_warning("Slider %s not found", slider_name);
-    return NULL;
-  }
-
-  gnac_profiles_utils_register_slider(widget, bfi->doc, xpath_query,
-      call_back, NULL);
-
-  return widget;
-}
-
-
-GtkWidget *
-gnac_profiles_utils_all_in_one_for_check(BasicFormatInfo *bfi,
-                                         GCallback        call_back,
-                                         const gchar     *check_name,
-                                         const gchar     *xpath_query)
-{
-  GtkWidget *widget;
-  
-  widget = gnac_profiles_utils_get_widget(bfi, check_name);
-  if (!widget) {
-    libgnac_warning("Check %s not found", check_name);
-    return NULL;
-  }
-
-  gnac_profiles_utils_register_check(widget, bfi->doc, xpath_query,
-      call_back, NULL);
-
-  return widget;
-}
-
-
-gint
+static gint
 gnac_profiles_utils_register_combo(GtkWidget   *widget,
                                    XMLDoc      *doc,
-                                   const gchar *xpath_query,
-                                   GCallback    call_back,
-                                   gpointer     user_data)
+                                   const gchar *xpath_query)
 {
   ComboValues *combo;
   gint result;
@@ -170,12 +105,10 @@ gnac_profiles_utils_register_combo(GtkWidget   *widget,
 }
 
 
-gint
+static gint
 gnac_profiles_utils_register_slider(GtkWidget   *widget,
                                     XMLDoc      *doc,
-                                    const gchar *xpath_query,
-                                    GCallback    call_back,
-                                    gpointer     user_data)
+                                    const gchar *xpath_query)
 {
   SliderValues *slider;
   gint result;
@@ -197,12 +130,10 @@ gnac_profiles_utils_register_slider(GtkWidget   *widget,
 }
 
 
-gint
+static gint
 gnac_profiles_utils_register_check(GtkWidget   *widget,
                                    XMLDoc      *doc,
-                                   const gchar *xpath_query,
-                                   GCallback    call_back,
-                                   gpointer     user_data)
+                                   const gchar *xpath_query)
 {
   CheckValues *check;
   gint result;
@@ -224,11 +155,9 @@ gnac_profiles_utils_register_check(GtkWidget   *widget,
 
 GtkWidget *
 gnac_profiles_utils_register_advanced_channels(GtkBuilder *builder, 
-                                               XMLDoc     *doc,
-                                               GCallback   call_back,
-                                               gpointer    user_data)
+                                               XMLDoc     *doc)
 {
-  GtkWidget *widget = NULL;
+  GtkWidget *widget;
 
   widget = gnac_utils_get_widget(builder, "combo-channels");
   if (!widget) {
@@ -236,8 +165,7 @@ gnac_profiles_utils_register_advanced_channels(GtkBuilder *builder,
     return NULL;
   }
 
-  gnac_profiles_utils_register_combo(widget, doc,
-      "//variable[ id='channels']/*", call_back, user_data);
+  gnac_profiles_utils_register_combo(widget, doc, "//variable[ id='channels']/*");
 
   return widget;
 }
@@ -245,11 +173,9 @@ gnac_profiles_utils_register_advanced_channels(GtkBuilder *builder,
 
 GtkWidget *
 gnac_profiles_utils_register_advanced_sample_rate(GtkBuilder *builder, 
-                                                  XMLDoc     *doc,
-                                                  GCallback   call_back,
-                                                  gpointer    user_data)
+                                                  XMLDoc     *doc)
 {
-  GtkWidget *widget = NULL;
+  GtkWidget *widget;
 
   widget = gnac_utils_get_widget(builder, "combo-sample-rate");
   if (!widget) {
@@ -258,7 +184,64 @@ gnac_profiles_utils_register_advanced_sample_rate(GtkBuilder *builder,
   }
 
   gnac_profiles_utils_register_combo(widget, doc,
-      "//variable[ id='sample-rate']/*", call_back, user_data);
+      "//variable[ id='sample-rate']/*");
+
+  return widget;
+}
+
+
+GtkWidget *
+gnac_profiles_utils_all_in_one_for_combo(BasicFormatInfo *bfi,
+                                         const gchar     *combo_name,
+                                         const gchar     *xpath_query)
+{
+  GtkWidget *widget;
+
+  widget = gnac_profiles_utils_get_widget(bfi, combo_name);
+  if (!widget) {
+    libgnac_warning("Combo %s not found", combo_name);
+    return NULL;
+  }
+
+  gnac_profiles_utils_register_combo(widget, bfi->doc, xpath_query);
+
+  return widget;
+}
+
+
+GtkWidget *
+gnac_profiles_utils_all_in_one_for_slider(BasicFormatInfo *bfi,
+                                          const gchar     *slider_name,
+                                          const gchar     *xpath_query)
+{
+  GtkWidget *widget;
+
+  widget = gnac_profiles_utils_get_widget(bfi, slider_name);
+  if (!widget) {
+    libgnac_warning("Slider %s not found", slider_name);
+    return NULL;
+  }
+
+  gnac_profiles_utils_register_slider(widget, bfi->doc, xpath_query);
+
+  return widget;
+}
+
+
+GtkWidget *
+gnac_profiles_utils_all_in_one_for_check(BasicFormatInfo *bfi,
+                                         const gchar     *check_name,
+                                         const gchar     *xpath_query)
+{
+  GtkWidget *widget;
+
+  widget = gnac_profiles_utils_get_widget(bfi, check_name);
+  if (!widget) {
+    libgnac_warning("Check %s not found", check_name);
+    return NULL;
+  }
+
+  gnac_profiles_utils_register_check(widget, bfi->doc, xpath_query);
 
   return widget;
 }
diff --git a/src/profiles/gnac-profiles-utils.h b/src/profiles/gnac-profiles-utils.h
index a54ee1d..484610a 100755
--- a/src/profiles/gnac-profiles-utils.h
+++ b/src/profiles/gnac-profiles-utils.h
@@ -86,54 +86,26 @@ gnac_profiles_utils_init_description(XMLDoc      *doc,
 
 GtkWidget *
 gnac_profiles_utils_all_in_one_for_combo(BasicFormatInfo *bfi,
-                                         GCallback        call_back,
                                          const gchar     *combo_name,
                                          const gchar     *xpath_query);
 
 GtkWidget *
 gnac_profiles_utils_all_in_one_for_slider(BasicFormatInfo *bfi,
-                                          GCallback        call_back,
                                           const gchar     *slider_name,
                                           const gchar     *xpath_query);
 
 GtkWidget *
 gnac_profiles_utils_all_in_one_for_check(BasicFormatInfo *bfi,
-                                         GCallback        call_back,
                                          const gchar     *check_name,
                                          const gchar     *xpath_query);
 
-gint
-gnac_profiles_utils_register_combo(GtkWidget   *widget,
-                                   XMLDoc      *doc,
-                                   const gchar *xpath_query,
-                                   GCallback    call_back,
-                                   gpointer     user_data);
-
-gint
-gnac_profiles_utils_register_slider(GtkWidget   *widget,
-                                    XMLDoc      *doc,
-                                    const gchar *xpath_query,
-                                    GCallback    call_back,
-                                    gpointer     user_data);
-
-gint
-gnac_profiles_utils_register_check(GtkWidget   *widget,
-                                   XMLDoc      *doc,
-                                   const gchar *xpath_query,
-                                   GCallback    call_back,
-                                   gpointer     user_data);
-
 GtkWidget *
 gnac_profiles_utils_register_advanced_channels(GtkBuilder *builder, 
-                                               XMLDoc     *doc,
-                                               GCallback   call_back,
-                                               gpointer    user_data);
+                                               XMLDoc     *doc);
 
 GtkWidget *
 gnac_profiles_utils_register_advanced_sample_rate(GtkBuilder *builder, 
-                                                  XMLDoc     *doc,
-                                                  GCallback   call_back,
-                                                  gpointer    user_data);
+                                                  XMLDoc     *doc);
 
 void
 gnac_profiles_utils_add_values_combo(GtkWidget   *combo,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]