From b69a5d17e266401901adf5e62ca7d4f4e94d82e0 Mon Sep 17 00:00:00 2001
From: Thibaut Mattern <thibaut.mattern@gmail.com>
Date: Thu, 5 Apr 2007 18:23:21 +0200
Subject: Added a new callback. This callback is called when a new entry is
 registered.

The plan is register and call back a plugin loader function.
---
 src/xine-engine/configfile.c | 49 +++++++++++++++++++++++++++++++++-----------
 src/xine-engine/configfile.h | 19 ++++++++++++++++-
 2 files changed, 55 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index 28b44fd51..c7cf30968 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.c
@@ -455,6 +455,8 @@ static void config_reset_value(cfg_entry_t *entry) {
   entry->num_value = 0;
 }
 
+static void config_shallow_copy(xine_cfg_entry_t *dest, cfg_entry_t *src);
+
 static cfg_entry_t *config_register_key (config_values_t *this,
 					 const char *key,
 					 int exp_level,
@@ -488,6 +490,14 @@ static cfg_entry_t *config_register_key (config_values_t *this,
     entry->callback_data = cb_data;
   }
 
+  /* we created a new entry, call the callback */
+  if (this->new_entry_cb) {
+    xine_cfg_entry_t cb_entry;
+
+    config_shallow_copy(&cb_entry, entry);
+    this->new_entry_cb(this->new_entry_cbdata, &cb_entry);
+  }
+
   return entry;
 }
 
@@ -1186,6 +1196,19 @@ static void config_unregister_cb (config_values_t *this, const char *key) {
   }
 }
 
+static void config_set_new_entry_callback (config_values_t *this, xine_config_cb_t new_entry_cb, void* cbdata) {
+  pthread_mutex_lock(&this->config_lock);
+  this->new_entry_cb = new_entry_cb;
+  this->new_entry_cbdata = cbdata;
+  pthread_mutex_unlock(&this->config_lock);
+}
+
+static void config_unset_new_entry_callback (config_values_t *this) {
+  pthread_mutex_lock(&this->config_lock);
+  this->new_entry_cb = NULL;
+  this->new_entry_cbdata = NULL;
+  pthread_mutex_unlock(&this->config_lock);
+}
 
 config_values_t *_x_config_init (void) {
 
@@ -1212,18 +1235,20 @@ config_values_t *_x_config_init (void) {
   pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
   pthread_mutex_init(&this->config_lock, &attr);
 
-  this->register_string     = config_register_string;
-  this->register_filename   = config_register_filename;
-  this->register_range      = config_register_range;
-  this->register_enum       = config_register_enum;
-  this->register_num        = config_register_num;
-  this->register_bool       = config_register_bool;
-  this->update_num          = config_update_num;
-  this->update_string       = config_update_string;
-  this->parse_enum          = config_parse_enum;
-  this->lookup_entry        = config_lookup_entry;
-  this->unregister_callback = config_unregister_cb;
-  this->dispose             = config_dispose;
+  this->register_string          = config_register_string;
+  this->register_filename        = config_register_filename;
+  this->register_range           = config_register_range;
+  this->register_enum            = config_register_enum;
+  this->register_num             = config_register_num;
+  this->register_bool            = config_register_bool;
+  this->update_num               = config_update_num;
+  this->update_string            = config_update_string;
+  this->parse_enum               = config_parse_enum;
+  this->lookup_entry             = config_lookup_entry;
+  this->unregister_callback      = config_unregister_cb;
+  this->dispose                  = config_dispose;
+  this->set_new_entry_callback   = config_set_new_entry_callback;
+  this->unset_new_entry_callback = config_unset_new_entry_callback;
 
   return this;
 }
diff --git a/src/xine-engine/configfile.h b/src/xine-engine/configfile.h
index 859214d1c..e98138fa3 100644
--- a/src/xine-engine/configfile.h
+++ b/src/xine-engine/configfile.h
@@ -50,6 +50,7 @@ extern "C" {
 typedef struct cfg_entry_s cfg_entry_t;
 typedef struct config_values_s config_values_t;
 
+
 struct cfg_entry_s {
   cfg_entry_t     *next;
   config_values_t *config;
@@ -175,7 +176,7 @@ struct config_values_s {
   cfg_entry_t* (*lookup_entry) (config_values_t *self, const char *key);
 
   /*
-   * unregister callback function
+   * unregister entry callback function
    */
   void (*unregister_callback) (config_values_t *self, const char *key);
 
@@ -184,11 +185,27 @@ struct config_values_s {
    */
   void (*dispose) (config_values_t *self);
 
+  /*
+   * callback called when a new config entry is registered 
+   */
+  void (*set_new_entry_callback) (config_values_t *self, xine_config_cb_t new_entry_cb, void *cb_data);
+
+  /*
+   * unregister the callback
+   */
+  void (*unset_new_entry_callback) (config_values_t *self);
+
   /*
    * config values are stored here:
    */
   cfg_entry_t         *first, *last, *cur;
 
+  /*
+   * new entry callback
+   */
+  xine_config_cb_t    new_entry_cb;
+  void                *new_entry_cbdata;
+
   /*
    * mutex for modification to the config
    */
-- 
cgit v1.2.3