testing some configfile stuff...

CVS patchset: 1090
CVS date: 2001/11/20 17:22:13

5 files changed, 27 insertions, 10 deletions

diff --git a/include/xine.h.tmpl.in b/include/xine.h.tmpl.in
index 0e271a5fd..cce3d680d 100644
--- a/include/xine.h.tmpl.in
+++ b/include/xine.h.tmpl.in
@@ -28,7 +28,7 @@
  \endverbatim
  */
 /*
- * $Id: xine.h.tmpl.in,v 1.55 2001/11/18 03:53:23 guenter Exp $
+ * $Id: xine.h.tmpl.in,v 1.56 2001/11/20 17:22:13 miguelfreitas Exp $
  *
  */
 
@@ -485,11 +485,13 @@ typedef void xine_t;
 typedef void ao_driver_t;
 
 typedef struct cfg_entry_s cfg_entry_t;
+typedef struct config_values_s config_values_t;
 typedef void (*config_cb_t) (void *, cfg_entry_t *);
 
 struct cfg_entry_s {
   cfg_entry_t     *next;
-
+  config_values_t *config;
+  
   char            *key;
   int              type;
 
@@ -532,7 +534,6 @@ struct cfg_entry_s {
 #define CONFIG_TYPE_NUM     4
 #define CONFIG_TYPE_BOOL    5
 
-typedef struct config_values_s config_values_t;
 struct config_values_s {
 
   /*
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index 1e4595dce..08bd94318 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_xv.c,v 1.77 2001/11/20 01:43:54 guenter Exp $
+ * $Id: video_out_xv.c,v 1.78 2001/11/20 17:22:14 miguelfreitas Exp $
  * 
  * video_out_xv.c, X11 video extension interface for xine
  *
@@ -1161,6 +1161,13 @@ static void xv_check_capability (xv_driver_t *this,
   xv_set_property (&this->vo_driver, property, entry->num_value);
 }
 
+static void xv_update_deinterlace(void *this_gen, cfg_entry_t *entry)
+{
+  xv_driver_t *this = (xv_driver_t *) this_gen;
+  
+  this->deinterlace_method = entry->num_value;
+}
+
 vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 
   xv_driver_t          *this;
@@ -1177,7 +1184,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
   XvImage              *myimage;
   XShmSegmentInfo       myshminfo;
   static char          *deinterlace_methods[] = {"none", "bob", "weave", "greedy", "onefield",
-						 "onefieldxy", NULL};
+						 "onefield_xv", NULL};
 
   display = visual->display;
 
@@ -1402,7 +1409,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
   this->deinterlace_method = config->register_enum (config, "video.deinterlace_method", 4,
 						    deinterlace_methods, 
 						    "Software deinterlace method (Key I toggles deinterlacer on/off)",
-						    NULL, NULL, NULL);
+						    NULL, xv_update_deinterlace, this);
   this->deinterlace_enabled = 0;
 
   return &this->vo_driver;
diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index 4fa914db3..696a8c226 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: configfile.c,v 1.9 2001/11/19 02:57:10 guenter Exp $
+ * $Id: configfile.c,v 1.10 2001/11/20 17:22:14 miguelfreitas Exp $
  *
  * config file management - implementation
  *
@@ -64,6 +64,7 @@ static cfg_entry_t *config_file_add (config_values_t *this, char *key) {
   cfg_entry_t *entry;
 
   entry = (cfg_entry_t *) xine_xmalloc (sizeof (cfg_entry_t));
+  entry->config        = this;
   entry->key           = copy_string (key);
   entry->type          = CONFIG_TYPE_UNKNOWN;
 
@@ -560,6 +561,9 @@ config_values_t *config_file_init (char *filename) {
 
 /*
  * $Log: configfile.c,v $
+ * Revision 1.10  2001/11/20 17:22:14  miguelfreitas
+ * testing some configfile stuff...
+ *
  * Revision 1.9  2001/11/19 02:57:10  guenter
  * make description strings optional - config options without description string will not appear in setup dialog
  *
diff --git a/src/xine-engine/configfile.h b/src/xine-engine/configfile.h
index a5c195f1b..60ac2a4f5 100644
--- a/src/xine-engine/configfile.h
+++ b/src/xine-engine/configfile.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: configfile.h,v 1.4 2001/11/18 03:53:25 guenter Exp $
+ * $Id: configfile.h,v 1.5 2001/11/20 17:22:14 miguelfreitas Exp $
  *
  * config file management
  *
@@ -33,10 +33,13 @@ extern "C" {
 #include <inttypes.h>
 
 typedef struct cfg_entry_s cfg_entry_t;
+typedef struct config_values_s config_values_t;
+
 typedef void (*config_cb_t) (void *, cfg_entry_t *);
 
 struct cfg_entry_s {
   cfg_entry_t     *next;
+  config_values_t *config;
 
   char            *key;
   int              type;
@@ -80,7 +83,6 @@ struct cfg_entry_s {
 #define CONFIG_TYPE_NUM     4
 #define CONFIG_TYPE_BOOL    5
 
-typedef struct config_values_s config_values_t;
 struct config_values_s {
 
   /*
@@ -185,6 +187,9 @@ config_values_t *config_file_init (char *filename);
 
 /*
  * $Log: configfile.h,v $
+ * Revision 1.5  2001/11/20 17:22:14  miguelfreitas
+ * testing some configfile stuff...
+ *
  * Revision 1.4  2001/11/18 03:53:25  guenter
  * new configfile interface, code cleanup, xprintf is gone
  *
diff --git a/src/xine-utils/memcpy.c b/src/xine-utils/memcpy.c
index b3cf0e32c..564a61cdd 100644
--- a/src/xine-utils/memcpy.c
+++ b/src/xine-utils/memcpy.c
@@ -392,7 +392,7 @@ static void update_fast_memcpy(void *this_gen, cfg_entry_t *entry)
   static int config_flags = -1;
     
   config_flags = xine_mm_accel();
-  
+
   if( entry->num_value != 0 && 
      (config_flags & memcpy_method[entry->num_value].cpu_require) == 
       memcpy_method[entry->num_value].cpu_require ) {