unify standard dxr3 config options under one banner (dxr3). The dxr3 encoder

is now under its own banner (dxr3enc).

CVS patchset: 1078
CVS date: 2001/11/19 17:07:15

1 files changed, 11 insertions, 11 deletions

diff --git a/src/dxr3/dxr3_vo_core.c b/src/dxr3/dxr3_vo_core.c
index 1cbd201d5..c7593307e 100644
--- a/src/dxr3/dxr3_vo_core.c
+++ b/src/dxr3/dxr3_vo_core.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: dxr3_vo_core.c,v 1.9 2001/11/19 15:06:12 mlampard Exp $
+ * $Id: dxr3_vo_core.c,v 1.10 2001/11/19 17:07:15 mlampard Exp $
  *
  *************************************************************************
  * core functions common to both Standard and RT-Encoding vo plugins     *
@@ -103,14 +103,14 @@ void dxr3_read_config(dxr3_driver_t *this)
 		fprintf(stderr, "dxr3_vo: cannot read bcs values (%s)\n",
 		 strerror(errno));
 
-	this->bcs.contrast = config->register_range(config, "video.dxr3_contrast", this->bcs.contrast,100,900,"Dxr3: contrast control",NULL,NULL,NULL);
-	this->bcs.saturation = config->register_range(config, "video.dxr3_saturation", this->bcs.saturation,100,900,"Dxr3: saturation control",NULL,NULL,NULL);
-	this->bcs.brightness = config->register_range(config, "video.dxr3_brightness", this->bcs.brightness,100,900,"Dxr3: brightness control",NULL,NULL,NULL);
+	this->bcs.contrast = config->register_range(config, "dxr3.contrast", this->bcs.contrast,100,900,"Dxr3: contrast control",NULL,NULL,NULL);
+	this->bcs.saturation = config->register_range(config, "dxr3.saturation", this->bcs.saturation,100,900,"Dxr3: saturation control",NULL,NULL,NULL);
+	this->bcs.brightness = config->register_range(config, "dxr3.brightness", this->bcs.brightness,100,900,"Dxr3: brightness control",NULL,NULL,NULL);
 
 	this->vo_driver.set_property(&this->vo_driver,
 	 VO_PROP_ASPECT_RATIO, ASPECT_FULL);
 
-	str = config->register_string(config, "video.dxr3_vomode", "tv", "Dxr3: videoout mode (tv or overlay)", NULL,NULL,NULL);
+	str = config->register_string(config, "dxr3.videoout_mode", "tv", "Dxr3: videoout mode (tv or overlay)", NULL,NULL,NULL);
 
 	if (!strcasecmp(str, "tv")) {
 		this->overlay_enabled=0;
@@ -121,11 +121,11 @@ void dxr3_read_config(dxr3_driver_t *this)
 		if (dxr3_overlay_read_state(&this->overlay) == 0) {
 			this->overlay_enabled = 1;
 			this->tv_switchable=1;	
-			str = config->register_string(config, "video.dxr3_keycolor", "0x80a040", "Dxr3: overlay colourkey value",NULL,NULL,NULL);
+			str = config->register_string(config, "dxr3.keycolor", "0x80a040", "Dxr3: overlay colourkey value",NULL,NULL,NULL);
 
 			sscanf(str, "%x", &this->overlay.colorkey);
 
-			str = config->register_string(config, "video.dxr3_color_interval", "50.0", "Dxr3: overlay colourkey range","A greater value widens the search range for the overlay keycolor",NULL,NULL);
+			str = config->register_string(config, "dxr3.color_interval", "50.0", "Dxr3: overlay colourkey range","A greater value widens the search range for the overlay keycolor",NULL,NULL);
 
 			sscanf(str, "%f", &this->overlay.color_interval);
 		} else {
@@ -134,7 +134,7 @@ void dxr3_read_config(dxr3_driver_t *this)
 			this->tv_switchable=0;
 		}
 	}	
-	str = config->register_string(config, "video.dxr3_preferred_tvmode", "default", "Dxr3 preferred tv mode - PAL, PAL60, NTSC or default",NULL,NULL,NULL);
+	str = config->register_string(config, "dxr3.preferred_tvmode", "default", "Dxr3 preferred tv mode - PAL, PAL60, NTSC or default",NULL,NULL,NULL);
 
 	if (!strcasecmp(str, "ntsc")) {
 		this->tv_mode = EM8300_VIDEOMODE_NTSC;
@@ -350,9 +350,9 @@ int dxr3_set_property (vo_driver_t *this_gen,
 		if (ioctl(this->fd_control, EM8300_IOCTL_SETBCS, &this->bcs))
 			fprintf(stderr, "dxr3_vo: bcs set failed (%s)\n",
 			 strerror(errno));
-		this->config->update_num(this->config, "video.dxr3_contrast", this->bcs.contrast);
-		this->config->update_num(this->config, "video.dxr3_saturation", this->bcs.saturation);
-		this->config->update_num(this->config, "video.dxr3_brightness", this->bcs.brightness);
+		this->config->update_num(this->config, "dxr3.contrast", this->bcs.contrast);
+		this->config->update_num(this->config, "dxr3.saturation", this->bcs.saturation);
+		this->config->update_num(this->config, "dxr3.brightness", this->bcs.brightness);
 	}			 
 			 
 	return value;