aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/tvtimeconf.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/tvtimeconf.c b/src/tvtimeconf.c
index 5db6325..375686f 100644
--- a/src/tvtimeconf.c
+++ b/src/tvtimeconf.c
@@ -643,9 +643,11 @@ static void print_usage( char **argv )
lfputs( _(" -l, --xmltvlanguage=LANG Use XMLTV data in given language, if available.\n"), stderr );
lfputs( _(" -v, --verbose Print debugging messages to stderr.\n"), stderr );
lfputs( _(" -X, --display=DISPLAY Use the given X display to connect to.\n"), stderr );
- lfputs( _(" -x, --mixer=DEVICE[:CH] The mixer device and channel to control.\n"
- " (defaults to /dev/mixer:line)\n\n"
- " Valid channels are:\n"
+ lfputs( _(" -x, --mixer=<DEVICE[:CH]>|<DEVICE/CH>\n"
+ " The mixer device and channel to control. The first\n"
+ " variant sets the OSS mixer the second one ALSA.\n"
+ " (defaults to default/Line)\n\n"
+ " Valid channels for OSS are:\n"
" vol, bass, treble, synth, pcm, speaker, line,\n"
" mic, cd, mix, pcm2, rec, igain, ogain, line1,\n"
" line2, line3, dig1, dig2, dig3, phin, phout,\n"
@@ -691,9 +693,11 @@ static void print_config_usage( char **argv )
lfputs( _(" -R, --priority=PRI Sets the process priority to run tvtime at.\n"), stderr );
lfputs( _(" -t, --xmltv=FILE Read XMLTV listings from the given file.\n"), stderr );
lfputs( _(" -l, --xmltvlanguage=LANG Use XMLTV data in given language, if available.\n"), stderr );
- lfputs( _(" -x, --mixer=DEVICE[:CH] The mixer device and channel to control.\n"
- " (defaults to /dev/mixer:line)\n\n"
- " Valid channels are:\n"
+ lfputs( _(" -x, --mixer=<DEVICE[:CH]>|<DEVICE/CH>\n"
+ " The mixer device and channel to control. The first\n"
+ " variant sets the OSS mixer the second one ALSA.\n"
+ " (defaults to default/Line)\n\n"
+ " Valid channels for OSS are:\n"
" vol, bass, treble, synth, pcm, speaker, line,\n"
" mic, cd, mix, pcm2, rec, igain, ogain, line1,\n"
" line2, line3, dig1, dig2, dig3, phin, phout,\n"
@@ -786,7 +790,7 @@ config_t *config_new( void )
ct->uid = getuid();
- ct->mixerdev = strdup( "/dev/mixer:line" );
+ ct->mixerdev = strdup( "default/Line" );
ct->deinterlace_method = strdup( "GreedyH" );
ct->check_freq_present = 1;

Privacy Policy