[xine-cvs] CVS: xine-lib/src/input input_dvd.c,1.202,1.203 input_cdda.c,1.75,1.76 input_file.c,1.103,1.104 input_vcd.c,1.79,1.80

[Thibaut M. <tma...@us...>]

Update of /cvsroot/xine/xine-lib/src/input
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12966

Modified Files:
	input_dvd.c input_cdda.c input_file.c input_vcd.c 
Log Message:
Unregister config callbacks.



Index: input_dvd.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_dvd.c,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- input_dvd.c	25 Aug 2005 15:36:29 -0000	1.202
+++ input_dvd.c	2 Sep 2005 22:39:42 -0000	1.203
@@ -1708,7 +1708,14 @@
 
 static void dvd_class_dispose(input_class_t *this_gen) {
   dvd_input_class_t *this = (dvd_input_class_t*)this_gen;
-  
+  config_values_t *config = this->xine->config;
+
+  config->unregister_callback(config, "media.dvd.region");
+  config->unregister_callback(config, "media.dvd.language");
+  config->unregister_callback(config, "media.dvd.readahead");
+  config->unregister_callback(config, "media.dvd.seek_behaviour");
+  config->unregister_callback(config, "media.dvd.play_single_chapter");
+
   free(this->eject_device);
   free(this);
 }

Index: input_cdda.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_cdda.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- input_cdda.c	29 Aug 2005 15:28:16 -0000	1.75
+++ input_cdda.c	2 Sep 2005 22:39:43 -0000	1.76
@@ -2561,6 +2561,16 @@
 
 static void cdda_class_dispose (input_class_t *this_gen) {
   cdda_input_class_t  *this = (cdda_input_class_t *) this_gen;
+  config_values_t     *config = this->xine->config;
+
+  config->unregister_callback(config, "media.audio_cd.device");
+  config->unregister_callback(config, "media.audio_cd.use_cddb");
+  config->unregister_callback(config, "media.audio_cd.cddb_server");
+  config->unregister_callback(config, "media.audio_cd.cddb_port");
+  config->unregister_callback(config, "media.audio_cd.cddb_cachedir");
+#ifdef CDROM_SELECT_SPEED
+  config->unregister_callback(config, "media.audio_cd.drive_slowdown");
+#endif
 
   free (this->mrls);
   free (this);

Index: input_file.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_file.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- input_file.c	25 Aug 2005 15:36:29 -0000	1.103
+++ input_file.c	2 Sep 2005 22:39:43 -0000	1.104
@@ -851,6 +851,9 @@
 
 static void file_class_dispose (input_class_t *this_gen) {
   file_input_class_t  *this = (file_input_class_t *) this_gen;
+  config_values_t     *config = this->xine->config;
+
+  config->unregister_callback(config, "media.files.origin_path");
 
   free (this->mrls);
   free (this);

Index: input_vcd.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_vcd.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- input_vcd.c	7 Feb 2005 23:58:58 -0000	1.79
+++ input_vcd.c	2 Sep 2005 22:39:43 -0000	1.80
@@ -930,6 +930,9 @@
 
   vcd_input_class_t  *this = (vcd_input_class_t *) this_gen;
   int                 i;
+  config_values_t *config = this->xine->config;
+
+  config->unregister_callback(config, "media.vcd.device");
 
   for (i = 0; i < 100; i++)
     free (this->filelist[i]);