27 June 2004 Doug Bell <drbell@users.sourceforge.net>

  * src/tvtime.c: load, use and save PalDKMode setting
  * src/tvtimeconf.c: load and get value for PalDKMode setting
  * src/videoinput.c: if PalDKMode is set and using PAL mode, then use
        PAL_DK mode if v4l2
  * src/videoinput.h: prototypes for videoinput_{get,set)_pal_audio_mode

1 files changed, 13 insertions, 0 deletions

diff --git a/src/tvtimeconf.c b/src/tvtimeconf.c
index 8381809..b8c050e 100644
--- a/src/tvtimeconf.c
+++ b/src/tvtimeconf.c
@@ -91,6 +91,7 @@ struct config_s
     int inputnum;
     char *v4ldev;
     char *norm;
+    int dkmode;
     char *freq;
     char *ssdir;
     char *timeformat;
@@ -150,6 +151,7 @@ static void copy_config( config_t *dest, config_t *src )
     dest->doc = 0;
     dest->audiomode = 0;
     dest->xmltvfile = 0;
+    dest->dkmode = 0;
 
     /* Useful strings must be copied. */
     dest->norm = strdup( src->norm );
@@ -419,6 +421,11 @@ static void parse_option( config_t *ct, xmlNodePtr node )
             if( ct->mixerdev ) free( ct->mixerdev );
             ct->mixerdev = strdup( curval );
         }
+
+	if( !xmlStrcasecmp( name, BAD_CAST "PalDKMode" ) ) {
+            ct->dkmode = atoi( curval );
+        }
+
     }
 
     if( name ) xmlFree( name );
@@ -798,6 +805,7 @@ config_t *config_new( void )
     ct->inputnum = 0;
     ct->v4ldev = strdup( "/dev/video0" );
     ct->norm = strdup( "ntsc" );
+    ct->dkmode = 0;
     ct->freq = strdup( "us-cable" );
     temp_dirname = getenv( "HOME" );
     if( temp_dirname ) {
@@ -1740,6 +1748,11 @@ int config_get_mirror( config_t *ct )
     return ct->mirror;
 }
 
+int config_get_pal_audio_mode( config_t *ct )
+{
+    return ct->dkmode;
+}
+
 int config_get_audio_boost( config_t *ct )
 {
     return ct->boost;