Merge lp:~kamalmostafa/ubuntu/lucid/unixcw/fix-ioctl-and-mute into lp:ubuntu/lucid/unixcw

[Kamal Mostafa]

=== modified file 'debian/changelog'
--- debian/changelog	2009-12-25 09:10:13 +0000
+++ debian/changelog	2010-01-28 20:55:21 +0000
@@ -1,3 +1,12 @@
+unixcw (2.3-13ubuntu1) lucid; urgency=low
+
+  * Fix invalid ioctl which breaks CW output on some devices (LP: #511676).
+    - src/cwlib/cwlib.c: do not try to use mixer volume ioctl on audio device.
+  * Restore audio device volume on exit (LP: #513576)
+    - src/cw/cw.c, src/cwcp/cwcp.c: call cw_complete_reset() at exit.
+
+ -- Kamal Mostafa <[e-mail]>  Wed, 27 Jan 2010 19:40:14 -0800
+
 unixcw (2.3-13) unstable; urgency=low
 
   * QA upload.

=== modified file 'debian/control'
--- debian/control	2009-12-25 09:10:13 +0000
+++ debian/control	2010-01-28 20:55:21 +0000
@@ -1,7 +1,8 @@
 Source: unixcw
 Section: hamradio
 Priority: optional
-Maintainer: Debian QA Group <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian QA Group <[e-mail]>
 Standards-Version: 3.8.0
 Build-Depends: debhelper (>=7), libqt3-mt-dev, libncurses5-dev, po-debconf, autotools-dev, mawk|gawk
 

=== modified file 'src/cw/cw.c'
--- src/cw/cw.c	2006-11-19 19:52:38 +0000
+++ src/cw/cw.c	2010-01-28 20:55:21 +0000
@@ -922,5 +922,9 @@
 
   /* Await final tone completion before exiting. */
   cw_wait_for_tone_queue ();
+
+  /* Reset to ensure that the mixer volume gets restored. */
+  cw_complete_reset();
+
   return EXIT_SUCCESS;
 }

=== modified file 'src/cwcp/cwcp.c'
--- src/cwcp/cwcp.c	2006-11-19 19:52:38 +0000
+++ src/cwcp/cwcp.c	2010-01-28 20:55:21 +0000
@@ -1625,6 +1625,9 @@
   /* Attempt to wrestle the screen back from curses. */
   interface_destroy ();
 
+  /* Reset to ensure that the mixer volume gets restored. */
+  cw_complete_reset();
+
   /* Show the signal caught, and exit. */
   fprintf (stderr, _("\nCaught signal %d, exiting...\n"), signal_number);
   exit (EXIT_SUCCESS);
@@ -1685,5 +1688,9 @@
   /* Clean up and return. */
   interface_destroy ();
   cw_wait_for_tone_queue ();
+
+  /* Reset to ensure that the mixer volume gets restored. */
+  cw_complete_reset();
+
   return EXIT_SUCCESS;
 }

=== modified file 'src/cwlib/cwlib.c'
--- src/cwlib/cwlib.c	2006-12-18 09:45:19 +0000
+++ src/cwlib/cwlib.c	2010-01-28 20:55:21 +0000
@@ -2138,6 +2138,18 @@
 {
   int read_volume, mixer, device_mask;
 
+/*
+ * [Kamal Mostafa <[e-mail]>]
+ * This attempt to use a mixer ioctl on the audio device is invalid!  I do not
+ * think that this ioctl could ever have worked.  Most audio devices will
+ * just return an error, allowing this routine to proceed to try the volume
+ * control methods on the (proper) mixer device.  However, some audio devices
+ * actually *do* have an ioctl (unrelated to volume control) corresponding to
+ * this ioctl number -- if they return 0, then this routine is tricked into
+ * thinking that it has set the volume when in fact it has not.
+ * https://bugs.launchpad.net/ubuntu/+source/unixcw/+bug/511676
+ */
+#if 0
   /* Try to use the main /dev/audio device for ioctls first. */
   if (ioctl (cw_sound_descriptor,
              MIXER_READ (SOUND_MIXER_PCM), &read_volume) == 0)
@@ -2145,6 +2157,7 @@
       *volume = read_volume;
       return RC_SUCCESS;
     }
+#endif
 
   /* Volume not found; try the mixer PCM channel volume instead. */
   mixer = open (cw_mixer_device, O_RDONLY | O_NONBLOCK);
@@ -2174,6 +2187,8 @@
 
       *volume = read_volume;
       close (mixer);
+      if (cw_is_debugging_internal (CW_DEBUG_KEYING))
+        fprintf(stderr, "cw: volume control is SOUND_MIXER_PCM\n");
       return RC_SUCCESS;
     }
   else
@@ -2191,6 +2206,8 @@
 
           *volume = read_volume;
           close (mixer);
+          if (cw_is_debugging_internal (CW_DEBUG_KEYING))
+            fprintf(stderr, "cw: volume control is SOUND_MIXER_VOLUME\n");
           return RC_SUCCESS;
         }
     }
@@ -2216,11 +2233,19 @@
 {
   int mixer, device_mask;
 
+/*
+ * [Kamal Mostafa <[e-mail]>]
+ * This attempt to use a mixer ioctl on the audio device is invalid!
+ * (see above).
+ */
+#if 0
   /* Try to use the main /dev/audio device for ioctls first. */
   if (ioctl (cw_sound_descriptor,
              MIXER_WRITE (SOUND_MIXER_PCM), &volume) == 0)
     return RC_SUCCESS;
 
+#endif
+
   /* Try the mixer PCM channel volume instead. */
   mixer = open (cw_mixer_device, O_RDWR | O_NONBLOCK);
   if (mixer == -1)