e71413c20e
changes: full drag&drop support (rearrange tracks or add files to master from KDE/Gnome). completely new non-root-mode which does not require any group or a change of modes on the cdrtools. complete rewrite of internal device handling. Up to 64 devices can be independently configured and used. Devices are no longer scanned at each startup, support for remote-scsi (networked devices), Linux kernel-2.5.x devices and any other cdrecord supports. improved Mac OS X support with automatic autodiskmount daemon handling. support copy of audio-CDs on-the-fly. save window positions and sizes. display progress of reading/writing in window title. even more integration of cdrecord-ProDVD. Full support of DVD-R/RW and DVD+R/RW with newest ProDVD-versions. added greek and ukrainian translations, updated most others. a helpful HTML-manual in doc/manual (online: http://www.xcdroast.org/manual) numerous usage improvements and bug fixes.
70 lines
1.9 KiB
Text
70 lines
1.9 KiB
Text
$NetBSD: patch-ad,v 1.4 2003/06/05 16:15:48 drochner Exp $
|
|
|
|
--- src/wavplay.c.orig 2003-04-22 22:28:05.000000000 +0200
|
|
+++ src/wavplay.c 2003-06-04 13:32:27.000000000 +0200
|
|
@@ -23,6 +23,14 @@
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#include <string.h>
|
|
+#ifdef __NetBSD__
|
|
+#include <sys/ioctl.h>
|
|
+# ifdef HAVE_OSS
|
|
+# include <soundcard.h>
|
|
+# else
|
|
+# include <sys/audioio.h>
|
|
+# endif
|
|
+#endif
|
|
#if defined(linux) || defined(__CYGWIN32__)
|
|
# include <getopt.h>
|
|
#endif
|
|
@@ -73,8 +81,8 @@
|
|
gint is_in_cd_quality(guchar *hdr);
|
|
|
|
|
|
-#if defined(linux) || defined(__FreeBSD__)
|
|
-#define DEFAULT_AUDIO_DEVICE "/dev/dsp"
|
|
+#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS))
|
|
+#define DEFAULT_AUDIO_DEVICE "@DEVOSSAUDIO@"
|
|
#elif defined (aix)
|
|
#define DEFAULT_AUDIO_DEVICE ""
|
|
#elif defined(__sgi)
|
|
@@ -310,7 +318,7 @@
|
|
#endif
|
|
|
|
|
|
-#if defined(linux) || defined(__FreeBSD__)
|
|
+#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS))
|
|
|
|
/* open the sound-device of linux and set cd-quality */
|
|
|
|
@@ -361,7 +369,7 @@
|
|
|
|
#endif
|
|
|
|
-#if defined(sun) || defined(__OpenBSD__)
|
|
+#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
|
|
|
|
/* open the sound-device of solaris and set cd-quality */
|
|
|
|
@@ -388,7 +396,7 @@
|
|
info.play.precision = 16;
|
|
info.play.encoding = AUDIO_ENCODING_LINEAR;
|
|
info.play.buffer_size = abuf_size;
|
|
-#ifndef __OpenBSD__
|
|
+#if !defined(__OpenBSD__) && !defined(__NetBSD__)
|
|
info.output_muted = 0;
|
|
#endif
|
|
|
|
@@ -789,10 +797,10 @@
|
|
|
|
/* the open sets also the global abuf_size-variable */
|
|
|
|
-#if defined(linux) || defined(__FreeBSD__)
|
|
+#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS))
|
|
audio = open_linux_audio(audio_dev);
|
|
#endif
|
|
-#if defined(sun) || defined(__OpenBSD__)
|
|
+#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
|
|
audio = open_solaris_audio(audio_dev);
|
|
#endif
|
|
#ifdef aix
|