head	1.3;
access;
symbols
	pkgsrc-2013Q4:1.2.0.22
	pkgsrc-2013Q4-base:1.2
	pkgsrc-2013Q3:1.2.0.20
	pkgsrc-2013Q3-base:1.2
	pkgsrc-2013Q2:1.2.0.18
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.2.0.16
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.2.0.14
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.2.0.12
	pkgsrc-2012Q3-base:1.2
	pkgsrc-2012Q2:1.2.0.10
	pkgsrc-2012Q2-base:1.2
	pkgsrc-2012Q1:1.2.0.8
	pkgsrc-2012Q1-base:1.2
	pkgsrc-2011Q4:1.2.0.6
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q3:1.2.0.4
	pkgsrc-2011Q3-base:1.2
	pkgsrc-2011Q2:1.2.0.2
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2011Q1:1.1.0.28
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.26
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.24
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.22
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.20
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.18
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.16
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.14
	pkgsrc-2009Q2-base:1.1
	pkgsrc-2009Q1:1.1.0.12
	pkgsrc-2009Q1-base:1.1
	pkgsrc-2008Q4:1.1.0.10
	pkgsrc-2008Q4-base:1.1
	pkgsrc-2008Q3:1.1.0.8
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.6
	cube-native-xorg-base:1.1
	pkgsrc-2008Q2:1.1.0.4
	pkgsrc-2008Q2-base:1.1
	cwrapper:1.1.0.2;
locks; strict;
comment	@# @;


1.3
date	2014.01.17.09.01.58;	author adam;	state dead;
branches;
next	1.2;
commitid	Rg5oZxqUQPN1Urlx;

1.2
date	2011.05.04.20.31.40;	author adam;	state Exp;
branches;
next	1.1;

1.1
date	2008.06.27.02.51.11;	author jmcneill;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Changes 1.6.2:
- Color management support updated to liblcms version 2.
- Various bug fixes.
@
text
@$NetBSD: patch-bc,v 1.2 2011/05/04 20:31:40 adam Exp $

--- dlls/wineoss.drv/audio.c.orig	2011-04-08 17:09:51.000000000 +0000
+++ dlls/wineoss.drv/audio.c
@@@@ -75,6 +75,12 @@@@
 
 #include "audio.h"
 
+#ifdef __NetBSD__
+#define SOUND_DEV	"/dev/sound"
+#else
+#define SOUND_DEV	"/dev/dsp"
+#endif
+
 WINE_DEFAULT_DEBUG_CHANNEL(wave);
 
 /* Allow 1% deviation for sample rates (some ES137x cards) */
@@@@ -1170,12 +1176,12 @@@@ static LRESULT OSS_WaveInit(void)
     }
     else
     {
-        WOutDev[0].ossdev.dev_name = WInDev[0].ossdev.dev_name = StrDup("/dev/dsp",NULL);
+        WOutDev[0].ossdev.dev_name = WInDev[0].ossdev.dev_name = StrDup(SOUND_DEV,NULL);
         WOutDev[0].ossdev.mixer_name = WInDev[0].ossdev.mixer_name = StrDup("/dev/mixer",NULL);
         for (i = 1; i < MAX_WAVEDRV; ++i)
         {
             WOutDev[i].ossdev.dev_name = WInDev[i].ossdev.dev_name = HeapAlloc(GetProcessHeap(),0,11);
-            sprintf(WOutDev[i].ossdev.dev_name, "/dev/dsp%u", i);
+            sprintf(WOutDev[i].ossdev.dev_name, SOUND_DEV "%u", i);
             WOutDev[i].ossdev.mixer_name = WInDev[i].ossdev.mixer_name = HeapAlloc(GetProcessHeap(),0,13);
             sprintf(WOutDev[i].ossdev.mixer_name, "/dev/mixer%u", i);
         }
@


1.2
log
@Changes 1.2.3:
* Translation updates
* Various bug fixes
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@Use /dev/sound on NetBSD
@
text
@d3 2
a4 2
--- dlls/wineoss.drv/audio.c.orig	2008-06-26 22:44:15.000000000 -0400
+++ dlls/wineoss.drv/audio.c	2008-06-26 22:45:02.000000000 -0400
d18 1
a18 1
@@@@ -1167,12 +1173,12 @@@@
d28 2
a29 2
-            sprintf(WOutDev[i].ossdev.dev_name, "/dev/dsp%d", i);
+            sprintf(WOutDev[i].ossdev.dev_name, SOUND_DEV "%d", i);
d31 1
a31 1
             sprintf(WOutDev[i].ossdev.mixer_name, "/dev/mixer%d", i);
@