summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Beierlein <tomjbe@gentoo.org>2015-03-07 18:30:54 +0000
committerThomas Beierlein <tomjbe@gentoo.org>2015-03-07 18:30:54 +0000
commit606604ea30da7da9af82e4867ea67d85bcabefbf (patch)
tree3e2df28391924f10a072d5f5edaf6c6c7fd2773c /media-radio
parentVersion bump. (diff)
downloadhistorical-606604ea30da7da9af82e4867ea67d85bcabefbf.tar.gz
historical-606604ea30da7da9af82e4867ea67d85bcabefbf.tar.bz2
historical-606604ea30da7da9af82e4867ea67d85bcabefbf.zip
Drop old
Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x762053D5
Diffstat (limited to 'media-radio')
-rw-r--r--media-radio/cwdaemon/ChangeLog7
-rw-r--r--media-radio/cwdaemon/Manifest29
-rw-r--r--media-radio/cwdaemon/cwdaemon-0.10.0.ebuild18
-rw-r--r--media-radio/cwdaemon/cwdaemon-0.9.2.ebuild19
-rw-r--r--media-radio/cwdaemon/cwdaemon-0.9.4.ebuild24
-rw-r--r--media-radio/cwdaemon/cwdaemon-0.9.6.ebuild18
-rw-r--r--media-radio/cwdaemon/cwdaemon-0.9.7.ebuild18
-rw-r--r--media-radio/cwdaemon/files/cwdaemon-0.9.4-unixcw3.patch134
8 files changed, 10 insertions, 257 deletions
diff --git a/media-radio/cwdaemon/ChangeLog b/media-radio/cwdaemon/ChangeLog
index d0f7e33719bc..715b3d1b247d 100644
--- a/media-radio/cwdaemon/ChangeLog
+++ b/media-radio/cwdaemon/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-radio/cwdaemon
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/cwdaemon/ChangeLog,v 1.28 2015/02/24 08:42:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/cwdaemon/ChangeLog,v 1.29 2015/03/07 18:30:44 tomjbe Exp $
+
+ 07 Mar 2015; Thomas Beierlein <tomjbe@gentoo.org> -cwdaemon-0.9.2.ebuild,
+ -cwdaemon-0.9.4.ebuild, -cwdaemon-0.9.6.ebuild, -cwdaemon-0.9.7.ebuild,
+ -cwdaemon-0.10.0.ebuild, -files/cwdaemon-0.9.4-unixcw3.patch:
+ Drop old
24 Feb 2015; Agostino Sarubbo <ago@gentoo.org> cwdaemon-0.10.1.ebuild:
Stable for alpha, wrt bug #531962
diff --git a/media-radio/cwdaemon/Manifest b/media-radio/cwdaemon/Manifest
index e6d5300a989a..0835da8693f7 100644
--- a/media-radio/cwdaemon/Manifest
+++ b/media-radio/cwdaemon/Manifest
@@ -1,35 +1,14 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX cwdaemon-0.9.4-unixcw3.patch 3020 SHA256 0cefb8a297e918b0da466fb540b549f4ae74a4e40172c3f55a32cb380b754cb7 SHA512 93995a9bb3d42a8a421b5a9dae463e7a6d8e173ed86e702f51c3c56124e42fbfc797478ebac8e2d9cab7151299b5a3a94ea0f5be9e4e901590e81169899d7b1b WHIRLPOOL 21c69f151a8a903a7d038f494069f34001ab536be8fe78bdd38fe724294fb6b4b6b73ce1658d703a3c9967ec733607d5dd4c153f8d3fbbb1da3f2d83492bf6b0
-DIST cwdaemon-0.10.0.tar.gz 310879 SHA256 5289ebc0baea87e2b4ad70df8b8eea1ca11f0e8605e5630933a6f1f191da27d0 SHA512 5e88d44f1b5946a06eef79fa554302c7d890200d72f5e5881f9c721594fc96bf65f9a1acf7ff1452026c07250189eb587a9251d6416a4d4ef2b05fb8dd32acc5 WHIRLPOOL 45cce6d8e9a7e2f95cad19d94508008967d7ad6977ef250053097e0a9cdc89ae79d4e75822bcc4364adad332a3a9706802a432aae865d7cbdcf9917c8b5a94fa
DIST cwdaemon-0.10.1.tar.gz 314733 SHA256 5c914140aba395b5d52ba5d822bec9c22e05e93e38af9cfd212242adcaf6abcc SHA512 be15de3326de005c208bdcea412333ff3756e89f08cf5239d87bcd3bc20e9c98f74b028ab65438f04938b9840e354d5fc7c6056405a52aa434e134b5763fe1b8 WHIRLPOOL bfb0cdb4fbaa8ca4af2ca684278926aa058b1b16b9a27d33986bdb4fc39ff22c0a446a415e5d617f74e6aeafe90165173ba5112c61680373a926ab35a7f3602b
-DIST cwdaemon-0.9.2.tar.gz 267210 SHA256 c390fbc8fb5eec49fad5934a0b3353264a47807bdd0fb76ea194ddc8d2eece7d SHA512 ed52ca25aadeb6dd36c1ad9234cf33c78b94091e07b4bf52c0e1b815d972aedaaeeb07c2074da8c110ee4b41838fc39533a138395effa034a2c037b3d150298d WHIRLPOOL 191039bf0637147b7ec71107184e5168cbb142012d0ee166b5b2b9ba741abe3c0ace07e2b670fd56a325afc9188c04dffcf4d03bcd7dc0769180cb4f46876065
-DIST cwdaemon-0.9.4.tar.gz 236395 SHA256 0b26304333a1933d45814be23788295dd22fa6d80fc651a32fb12bd042b9e84e SHA512 511cbc682a4ab0b43d2cd919b24d9a81d89f794428b6b7c02f61655c146d3d9212000cc631b57133e5f55e178b3d2e1f401ea404edb1e05475706205160ca604 WHIRLPOOL d3561a51362e52e5ea706c4c1ae50cb8c9ee3240eaeb753929be4d9da9d32ccfaabb5b69b310e1334981dd2757bb8a9a283dbd9591462d7b8693f5ba3cf9f924
-DIST cwdaemon-0.9.6.tar.gz 283114 SHA256 41be01cdba73f43b276ceb6336901600df421eac06910c6efde9dcca58bf55ef SHA512 e65456672049bfe7f220272cb61d4096fef79bf5c86f770c46f97061ae7673b3f0693398ab925ecca4eeb1beeb22b07437dfa195360d3674ae19e260112dcc47 WHIRLPOOL 8adc44d44cf28d27e3955e3e07d1352c30ee8478e62632611398d13813722afebc304f10300668388c40965941e9cb17f62cd298eebba79777ab290821731236
-DIST cwdaemon-0.9.7.tar.gz 275105 SHA256 2a5833237d90821cef3121d511d75808c176475b93b3a2c2e5db613159f85819 SHA512 f7a8f1195d9713eab8cdafd7834a5208a49baa1fc2b860a51621a90246730bfc4c06d6dbcc0c983be01dc86b6e185a186524b3840be2fce1d4fe6aac551611e0 WHIRLPOOL f33ad65fae65eb994d369b7ad8c221a592d142392948a00462666413e685d02ac3ec0bf28efec399617b7272bea394a431c61d2de72c9cb63971fc7a086849ee
-EBUILD cwdaemon-0.10.0.ebuild 531 SHA256 04a0d912f2f4f0e4599a6f50f91551cc1c0db8dc7d094727ce8aec74cc2dd761 SHA512 a22fa8052d76785150d44582e345ba7b4d547f05b825316f0622bab194208b70478703ba3af25eec61c5851a71b156a80c3d20522a0b6ffca52342dcc3a3a86c WHIRLPOOL 6a56678ecb331eeb604007063ee2c0290b771d3ac75d0a087384911e8e7aef9f4b55b7b7075316c7621d0300fa75f49cee994b7cc3709b402c964ef77ea84595
EBUILD cwdaemon-0.10.1.ebuild 524 SHA256 a23c3114d129156ff19a307e5bdbaf17af52773faa4b51634769acd8fbf9963e SHA512 2672d32581557c5adcd4d4f61f0e1a5c0115956eda2d16d851057c5f4dea015e69c9d2d6ea00fb5ca64baae5679e04d81844cb86bc33885aabd2b4eb188f4910 WHIRLPOOL ec92d4a016af1c4c7be0fac4db9e308b580373167ddd80ea1e243d0ee78861214d99d1eb14b95498b7a22e1999f4e6d0f2be4e04a9b2ba04ff2c37d2b69a51f9
-EBUILD cwdaemon-0.9.2.ebuild 540 SHA256 a68ea17ad192795e8358b678e0226548b2c59a224ac7c9a9b6641de1825de2e5 SHA512 a34efbdc67d646b5247c8e55fd29ff569d47688c60b491b81b51de8c0da45d5b91823c965c049ce0e23892836c7a36434b9bfb112cb2a2ea3b1324cdce594f5f WHIRLPOOL f64e56e9446564eaaa67a767e9cd36e8fe77f7d92ca592e43afc1107f0cf0856ee84da163734d9729618c696c1b8da77c28c55690b901600296679b5c16f5923
-EBUILD cwdaemon-0.9.4.ebuild 614 SHA256 c4fee008c93ae2cd921dd43b00303badfc291d6f8a8e6e218869fe7d820785f0 SHA512 286136d60b3258c641cd7028f17ddcf93add38fdba9183d25b2799812692c9af004a8f4f5bac8fd52683c2f0a76e82baf1bbd0a9a65295328134d2a92d446632 WHIRLPOOL c56fab76ad57f6467e8ff192f964cf4f3b2856d5bcf7108e3b03842a166cb71605bded210c91168fcce6f048b81c9124a2acd7c2fb1558623eac4ef4013951c7
-EBUILD cwdaemon-0.9.6.ebuild 530 SHA256 231e1a27746649db10ad187be1c4bf0bba5ca6b6d301358f58d16df86caf6d23 SHA512 fd5341d018d969574934d360b1703c20315269c8b1adb2c5e8819749735c6a22e41ed4208727f9e74bec8ef0725c931737b74de7a275e53537b76ca136401db0 WHIRLPOOL 402ab02da9494947ae1d54d84381dd1f3716bc6628561e12bd9d90ef2409b4b2b195c9646a6c7e96718852ee262f822df010aa71c7fb8b75dd985ed3e6838f7c
-EBUILD cwdaemon-0.9.7.ebuild 531 SHA256 ae3bf71b7c1f6f55eafdb26739bf572f70088a273ed6a2ab609806e10a4d69e2 SHA512 c7354bcc11e94f81b3d4fd2e75529260ca4ed902b2fe1c986d9e1265864dfff625ea0c9cce00dd8ebc6dd6a7ae4f754c349210143a351ec4178d3c382ddf8fb8 WHIRLPOOL 1fb7226cc79e07c1459ae53dac08067dbd10221c110016d81076d22c3dd2fb4b396cd118711623c548da8d45a955ef92b2a32e8fe4ab35bec57ab6b712009a70
-MISC ChangeLog 4624 SHA256 0d608014c0ceaed0ee6da73a19defbde7ddd4fd493c9b3358b672b4728d93f65 SHA512 f2ee3ed94032e5c44ee447fcd801494537283629dfc4bccc19b896047f0bf652b8a2d10f633dd36b3a327027b06e6203ceb874e1c572729e019d0a5f69314e4b WHIRLPOOL e0b4d3d4b1e0039c3f82e05da337fe84dba3583f09f0e3c771a7eb5629a585b057ac0b80d63f2a8880e4c11884cb2650ca78acd898f51c99e6f40005ceea6ee0
+MISC ChangeLog 4853 SHA256 07766e961ad4594bd65e28ab1e0a07310294e3433766fd390c9dba61b0830eea SHA512 6f70b4b07fad949a53f360b5652778cfc68350c4633f31db258f3f67b7ed7b530f200a2c422ea30804f95c94a18cb70125fc39edcc3100ea62240235bf8d24e8 WHIRLPOOL 2ff6c1730780b011202c241be4d713faa44af841e1c36e4704f6e066bc01e852e490953a0c57d2b6d65309f78679b8eb947762b632b7e992df23c45ef2078030
MISC metadata.xml 237 SHA256 158ddbefb55fcef02625b7550043306a9ae6400d33558f2ca96f5f8ba242deea SHA512 3dda8d519d039ec743c0034d7c6ec52101d7f6dc12e7a2aea63b0f285c9e5dc2a40b4e73bd3aa636532da6a79aaa67db54661df34e2423da05ab90b604c77f35 WHIRLPOOL 283efb10d44655d83bf7698ceb5aef6d509999d19c71424d6f520f345875a16c73e1aeffb52222d9c0726a376faec33dae46003f61cb0d70e8cc666cafdac298
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJU7DmSAAoJELp701BxlEWf8oQP/2FzGZVlUW28Qnugj4Er2rLZ
-P0A9TzcN433DpuuLVMAwHpZbqBGtM6bHVUk74C4l6djvmYadqB+DEfOEsBPlqtcp
-t+t/l4gwX5dDErrlj2t3NC3BGZgOq9VE8KCLQWq5rhx2qSpyMMDsXSKQDuRY4wgq
-nSdyd9PywZXi9jbksqRoougl+h91KGMvk6dfM3AvApOK65mmAifkPF2pT5NmJQOi
-AZ7uaSPov0Eq59Lp4QlrKG+mVrwLVLhGjExNnlmdnOUWfN+2SNP0w9M0qB3WP8zm
-rwTqPBQMm90n4R4NnSxFDo4kg8DceMBsiSjDsMmlNftmg4G+E+KejCsvoMGNi6hL
-a9uQP2eBMKw8K+mqR5LcdEfuXjxLgz8rBP7MHc56TzYgywrl5cLBTrHdCtclHJO5
-JfHTnUjgBE2CbC9+n+u57rVxR/f9joeUYvctK+axkEonFpUkYzXPXpnqxAv98+2D
-YfkyJx5lbrubV2sO+nDAbGQ/AaK+EZbsY3b1CfIXKnj3sdGH2EAMDVhD7/gLRsgU
-n1DMpLk5vEL3TyQlwU2WilWD2V+4AvRxo9Kb7iGpo+Qn6ehDeEM9sQ6ULBz6mcEy
-rjhAGn521GNkQ6EqcvuEsaTvn9IyVGtijc5vTN22n5MEg8nl1jIZhrPMkavQqHKt
-gQHoraAUR6DXb5TQGsEE
-=TnBd
+iEYEAREIAAYFAlT7Q9oACgkQQe4uqXYgU9Xd0gCeK8Gv4Ewvy/KYB3KFDjtU7W/Y
+DjAAoI9v09bMKpS24eAJTBNqWOvQOmd8
+=m1qi
-----END PGP SIGNATURE-----
diff --git a/media-radio/cwdaemon/cwdaemon-0.10.0.ebuild b/media-radio/cwdaemon/cwdaemon-0.10.0.ebuild
deleted file mode 100644
index 6bddadea5022..000000000000
--- a/media-radio/cwdaemon/cwdaemon-0.10.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/cwdaemon/cwdaemon-0.10.0.ebuild,v 1.1 2014/02/02 13:32:21 tomjbe Exp $
-
-EAPI=4
-
-DESCRIPTION="A morse daemon for the parallel or serial port"
-HOMEPAGE="http://cwdaemon.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=media-radio/unixcw-3.1.1"
-DEPEND="$RDEPEND
- virtual/pkgconfig"
diff --git a/media-radio/cwdaemon/cwdaemon-0.9.2.ebuild b/media-radio/cwdaemon/cwdaemon-0.9.2.ebuild
deleted file mode 100644
index 9b825bfc403f..000000000000
--- a/media-radio/cwdaemon/cwdaemon-0.9.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/cwdaemon/cwdaemon-0.9.2.ebuild,v 1.8 2013/02/07 08:57:38 tomjbe Exp $
-
-DESCRIPTION="A morse daemon for the parallel or serial port"
-HOMEPAGE="http://www.qsl.net/pg4i/linux/cwdaemon.html"
-SRC_URI="http://www.qsl.net/pg4i/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-src_install() {
- emake DESTDIR="${D}" install || die
-}
diff --git a/media-radio/cwdaemon/cwdaemon-0.9.4.ebuild b/media-radio/cwdaemon/cwdaemon-0.9.4.ebuild
deleted file mode 100644
index f7cda092c20c..000000000000
--- a/media-radio/cwdaemon/cwdaemon-0.9.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/cwdaemon/cwdaemon-0.9.4.ebuild,v 1.5 2012/06/25 18:37:35 tomjbe Exp $
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="A morse daemon for the parallel or serial port"
-HOMEPAGE="http://www.ibiblio.org/pub/linux/apps/ham/morse"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=media-radio/unixcw-3.0.2"
-DEPEND="$RDEPEND
- virtual/pkgconfig"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-unixcw3.patch
-}
diff --git a/media-radio/cwdaemon/cwdaemon-0.9.6.ebuild b/media-radio/cwdaemon/cwdaemon-0.9.6.ebuild
deleted file mode 100644
index d322f26488d3..000000000000
--- a/media-radio/cwdaemon/cwdaemon-0.9.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/cwdaemon/cwdaemon-0.9.6.ebuild,v 1.2 2012/08/13 18:33:45 tomjbe Exp $
-
-EAPI=4
-
-DESCRIPTION="A morse daemon for the parallel or serial port"
-HOMEPAGE="http://cwdaemon.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=media-radio/unixcw-3.1.1"
-DEPEND="$RDEPEND
- virtual/pkgconfig"
diff --git a/media-radio/cwdaemon/cwdaemon-0.9.7.ebuild b/media-radio/cwdaemon/cwdaemon-0.9.7.ebuild
deleted file mode 100644
index 5aa2ec4dc2bd..000000000000
--- a/media-radio/cwdaemon/cwdaemon-0.9.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/cwdaemon/cwdaemon-0.9.7.ebuild,v 1.1 2013/08/26 14:18:10 patrick Exp $
-
-EAPI=4
-
-DESCRIPTION="A morse daemon for the parallel or serial port"
-HOMEPAGE="http://cwdaemon.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=media-radio/unixcw-3.1.1"
-DEPEND="$RDEPEND
- virtual/pkgconfig"
diff --git a/media-radio/cwdaemon/files/cwdaemon-0.9.4-unixcw3.patch b/media-radio/cwdaemon/files/cwdaemon-0.9.4-unixcw3.patch
deleted file mode 100644
index c9b7acc8d9e0..000000000000
--- a/media-radio/cwdaemon/files/cwdaemon-0.9.4-unixcw3.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-# Changes to adapt to new unixcw-3 package thanks to AAPI changes in libcw
-# Taken from debians patches from Kamil Ignacak, the maintainer of unixcw
---- cwdaemon.c.orig 2012-06-25 20:00:23.000000000 +0200
-+++ cwdaemon.c 2012-06-25 20:00:30.000000000 +0200
-@@ -89,7 +89,7 @@
- #endif
- #include <limits.h>
-
--#include <cwlib.h>
-+#include <libcw.h>
- #include "cwdaemon.h"
-
- /* network vars */
-@@ -165,6 +165,9 @@
- cwdevice *cwdev;
- static void playmorsestring (char *x);
-
-+static int set_libcw_output (void);
-+static void close_libcw (void);
-+
- /* catch ^C when running in foreground */
- static RETSIGTYPE
- catchint (int signal)
-@@ -299,17 +302,59 @@
- }
- }
-
--/* initialize unixcw */
-+/* (re)set initial parameters of libcw */
- static void
--initmorse (void)
-+reset_libcw (void)
- {
-+ /* just in case if an old generator exists */
-+ close_libcw ();
-+
-+ set_libcw_output ();
-+
- cw_set_frequency (morse_tone);
- cw_set_send_speed (morse_speed);
-- cw_set_soundcard_sound (soundcard_sound);
-- cw_set_console_sound (console_sound);
- cw_set_volume (morse_volume);
- cw_set_gap (0);
- }
-+
-+static void
-+close_libcw (void)
-+{
-+ cw_generator_stop ();
-+ cw_generator_delete ();
-+}
-+
-+/* set up output of libcw */
-+static int
-+set_libcw_output (void)
-+{
-+ int rv = 0;
-+ if (soundcard_sound && !console_sound)
-+ {
-+ rv = cw_generator_new (CW_AUDIO_ALSA, NULL);
-+ if (rv != CW_FAILURE)
-+ {
-+ rv = cw_generator_start();
-+ }
-+ }
-+ else if (!soundcard_sound && console_sound)
-+ {
-+ rv = cw_generator_new (CW_AUDIO_CONSOLE, NULL);
-+ if (rv != CW_FAILURE)
-+ {
-+ rv = cw_generator_start();
-+ }
-+ }
-+ else
-+ {
-+ /* libcw can't do both soundcard and console,
-+ and it has to have one and only one sound
-+ system specified */
-+ errmsg ("Sound output specified incorrectly");
-+ rv = CW_FAILURE;
-+ }
-+ return rv == CW_FAILURE ? -1 : 0;
-+}
-
- /* properly parse a 'long' integer */
- static int
-@@ -320,7 +365,7 @@
-
- errno = 0;
- lv = strtol(buf, &ep, 10);
-- if (buf[0] == '\0' || *ep != '\0')
-+ if (buf[0] == '\0' || (*ep != '\0' && *ep != '\n'))
- return (-1);
- if (errno == ERANGE && (lv == LONG_MAX || lv == LONG_MIN))
- return (-1);
-@@ -371,7 +416,7 @@
- morse_volume = 70;
- console_sound = 1;
- soundcard_sound = 0;
-- initmorse ();
-+ reset_libcw ();
- wordmode = 0;
- async_abort = 0;
- cwdev->reset (cwdev);
-@@ -559,8 +604,7 @@
- if (valid_sdevice == 1)
- {
- debug ("Sound device: %s", message + 2);
-- cw_set_soundcard_sound (soundcard_sound);
-- cw_set_console_sound (console_sound);
-+ set_libcw_output ();
- }
- break;
- case 'g': /* volume */
-@@ -640,6 +684,7 @@
- debug ("Morse = %c", c);
- cw_send_character (c);
- if (cw_get_gap () == 2) cw_set_gap (0);
-+ cw_wait_for_tone_queue();
- }
- x++;
- i++;
-@@ -858,7 +903,9 @@
- }
- cwdev->desc = keydev;
-
-- initmorse ();
-+ reset_libcw ();
-+ atexit (close_libcw);
-+
- cw_register_keying_callback (keyingevent, NULL);
-
- debug ("Device used: %s", cwdev->desc);