tvtime-alsa/tvtime-1.0.2-alsamixer2.patch

   1 diff -up tvtime-1.0.2/docs/html/default.tvtime.xml.alsamixer2 tvtime-1.0.2/docs/html/default.tvtime.xml
   2 --- tvtime-1.0.2/docs/html/default.tvtime.xml.alsamixer2        2005-09-08 06:06:57.000000000 +0200
   3 +++ tvtime-1.0.2/docs/html/default.tvtime.xml   2009-06-28 11:55:05.000000000 +0200
   4 @@ -116,13 +116,15 @@
   5    <option name="VBIDevice" value="/dev/vbi0"/>
   6
   7    <!--
   8 -    This sets the mixer device and channel to use.  The format is device
   9 -    name:channel name.  Valid channels are:
  10 +    This sets the mixer device and channel to use.  The format for OSS
  11 +    is device name:channel name.  Valid OSS channels are:
  12        vol, bass, treble, synth, pcm, speaker, line, mic, cd, mix, pcm2,
  13        rec, igain, ogain, line1, line2, line3, dig1, dig2, dig3, phin,
  14        phout, video, radio, monitor
  15 +    The format for ALSA mixer is device/channel (e.g., "default/Line"
  16 +    or "hw:0/CD")
  17     -->
  18 -  <option name="MixerDevice" value="/dev/mixer:line"/>
  19 +   <option name="MixerDevice" value="default/Line"/>
  20
  21    <!--
  22      This option enables 16:9 aspect ratio mode by default on startup.
  23 diff -up tvtime-1.0.2/docs/man/en/tvtime.xml.5.alsamixer2 tvtime-1.0.2/docs/man/en/tvtime.xml.5
  24 --- tvtime-1.0.2/docs/man/en/tvtime.xml.5.alsamixer2    2005-09-08 06:05:35.000000000 +0200
  25 +++ tvtime-1.0.2/docs/man/en/tvtime.xml.5       2009-06-28 11:55:56.000000000 +0200
  26 @@ -234,7 +234,10 @@ This sets which device to use for VBI de
  27  .TP
  28  <option name="MixerDevice" value="/dev/mixer:line"/>
  29  This sets the mixer device and channel to use.  The format is device
  30 -name:channel name.  Valid channels are:
  31 +name:channel name for OSS mixer (e.g., "/dev/mixer:Line") or device/channel
  32 +for ALSA (e.g., "hw:0/CD").
  33 +
  34 +Valid OSS channels are:
  35
  36  .nh
  37  .IR vol ", " bass ", " treble ", " synth ", " pcm ", " speaker ", "
  38 diff -up tvtime-1.0.2/src/tvtimeconf.c.alsamixer2 tvtime-1.0.2/src/tvtimeconf.c
  39 --- tvtime-1.0.2/src/tvtimeconf.c.alsamixer2    2005-09-08 06:07:56.000000000 +0200
  40 +++ tvtime-1.0.2/src/tvtimeconf.c       2009-06-28 11:55:56.000000000 +0200
  41 @@ -629,9 +629,11 @@ static void print_usage( char **argv )
  42      lfputs( _("  -l, --xmltvlanguage=LANG   Use XMLTV data in given language, if available.\n"), stderr );
  43      lfputs( _("  -v, --verbose              Print debugging messages to stderr.\n"), stderr );
  44      lfputs( _("  -X, --display=DISPLAY      Use the given X display to connect to.\n"), stderr );
  45 -    lfputs( _("  -x, --mixer=DEVICE[:CH]    The mixer device and channel to control.\n"
  46 -              "                             (defaults to /dev/mixer:line)\n\n"
  47 -              "                             Valid channels are:\n"
  48 +    lfputs( _("  -x, --mixer=<DEVICE[:CH]>|<DEVICE/CH>\n"
  49 +              "                             The mixer device and channel to control. The first\n"
  50 +              "                             variant sets the OSS mixer the second one ALSA.\n"
  51 +              "                             (defaults to default/Line)\n\n"
  52 +              "                             Valid channels for OSS are:\n"
  53                "                                 vol, bass, treble, synth, pcm, speaker, line,\n"
  54                "                                 mic, cd, mix, pcm2, rec, igain, ogain, line1,\n"
  55                "                                 line2, line3, dig1, dig2, dig3, phin, phout,\n"
  56 @@ -677,9 +679,11 @@ static void print_config_usage( char **a
  57      lfputs( _("  -R, --priority=PRI         Sets the process priority to run tvtime at.\n"), stderr );
  58      lfputs( _("  -t, --xmltv=FILE           Read XMLTV listings from the given file.\n"), stderr );
  59      lfputs( _("  -l, --xmltvlanguage=LANG   Use XMLTV data in given language, if available.\n"), stderr );
  60 -    lfputs( _("  -x, --mixer=DEVICE[:CH]    The mixer device and channel to control.\n"
  61 -              "                             (defaults to /dev/mixer:line)\n\n"
  62 -              "                             Valid channels are:\n"
  63 +    lfputs( _("  -x, --mixer=<DEVICE[:CH]>|<DEVICE/CH>\n"
  64 +              "                             The mixer device and channel to control. The first\n"
  65 +              "                             variant sets the OSS mixer the second one ALSA.\n"
  66 +              "                             (defaults to default/Line)\n\n"
  67 +              "                             Valid channels for OSS are:\n"
  68                "                                 vol, bass, treble, synth, pcm, speaker, line,\n"
  69                "                                 mic, cd, mix, pcm2, rec, igain, ogain, line1,\n"
  70                "                                 line2, line3, dig1, dig2, dig3, phin, phout,\n"
  71 @@ -764,7 +768,7 @@ config_t *config_new( void )
  72
  73      ct->uid = getuid();
  74
  75 -    ct->mixerdev = strdup( "/dev/mixer:line" );
  76 +    ct->mixerdev = strdup( "default/Line" );
  77
  78      ct->deinterlace_method = strdup( "GreedyH" );
  79      ct->check_freq_present = 1;