Add support for Jack audio server.
diff --git a/DEVELOPERS-HINTS b/DEVELOPERS-HINTS
index be8c993..9d0dae5 100644
--- a/DEVELOPERS-HINTS
+++ b/DEVELOPERS-HINTS
@@ -89,6 +89,7 @@
midimap/- midi mapper
wavemap/- audio mapper
winearts/ - ARTS audio driver
+ winejack/ - jack audio server driver
wineoss/- MM driver for OSS systems
winnls/ - National Language Support
winsock/
diff --git a/configure b/configure
index f0ace80..0302e51 100755
--- a/configure
+++ b/configure
@@ -10974,6 +10974,66 @@
#define SONAME_LIBCUPS "$ac_cv_lib_soname_cups"
_ACEOF
fi
+
+echo "$as_me:$LINENO: checking for -ljack soname" >&5
+echo $ECHO_N "checking for -ljack soname... $ECHO_C" >&6
+if test "${ac_cv_lib_soname_jack+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_get_soname_save_LIBS=$LIBS
+LIBS="-ljack $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char jack_client_new ();
+int
+main ()
+{
+jack_client_new ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_soname_jack=`$ac_cv_path_LDD conftest$ac_exeext | grep libjack\\.so | sed 's/^[ ]*\([^ ]*\)[ ]*=>.*$/\1/'`
+ if test "x$ac_cv_lib_soname_jack" = "x"
+ then
+ ac_cv_lib_soname_jack="libjack.so"
+ fi
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_soname_jack="libjack.so"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_get_soname_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_soname_jack" >&5
+echo "${ECHO_T}$ac_cv_lib_soname_jack" >&6
+if test "x$ac_cv_lib_soname_jack" != xNONE
+then
+cat >>confdefs.h <<_ACEOF
+#define SONAME_LIBJACK "$ac_cv_lib_soname_jack"
+_ACEOF
+fi
fi
@@ -11780,6 +11840,7 @@
+
for ac_header in \
arpa/inet.h \
arpa/nameser.h \
@@ -11790,6 +11851,7 @@
getopt.h \
ieeefp.h \
io.h \
+ jack/jack.h \
libio.h \
libutil.h \
link.h \
@@ -13850,7 +13912,7 @@
MAKE_PROG_RULES=programs/Makeprog.rules
- ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/d3d8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvideo/Makefile dlls/msvideo/msrle32/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile library/Makefile miscemu/Makefile ole/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/osversioncheck/Makefile programs/progman/Makefile programs/regapi/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/regtest/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wpp/Makefile tools/wrc/Makefile unicode/Makefile"
+ ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/d3d8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvideo/Makefile dlls/msvideo/msrle32/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winenas/Makefile dlls/winmm/winejack/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile library/Makefile miscemu/Makefile ole/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/osversioncheck/Makefile programs/progman/Makefile programs/regapi/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/regtest/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wpp/Makefile tools/wrc/Makefile unicode/Makefile"
cat >confcache <<\_ACEOF
@@ -14470,6 +14532,7 @@
"dlls/winmm/winearts/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/winearts/Makefile" ;;
"dlls/winmm/wineaudioio/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/wineaudioio/Makefile" ;;
"dlls/winmm/winenas/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/winenas/Makefile" ;;
+ "dlls/winmm/winejack/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/winejack/Makefile" ;;
"dlls/winmm/wineoss/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/wineoss/Makefile" ;;
"dlls/winnls/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winnls/Makefile" ;;
"dlls/winsock/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winsock/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index edbdc67..b3cfe9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -847,6 +847,7 @@
WINE_GET_SONAME(freetype,FT_Init_FreeType,[$X_LIBS])
WINE_GET_SONAME(GL,glXQueryExtension,[$X_LIBS $X_EXTRA_LIBS])
WINE_GET_SONAME(cups,cupsGetDefault)
+ WINE_GET_SONAME(jack,jack_client_new)
fi
@@ -973,6 +974,7 @@
getopt.h \
ieeefp.h \
io.h \
+ jack/jack.h \
libio.h \
libutil.h \
link.h \
@@ -1455,6 +1457,7 @@
dlls/winmm/winearts/Makefile
dlls/winmm/wineaudioio/Makefile
dlls/winmm/winenas/Makefile
+dlls/winmm/winejack/Makefile
dlls/winmm/wineoss/Makefile
dlls/winnls/Makefile
dlls/winsock/Makefile
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 55d2e6c..ed4389f 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -99,6 +99,7 @@
winmm/winealsa \
winmm/winearts \
winmm/wineaudioio \
+ winmm/winejack \
winmm/winenas \
winmm/wineoss \
winnls \
@@ -254,6 +255,7 @@
winearts.drv$(DLLEXT) \
wineaudioio.drv$(DLLEXT) \
winedos.dll$(DLLEXT) \
+ winejack.drv$(DLLEXT) \
winemp3.acm$(DLLEXT) \
winenas.drv$(DLLEXT) \
wineoss.drv$(DLLEXT) \
@@ -525,6 +527,9 @@
winedos.dll$(DLLEXT) winedos16.dll$(DLLEXT): winedos/winedos.dll$(DLLEXT)
$(RM) $@ && $(LN_S) winedos/winedos.dll$(DLLEXT) $@
+winejack.drv$(DLLEXT): winmm/winejack/winejack.drv$(DLLEXT)
+ $(RM) $@ && $(LN_S) winmm/winejack/winejack.drv$(DLLEXT) $@
+
winemp3.acm$(DLLEXT): msacm/winemp3/winemp3.acm$(DLLEXT)
$(RM) $@ && $(LN_S) msacm/winemp3/winemp3.acm$(DLLEXT) $@
@@ -1213,6 +1218,7 @@
winmm/winearts/winearts.drv$(DLLEXT): winmm/winearts
winmm/wineaudioio/wineaudioio.drv$(DLLEXT): winmm/wineaudioio
winedos/winedos.dll$(DLLEXT): winedos
+winmm/winejack/winejack.drv$(DLLEXT): winmm/winejack
msacm/winemp3/winemp3.acm$(DLLEXT): msacm/winemp3
winmm/winenas/winenas.drv$(DLLEXT): winmm/winenas
winmm/wineoss/wineoss.drv$(DLLEXT): winmm/wineoss
@@ -1313,6 +1319,7 @@
winmm/winearts/__install__: winearts.drv$(DLLEXT)
winmm/wineaudioio/__install__: wineaudioio.drv$(DLLEXT)
winedos/__install__: winedos.dll$(DLLEXT)
+winmm/winejack/__install__: winejack.drv$(DLLEXT)
msacm/winemp3/__install__: winemp3.acm$(DLLEXT)
winmm/winenas/__install__: winenas.drv$(DLLEXT)
winmm/wineoss/__install__: wineoss.drv$(DLLEXT)
diff --git a/dlls/winmm/winejack/.cvsignore b/dlls/winmm/winejack/.cvsignore
new file mode 100644
index 0000000..4974c3c
--- /dev/null
+++ b/dlls/winmm/winejack/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+winejack.drv.dbg.c
+winejack.drv.spec.c
diff --git a/dlls/winmm/winejack/Makefile.in b/dlls/winmm/winejack/Makefile.in
new file mode 100644
index 0000000..62eeed8
--- /dev/null
+++ b/dlls/winmm/winejack/Makefile.in
@@ -0,0 +1,17 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../../..
+SRCDIR = @srcdir@
+VPATH = @srcdir@
+MODULE = winejack.drv
+IMPORTS = winmm user32 kernel32
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
+
+C_SRCS = \
+ audio.c \
+ jack.c
+
+@MAKE_DLL_RULES@
+
+### Dependencies:
diff --git a/dlls/winmm/winejack/audio.c b/dlls/winmm/winejack/audio.c
new file mode 100644
index 0000000..0d1c5bd
--- /dev/null
+++ b/dlls/winmm/winejack/audio.c
@@ -0,0 +1,1626 @@
+/* -*- tab-width: 8; c-basic-offset: 4 -*- */
+/*
+ * Wine Driver for jack Sound Server
+ * http://jackit.sourceforge.net
+ *
+ * Copyright 1994 Martin Ayotte
+ * Copyright 1999 Eric Pouech (async playing in waveOut/waveIn)
+ * Copyright 2000 Eric Pouech (loops in waveOut)
+ * Copyright 2002 Chris Morgan (jack version of this file)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/*
+ * TODO:
+ * implement audio stream resampling for any arbitrary frequenty
+ * right now we use the winmm layer to do resampling although it would
+ * be nice to have a full set of algorithms to choose from based on cpu
+ * time
+ * implement wave-in support with jack
+ *
+ * FIXME:
+ * pause in waveOut during loop is not handled correctly
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+#include "windef.h"
+#include "wingdi.h"
+#include "winerror.h"
+#include "wine/winuser16.h"
+#include "mmddk.h"
+#include "dsound.h"
+#include "dsdriver.h"
+#include "jack.h"
+#include "wine/debug.h"
+
+#ifdef HAVE_JACK_JACK_H
+#include <jack/jack.h>
+#endif
+
+
+WINE_DEFAULT_DEBUG_CHANNEL(wave);
+
+#ifdef HAVE_JACK_JACK_H
+
+#define MAKE_FUNCPTR(f) static typeof(f) * fp_##f = NULL;
+
+/* Function pointers for dynamic loading of libjack */
+/* these are prefixed with "fp_", ie. "fp_jack_client_new" */
+MAKE_FUNCPTR(jack_activate);
+MAKE_FUNCPTR(jack_connect);
+MAKE_FUNCPTR(jack_client_new);
+MAKE_FUNCPTR(jack_client_close);
+MAKE_FUNCPTR(jack_deactivate);
+MAKE_FUNCPTR(jack_set_process_callback);
+MAKE_FUNCPTR(jack_set_buffer_size_callback);
+MAKE_FUNCPTR(jack_set_sample_rate_callback);
+MAKE_FUNCPTR(jack_on_shutdown);
+MAKE_FUNCPTR(jack_get_sample_rate);
+MAKE_FUNCPTR(jack_port_register);
+MAKE_FUNCPTR(jack_port_get_buffer);
+MAKE_FUNCPTR(jack_get_ports);
+MAKE_FUNCPTR(jack_port_name);
+#undef MAKE_FUNCPTR
+
+/* define the below to work around a bug in jack where closing a port */
+/* takes a very long time, so to get around this we actually don't */
+/* close the port when the device is closed but instead mark the */
+/* corresponding device as unused */
+#define JACK_CLOSE_HACK 1
+
+typedef jack_default_audio_sample_t sample_t;
+typedef jack_nframes_t nframes_t;
+
+/* only allow 10 output devices through this driver, this ought to be adequate */
+#define MAX_WAVEOUTDRV (10)
+#define MAX_WAVEINDRV (1)
+
+/* state diagram for waveOut writing:
+ *
+ * +---------+-------------+---------------+---------------------------------+
+ * | state | function | event | new state |
+ * +---------+-------------+---------------+---------------------------------+
+ * | | open() | | STOPPED |
+ * | PAUSED | write() | | PAUSED |
+ * | STOPPED | write() | <thrd create> | PLAYING |
+ * | PLAYING | write() | HEADER | PLAYING |
+ * | (other) | write() | <error> | |
+ * | (any) | pause() | PAUSING | PAUSED |
+ * | PAUSED | restart() | RESTARTING | PLAYING (if no thrd => STOPPED) |
+ * | (any) | reset() | RESETTING | STOPPED |
+ * | (any) | close() | CLOSING | CLOSED |
+ * +---------+-------------+---------------+---------------------------------+
+ */
+
+/* states of the playing device */
+#define WINE_WS_PLAYING 0
+#define WINE_WS_PAUSED 1
+#define WINE_WS_STOPPED 2
+#define WINE_WS_CLOSED 3
+
+typedef struct {
+ volatile int state; /* one of the WINE_WS_ manifest constants */
+ WAVEOPENDESC waveDesc;
+ WORD wFlags;
+ PCMWAVEFORMAT format;
+ WAVEOUTCAPSA caps;
+ WORD wDevID;
+
+ jack_port_t* out_port_l; /* ports for left and right channels */
+ jack_port_t* out_port_r;
+ jack_client_t* client;
+ long sample_rate; /* jack server sample rate */
+
+#if JACK_CLOSE_HACK
+ BOOL in_use; /* TRUE if this device is in use */
+#endif
+
+ char* sound_buffer;
+ unsigned long buffer_size;
+
+ DWORD volume_left;
+ DWORD volume_right;
+
+ LPWAVEHDR lpQueuePtr; /* start of queued WAVEHDRs (waiting to be notified) */
+ LPWAVEHDR lpPlayPtr; /* start of not yet fully played buffers */
+ DWORD dwPartialOffset; /* Offset of not yet written bytes in lpPlayPtr */
+
+ LPWAVEHDR lpLoopPtr; /* pointer of first buffer in loop, if any */
+ DWORD dwLoops; /* private copy of loop counter */
+
+ DWORD dwPlayedTotal; /* number of bytes actually played since opening */
+ DWORD dwWrittenTotal; /* number of bytes written to jack since opening */
+
+ DWORD bytesInJack; /* bytes that we wrote during the previous JACK_Callback() */
+ DWORD tickCountMS; /* time in MS of last JACK_Callback() */
+
+ /* synchronization stuff */
+ CRITICAL_SECTION access_crst;
+} WINE_WAVEOUT;
+
+typedef struct {
+ volatile int state;
+ WAVEOPENDESC waveDesc;
+ WORD wFlags;
+ PCMWAVEFORMAT format;
+ LPWAVEHDR lpQueuePtr;
+ DWORD dwTotalRecorded;
+ WAVEINCAPSA caps;
+ BOOL bTriggerSupport;
+
+ /* synchronization stuff */
+ CRITICAL_SECTION access_crst;
+} WINE_WAVEIN;
+
+static WINE_WAVEOUT WOutDev [MAX_WAVEOUTDRV];
+static WINE_WAVEIN WInDev [MAX_WAVEINDRV ];
+
+static DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv);
+static LPWAVEHDR wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo);
+static DWORD wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force);
+
+static int JACK_OpenDevice(WINE_WAVEOUT* wwo);
+
+#if JACK_CLOSE_HACK
+static void JACK_CloseDevice(WINE_WAVEOUT* wwo, BOOL close_client);
+#else
+static void JACK_CloseDevice(WINE_WAVEOUT* wwo);
+#endif
+
+
+/*======================================================================*
+ * Low level WAVE implementation *
+ *======================================================================*/
+
+#define SAMPLE_MAX_16BIT 32767.0f
+
+/* Alsaplayer function that applies volume changes to a buffer */
+/* (C) Andy Lo A Foe */
+/* Length is in terms of 32 bit samples */
+void volume_effect32(void *buffer, int length, int left, int right)
+{
+ short *data = (short *)buffer;
+ int i, v;
+
+ if (right == -1) right = left;
+
+ for(i = 0; i < length; i++) {
+ v = (int) ((*(data) * left) / 100);
+ *(data++) = (v>32767) ? 32767 : ((v<-32768) ? -32768 : v);
+ v = (int) ((*(data) * right) / 100);
+ *(data++) = (v>32767) ? 32767 : ((v<-32768) ? -32768 : v);
+ }
+}
+
+/* move 16 bit mono/stereo to 16 bit stereo */
+void sample_move_d16_d16(short *dst, short *src,
+ unsigned long nsamples, int nChannels)
+{
+ while(nsamples--)
+ {
+ *dst = *src;
+ dst++;
+
+ if(nChannels == 2) src++;
+
+ *dst = *src;
+ dst++;
+
+ src++;
+ }
+}
+
+/* convert from 16 bit to floating point */
+/* allow for copying of stereo data with alternating left/right */
+/* channels to a buffer that will hold a single channel stream */
+/* nsamples is in terms of 16bit samples */
+/* src_skip is in terms of 16bit samples */
+void sample_move_d16_s16 (sample_t *dst, short *src,
+ unsigned long nsamples, unsigned long src_skip)
+{
+ /* ALERT: signed sign-extension portability !!! */
+ while (nsamples--)
+ {
+ *dst = (*src) / SAMPLE_MAX_16BIT;
+ dst++;
+ src += src_skip;
+ }
+}
+
+/* fill dst buffer with nsamples worth of silence */
+void sample_silence_dS (sample_t *dst, unsigned long nsamples)
+{
+ /* ALERT: signed sign-extension portability !!! */
+ while (nsamples--)
+ {
+ *dst = 0;
+ dst++;
+ }
+}
+
+/******************************************************************
+ * JACK_callback
+ */
+/* everytime the jack server wants something from us it calls this
+function, so we either deliver it some sound to play or deliver it nothing
+to play */
+int JACK_callback (nframes_t nframes, void *arg)
+{
+ sample_t* out_l;
+ sample_t* out_r;
+ WINE_WAVEOUT* wwo = (WINE_WAVEOUT*)arg;
+
+ TRACE("wDevID: %d, nframes %ld\n", wwo->wDevID, nframes);
+
+ if(!wwo->client)
+ ERR("client is closed, this is weird...\n");
+
+ out_l = (sample_t *) fp_jack_port_get_buffer(wwo->out_port_l,
+ nframes);
+ out_r = (sample_t *) fp_jack_port_get_buffer(wwo->out_port_r,
+ nframes);
+
+ EnterCriticalSection(&wwo->access_crst);
+
+ if(wwo->state == WINE_WS_PLAYING)
+ {
+ DWORD jackBytesAvailableThisCallback = sizeof(sample_t) * nframes;
+ DWORD jackBytesLeft = sizeof(sample_t) * nframes;
+
+ DWORD inputBytesAvailable; /* number of bytes we have from the app, after conversion to 16bit stereo */
+ DWORD jackBytesToWrite; /* number of bytes we are going to write out, after conversion */
+
+ DWORD bytesInput; /* the number of bytes from the app */
+ DWORD appBytesToWrite; /* number of bytes from the app we are going to write */
+
+ long written = 0;
+ char* buffer;
+
+#if JACK_CLOSE_HACK
+ if(wwo->in_use == FALSE)
+ {
+ /* output silence if nothing is being outputted */
+ sample_silence_dS(out_l, nframes);
+ sample_silence_dS(out_r, nframes);
+
+ return 0;
+ }
+#endif
+
+ TRACE("wwo.state == WINE_WS_PLAYING\n");
+
+ /* see if our buffer is large enough for the data we are writing */
+ /* ie. Buffer_size < (bytes we already wrote + bytes we are going to write in this loop) */
+ if(wwo->buffer_size < jackBytesAvailableThisCallback)
+ {
+ ERR("for some reason JACK_BufSize() didn't allocate enough memory\n");
+ ERR("allocated %ld bytes, need %ld bytes\n", wwo->buffer_size,
+ jackBytesAvailableThisCallback);
+ LeaveCriticalSection(&wwo->access_crst);
+ return 0;
+ }
+
+ /* while we have jackBytesLeft and a wave header to be played */
+ while(jackBytesLeft && wwo->lpPlayPtr)
+ {
+ /* find the amount of audio to be played at this time */
+ bytesInput = wwo->lpPlayPtr->dwBufferLength - wwo->dwPartialOffset;
+ inputBytesAvailable = bytesInput;
+
+ /* calculate inputBytesAvailable based on audio format conversion */
+ if(wwo->format.wf.nChannels == 1)
+ inputBytesAvailable<<=1; /* multiply by two for mono->stereo conversion */
+
+ /* find the minimum of the inputBytesAvailable and the space available */
+ jackBytesToWrite = min(jackBytesLeft, inputBytesAvailable);
+
+ /* calculate appBytesToWrite based on audio format conversion */
+ appBytesToWrite = jackBytesToWrite;
+ if(wwo->format.wf.nChannels == 1)
+ appBytesToWrite>>=1; /* divide by two for stereo->mono conversion */
+
+ TRACE("jackBytesToWrite == %ld, appBytesToWrite == %ld\n", jackBytesToWrite, appBytesToWrite);
+
+ buffer = wwo->lpPlayPtr->lpData + wwo->dwPartialOffset;
+
+ /* convert from mono to stereo if necessary */
+ /* otherwise just memcpy to the output buffer */
+ if(wwo->format.wf.nChannels == 1)
+ {
+ sample_move_d16_d16((short*)wwo->sound_buffer +((jackBytesAvailableThisCallback - jackBytesLeft) / sizeof(short)),
+ (short*)buffer, jackBytesToWrite, wwo->format.wf.nChannels);
+ } else /* just copy the memory over */
+ {
+ memcpy(wwo->sound_buffer + (jackBytesAvailableThisCallback - jackBytesLeft),
+ buffer, jackBytesToWrite);
+ }
+
+ /* advance to the next wave header if possible, or advance pointer */
+ /* inside of the current header if we haven't completed it */
+ if(appBytesToWrite == bytesInput)
+ {
+ wodHelper_PlayPtrNext(wwo); /* we wrote the whole waveheader, skip to the next one*/
+ }
+ else
+ {
+ wwo->dwPartialOffset+=appBytesToWrite; /* else advance by the bytes we took in to write */
+ }
+
+ written+=appBytesToWrite; /* add on what we wrote */
+ jackBytesLeft-=jackBytesToWrite; /* take away what was written in terms of output bytes */
+ }
+
+ wwo->tickCountMS = GetTickCount(); /* record the current time */
+ wwo->dwWrittenTotal+=written; /* update states on wave device */
+ wwo->dwPlayedTotal+=wwo->bytesInJack; /* we must have finished with the last bytes or we wouldn't be back inside of this callback again... */
+ wwo->bytesInJack = written; /* record the bytes inside of jack */
+
+ /* Now that we have finished filling the buffer either until it is full or until */
+ /* we have run out of application sound data to process, apply volume and output */
+ /* the audio to the jack server */
+
+ /* apply volume to the buffer */
+ /* NOTE: buffer_size >> 2 to convert from bytes to 16 bit stereo(32bit) samples */
+ volume_effect32(wwo->sound_buffer, (jackBytesAvailableThisCallback - jackBytesLeft)>>2, wwo->volume_left,
+ wwo->volume_right);
+
+ /* convert from stereo 16 bit to single channel 32 bit float */
+ /* for each jack server channel */
+ /* NOTE: we skip over two sample since we want to only get either the left or right channel */
+ sample_move_d16_s16(out_l, (short*)wwo->sound_buffer, (jackBytesAvailableThisCallback - jackBytesLeft)>>2, 2);
+ sample_move_d16_s16(out_r, (short*)wwo->sound_buffer + 1,
+ (jackBytesAvailableThisCallback - jackBytesLeft)>>2, 2);
+
+ /* see if we still have jackBytesLeft here, if we do that means that we
+ ran out of wave data to play and had a buffer underrun, fill in
+ the rest of the space with zero bytes */
+ if(jackBytesLeft)
+ {
+ ERR("buffer underrun of %ld bytes\n", jackBytesLeft);
+ sample_silence_dS(out_l + ((jackBytesAvailableThisCallback - jackBytesLeft) / sizeof(sample_t)), jackBytesLeft / sizeof(sample_t));
+ sample_silence_dS(out_r + ((jackBytesAvailableThisCallback - jackBytesLeft) / sizeof(sample_t)), jackBytesLeft / sizeof(sample_t));
+ }
+ }
+ else if(wwo->state == WINE_WS_PAUSED ||
+ wwo->state == WINE_WS_STOPPED ||
+ wwo->state == WINE_WS_CLOSED)
+ {
+ /* output silence if nothing is being outputted */
+ sample_silence_dS(out_l, nframes);
+ sample_silence_dS(out_r, nframes);
+ }
+
+ /* notify the client of completed wave headers */
+ wodHelper_NotifyCompletions(wwo, FALSE);
+
+ LeaveCriticalSection(&wwo->access_crst);
+
+ TRACE("ending\n");
+
+ return 0;
+}
+
+/******************************************************************
+ * JACK_bufsize
+ *
+ * Called whenever the jack server changes the the max number
+ * of frames passed to JACK_callback
+ */
+int JACK_bufsize (nframes_t nframes, void *arg)
+{
+ WINE_WAVEOUT* wwo = (WINE_WAVEOUT*)arg;
+ DWORD buffer_required;
+ TRACE("the maximum buffer size is now %lu frames\n", nframes);
+
+ /* make sure the callback routine has adequate memory */
+ /* see if our buffer is large enough for the data we are writing */
+ /* ie. Buffer_size < (bytes we already wrote + bytes we are going to write in this loop) */
+ EnterCriticalSection(&wwo->access_crst);
+
+ buffer_required = sizeof(sample_t) * nframes;
+ if(wwo->buffer_size < buffer_required)
+ {
+ TRACE("expanding buffer from wwo->buffer_size == %ld, to %ld\n",
+ wwo->buffer_size, buffer_required);
+ TRACE("GetProcessHeap() == %p\n", GetProcessHeap());
+ wwo->buffer_size = buffer_required;
+ wwo->sound_buffer = HeapReAlloc(GetProcessHeap(), 0, wwo->sound_buffer, wwo->buffer_size);
+
+ /* if we don't have a buffer then error out */
+ if(!wwo->sound_buffer)
+ {
+ ERR("error allocating sound_buffer memory\n");
+ LeaveCriticalSection(&wwo->access_crst);
+ return 0;
+ }
+ }
+
+ LeaveCriticalSection(&wwo->access_crst);
+
+ TRACE("called\n");
+
+ return 0;
+}
+
+/******************************************************************
+ * JACK_srate
+ */
+int JACK_srate (nframes_t nframes, void *arg)
+{
+ TRACE("the sample rate is now %lu/sec\n", nframes);
+ return 0;
+}
+
+
+/******************************************************************
+ * JACK_shutdown
+ */
+/* if this is called then jack shut down... handle this appropriately */
+void JACK_shutdown(void* arg)
+{
+ WINE_WAVEOUT* wwo = (WINE_WAVEOUT*)arg;
+
+ wwo->client = 0; /* reset client */
+
+ TRACE("trying to reconnect after sleeping for a short while...\n");
+
+ /* lets see if we can't reestablish the connection */
+ Sleep(750); /* pause for a short period of time */
+ if(!JACK_OpenDevice(wwo))
+ {
+ ERR("unable to reconnect with jack...\n");
+ }
+}
+
+
+/******************************************************************
+ * JACK_OpenDevice
+ */
+static int JACK_OpenDevice(WINE_WAVEOUT* wwo)
+{
+ const char** ports;
+ int i;
+ char client_name[64];
+ jack_port_t* out_port_l;
+ jack_port_t* out_port_r;
+ jack_client_t* client;
+ int failed = 0;
+
+ TRACE("creating jack client and setting up callbacks\n");
+
+#if JACK_CLOSE_HACK
+ /* see if this device is already open */
+ if(wwo->client)
+ {
+ /* if this device is already in use then it is bad for us to be in here */
+ if(wwo->in_use)
+ return 0;
+
+ TRACE("using existing client\n");
+ wwo->in_use = TRUE;
+ return 1;
+ }
+#endif
+
+ /* zero out the buffer pointer and the size of the buffer */
+ wwo->sound_buffer = 0;
+ wwo->buffer_size = 0;
+
+ /* try to become a client of the JACK server */
+ snprintf(client_name, sizeof(client_name), "wine_jack_client %d", wwo->wDevID);
+ TRACE("client name '%s'\n", client_name);
+ if ((client = fp_jack_client_new (client_name)) == 0)
+ {
+ /* jack has problems with shutting down clients, so lets */
+ /* wait a short while and try once more before we give up */
+ Sleep(250);
+ if ((client = fp_jack_client_new (client_name)) == 0)
+ {
+ ERR("jack server not running?\n");
+ return 0;
+ }
+ }
+
+ /* tell the JACK server to call `JACK_callback()' whenever
+ there is work to be done. */
+ fp_jack_set_process_callback (client, JACK_callback, wwo);
+
+ /* tell the JACK server to call `JACK_bufsize()' whenever
+ the maximum number of frames that will be passed
+ to `JACK_Callback()' changes */
+ fp_jack_set_buffer_size_callback (client, JACK_bufsize, wwo);
+
+ /* tell the JACK server to call `srate()' whenever
+ the sample rate of the system changes. */
+ fp_jack_set_sample_rate_callback (client, JACK_srate, wwo);
+
+ /* tell the JACK server to call `jack_shutdown()' if
+ it ever shuts down, either entirely, or if it
+ just decides to stop calling us. */
+ fp_jack_on_shutdown (client, JACK_shutdown, wwo);
+
+ /* display the current sample rate. once the client is activated
+ (see below), you should rely on your own sample rate
+ callback (see above) for this value. */
+ wwo->sample_rate = fp_jack_get_sample_rate(client);
+ TRACE("engine sample rate: %lu\n", wwo->sample_rate);
+
+ /* create the left and right channel output ports */
+ /* jack's ports are all mono so for stereo you need two */
+ out_port_l = fp_jack_port_register (client, "out_l",
+ JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
+
+ out_port_r = fp_jack_port_register (client, "out_r",
+ JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
+
+ /* save away important values to the WINE_WAVEOUT struct */
+ wwo->client = client;
+ wwo->out_port_l = out_port_l;
+ wwo->out_port_r = out_port_r;
+
+#if JACK_CLOSE_HACK
+ wwo->in_use = TRUE; /* mark this device as in use since it now is ;-) */
+#endif
+
+ /* tell the JACK server that we are ready to roll */
+ if (fp_jack_activate (client))
+ {
+ ERR( "cannot activate client\n");
+ return 0;
+ }
+
+ /* figure out what the ports that we want to output on are */
+ /* NOTE: we do this instead of using stuff like "alsa_pcm:playback_X" because */
+ /* this way works if names are changed */
+ ports = fp_jack_get_ports(client, NULL, NULL, JackPortIsPhysical|JackPortIsInput);
+
+ /* display a trace of the output ports we found */
+ for(i = 0; ports[i]; i++)
+ {
+ TRACE("ports[%d] = '%s'\n", i, ports[i]);
+ }
+
+ if(!ports)
+ {
+ ERR("jack_get_ports() failed to find 'JackPortIsPhysical|JackPortIsInput'\n");
+ }
+
+ /* connect the ports. Note: you can't do this before
+ the client is activated (this may change in the future).
+ */
+ /* we want to connect to two ports so we have stereo output ;-) */
+
+ if(fp_jack_connect(client, fp_jack_port_name(out_port_l), ports[0]))
+ {
+ ERR ("cannot connect to output port %d('%s')\n", 0, ports[0]);
+ failed = 1;
+ }
+
+ if(fp_jack_connect(client, fp_jack_port_name(out_port_r), ports[1]))
+ {
+ ERR ("cannot connect to output port %d('%s')\n", 1, ports[1]);
+ failed = 1;
+ }
+
+ free(ports); /* free the returned array of ports */
+
+ /* if something failed we need to shut the client down and return 0 */
+ if(failed)
+ {
+ JACK_CloseDevice(wwo, TRUE);
+ return 0;
+ }
+
+ return 1; /* return success */
+}
+
+/******************************************************************
+ * JACK_CloseDevice
+ *
+ * Close the connection to the server cleanly.
+ * If close_client is TRUE we close the client for this device instead of
+ * just marking the device as in_use(JACK_CLOSE_HACK only)
+ */
+#if JACK_CLOSE_HACK
+static void JACK_CloseDevice(WINE_WAVEOUT* wwo, BOOL close_client)
+#else
+static void JACK_CloseDevice(WINE_WAVEOUT* wwo)
+#endif
+{
+#if JACK_CLOSE_HACK
+ TRACE("wDevID: %d, close_client: %d\n", wwo->wDevID, close_client);
+#else
+ TRACE("wDevID: %d\n", wwo->wDevID);
+#endif
+
+#if JACK_CLOSE_HACK
+ if(close_client)
+ {
+#endif
+ fp_jack_deactivate(wwo->client); /* supposed to help the jack_client_close() to succeed */
+ fp_jack_client_close (wwo->client);
+
+ EnterCriticalSection(&wwo->access_crst);
+ wwo->client = 0; /* reset client */
+ HeapFree(GetProcessHeap(), 0, wwo->sound_buffer); /* free buffer memory */
+ wwo->sound_buffer = 0;
+ wwo->buffer_size = 0; /* zero out size of the buffer */
+ LeaveCriticalSection(&wwo->access_crst);
+#if JACK_CLOSE_HACK
+ } else
+ {
+ EnterCriticalSection(&wwo->access_crst);
+ TRACE("setting in_use to FALSE\n");
+ wwo->in_use = FALSE;
+ LeaveCriticalSection(&wwo->access_crst);
+ }
+#endif
+}
+
+/******************************************************************
+ * JACK_WaveRelease
+ *
+ *
+ */
+LONG JACK_WaveRelease(void)
+{
+ int iDevice;
+
+ TRACE("closing all open devices\n");
+
+ /* close all open devices */
+ for(iDevice = 0; iDevice < MAX_WAVEOUTDRV; iDevice++)
+ {
+ TRACE("iDevice == %d\n", iDevice);
+ if(WOutDev[iDevice].client)
+ {
+#if JACK_CLOSE_HACK
+ JACK_CloseDevice(&WOutDev[iDevice], TRUE); /* close the device, FORCE the client to close */
+#else
+ JACK_CloseDevice(&WOutDev[iDevice]); /* close the device, FORCE the client to close */
+#endif
+ DeleteCriticalSection(&(WOutDev[iDevice].access_crst)); /* delete the critical section */
+ }
+ }
+
+ TRACE("returning 1\n");
+
+ return 1;
+}
+
+/******************************************************************
+ * JACK_WaveInit
+ *
+ * Initialize internal structures from JACK server info
+ */
+LONG JACK_WaveInit(void)
+{
+ int i;
+
+ TRACE("called\n");
+
+ /* setup function pointers */
+#define LOAD_FUNCPTR(f) if((fp_##f = wine_dlsym(jackhandle, #f, NULL, 0)) == NULL) goto sym_not_found;
+ LOAD_FUNCPTR(jack_activate);
+ LOAD_FUNCPTR(jack_connect);
+ LOAD_FUNCPTR(jack_client_new);
+ LOAD_FUNCPTR(jack_client_close);
+ LOAD_FUNCPTR(jack_deactivate);
+ LOAD_FUNCPTR(jack_set_process_callback);
+ LOAD_FUNCPTR(jack_set_buffer_size_callback);
+ LOAD_FUNCPTR(jack_set_sample_rate_callback);
+ LOAD_FUNCPTR(jack_on_shutdown);
+ LOAD_FUNCPTR(jack_get_sample_rate);
+ LOAD_FUNCPTR(jack_port_register);
+ LOAD_FUNCPTR(jack_port_get_buffer);
+ LOAD_FUNCPTR(jack_get_ports);
+ LOAD_FUNCPTR(jack_port_name);
+#undef LOAD_FUNCPTR
+
+ /* start with output device */
+
+ for (i = 0; i < MAX_WAVEOUTDRV; ++i)
+ {
+ WOutDev[i].client = 0; /* initialize the client to 0 */
+
+#if JACK_CLOSE_HACK
+ WOutDev[i].in_use = FALSE;
+#endif
+
+ memset(&WOutDev[i].caps, 0, sizeof(WOutDev[i].caps));
+
+ /* FIXME: some programs compare this string against the content of the registry
+ * for MM drivers. The names have to match in order for the program to work
+ * (e.g. MS win9x mplayer.exe)
+ */
+#ifdef EMULATE_SB16
+ WOutDev[i].caps.wMid = 0x0002;
+ WOutDev[i].caps.wPid = 0x0104;
+ strcpy(WOutDev[i].caps.szPname, "SB16 Wave Out");
+#else
+ WOutDev[i].caps.wMid = 0x00FF; /* Manufac ID */
+ WOutDev[i].caps.wPid = 0x0001; /* Product ID */
+ /* strcpy(WOutDev[i].caps.szPname, "OpenSoundSystem WAVOUT Driver");*/
+ strcpy(WOutDev[i].caps.szPname, "CS4236/37/38");
+#endif
+ WOutDev[i].caps.vDriverVersion = 0x0100;
+ WOutDev[i].caps.dwFormats = 0x00000000;
+ WOutDev[i].caps.dwSupport = WAVECAPS_VOLUME;
+
+ WOutDev[i].caps.wChannels = 2;
+ WOutDev[i].caps.dwSupport |= WAVECAPS_LRVOLUME;
+
+/* NOTE: we don't support any 8 bit modes so note that */
+/* WOutDev[i].caps.dwFormats |= WAVE_FORMAT_4M08;
+ WOutDev[i].caps.dwFormats |= WAVE_FORMAT_4S08; */
+ WOutDev[i].caps.dwFormats |= WAVE_FORMAT_4S16;
+ WOutDev[i].caps.dwFormats |= WAVE_FORMAT_4M16;
+/* WOutDev[i].caps.dwFormats |= WAVE_FORMAT_2M08;
+ WOutDev[i].caps.dwFormats |= WAVE_FORMAT_2S08; */
+ WOutDev[i].caps.dwFormats |= WAVE_FORMAT_2M16;
+ WOutDev[i].caps.dwFormats |= WAVE_FORMAT_2S16;
+/* WOutDev[i].caps.dwFormats |= WAVE_FORMAT_1M08;
+ WOutDev[i].caps.dwFormats |= WAVE_FORMAT_1S08;*/
+ WOutDev[i].caps.dwFormats |= WAVE_FORMAT_1M16;
+ WOutDev[i].caps.dwFormats |= WAVE_FORMAT_1S16;
+ }
+
+ /* then do input device */
+ for (i = 0; i < MAX_WAVEINDRV; ++i)
+ {
+ /* TODO: we should initialize read stuff here */
+ memset(&WInDev[0].caps, 0, sizeof(WInDev[0].caps));
+ }
+
+ return 1; /* return success */
+
+/* error path for function pointer loading errors */
+sym_not_found:
+ WINE_MESSAGE(
+ "Wine cannot find certain functions that it needs inside the jack"
+ "library. To enable Wine to use the jack audio server please "
+ "install libjack\n");
+ wine_dlclose(jackhandle, NULL, 0);
+ jackhandle = NULL;
+ return FALSE;
+}
+
+/*======================================================================*
+ * Low level WAVE OUT implementation *
+ *======================================================================*/
+
+/**************************************************************************
+ * wodNotifyClient [internal]
+ */
+static DWORD wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD dwParam1, DWORD dwParam2)
+{
+ TRACE("wMsg = 0x%04x dwParm1 = %04lX dwParam2 = %04lX\n", wMsg, dwParam1, dwParam2);
+
+ switch (wMsg) {
+ case WOM_OPEN:
+ case WOM_CLOSE:
+ case WOM_DONE:
+ if (wwo->wFlags != DCB_NULL &&
+ !DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags,
+ (HDRVR)wwo->waveDesc.hWave, wMsg, wwo->waveDesc.dwInstance,
+ dwParam1, dwParam2))
+ {
+ WARN("can't notify client !\n");
+ return MMSYSERR_ERROR;
+ }
+ break;
+ default:
+ FIXME("Unknown callback message %u\n", wMsg);
+ return MMSYSERR_INVALPARAM;
+ }
+ return MMSYSERR_NOERROR;
+}
+
+/**************************************************************************
+ * wodHelper_BeginWaveHdr [internal]
+ *
+ * Makes the specified lpWaveHdr the currently playing wave header.
+ * If the specified wave header is a begin loop and we're not already in
+ * a loop, setup the loop.
+ */
+static void wodHelper_BeginWaveHdr(WINE_WAVEOUT* wwo, LPWAVEHDR lpWaveHdr)
+{
+ EnterCriticalSection(&wwo->access_crst);
+
+ wwo->lpPlayPtr = lpWaveHdr;
+
+ if (!lpWaveHdr)
+ {
+ LeaveCriticalSection(&wwo->access_crst);
+ return;
+ }
+
+ if (lpWaveHdr->dwFlags & WHDR_BEGINLOOP)
+ {
+ if (wwo->lpLoopPtr)
+ {
+ WARN("Already in a loop. Discarding loop on this header (%p)\n", lpWaveHdr);
+ TRACE("Already in a loop. Discarding loop on this header (%p)\n", lpWaveHdr);
+ } else
+ {
+ TRACE("Starting loop (%ldx) with %p\n", lpWaveHdr->dwLoops, lpWaveHdr);
+ wwo->lpLoopPtr = lpWaveHdr;
+ /* Windows does not touch WAVEHDR.dwLoops,
+ * so we need to make an internal copy */
+ wwo->dwLoops = lpWaveHdr->dwLoops;
+ }
+ }
+ wwo->dwPartialOffset = 0;
+
+ LeaveCriticalSection(&wwo->access_crst);
+}
+
+
+/**************************************************************************
+ * wodHelper_PlayPtrNext [internal]
+ *
+ * Advance the play pointer to the next waveheader, looping if required.
+ */
+static LPWAVEHDR wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo)
+{
+ LPWAVEHDR lpWaveHdr;
+
+ EnterCriticalSection(&wwo->access_crst);
+
+ lpWaveHdr = wwo->lpPlayPtr;
+
+ wwo->dwPartialOffset = 0;
+ if ((lpWaveHdr->dwFlags & WHDR_ENDLOOP) && wwo->lpLoopPtr)
+ {
+ /* We're at the end of a loop, loop if required */
+ if (--wwo->dwLoops > 0)
+ {
+ wwo->lpPlayPtr = wwo->lpLoopPtr;
+ } else
+ {
+ /* Handle overlapping loops correctly */
+ if (wwo->lpLoopPtr != lpWaveHdr && (lpWaveHdr->dwFlags & WHDR_BEGINLOOP)) {
+ FIXME("Correctly handled case ? (ending loop buffer also starts a new loop)\n");
+ /* shall we consider the END flag for the closing loop or for
+ * the opening one or for both ???
+ * code assumes for closing loop only
+ */
+ } else
+ {
+ lpWaveHdr = lpWaveHdr->lpNext;
+ }
+ wwo->lpLoopPtr = NULL;
+ wodHelper_BeginWaveHdr(wwo, lpWaveHdr);
+ }
+ } else
+ {
+ /* We're not in a loop. Advance to the next wave header */
+ TRACE("not inside of a loop, advancing to next wave header\n");
+ wodHelper_BeginWaveHdr(wwo, lpWaveHdr = lpWaveHdr->lpNext);
+ }
+
+ LeaveCriticalSection(&wwo->access_crst);
+
+ return lpWaveHdr;
+}
+
+/* if force is TRUE then notify the client that all the headers were completed */
+static DWORD wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force)
+{
+ LPWAVEHDR lpWaveHdr;
+ DWORD retval;
+
+ TRACE("called\n");
+
+ EnterCriticalSection(&wwo->access_crst);
+
+ /* Start from lpQueuePtr and keep notifying until:
+ * - we hit an unwritten wavehdr
+ * - we hit the beginning of a running loop
+ * - we hit a wavehdr which hasn't finished playing
+ */
+ while ((lpWaveHdr = wwo->lpQueuePtr) &&
+ (force ||
+ (lpWaveHdr != wwo->lpPlayPtr &&
+ lpWaveHdr != wwo->lpLoopPtr)))
+ {
+ wwo->lpQueuePtr = lpWaveHdr->lpNext;
+
+ lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;
+ lpWaveHdr->dwFlags |= WHDR_DONE;
+ TRACE("calling notify client\n");
+
+ wodNotifyClient(wwo, WOM_DONE, (DWORD)lpWaveHdr, 0);
+ }
+
+ retval = (lpWaveHdr && lpWaveHdr != wwo->lpPlayPtr && lpWaveHdr !=
+ wwo->lpLoopPtr) ? 0 : INFINITE;
+
+ LeaveCriticalSection(&wwo->access_crst);
+
+ return retval;
+}
+
+/**************************************************************************
+ * wodHelper_Reset [internal]
+ *
+ * Resets current output stream.
+ */
+static void wodHelper_Reset(WINE_WAVEOUT* wwo, BOOL reset)
+{
+ EnterCriticalSection(&wwo->access_crst);
+
+ /* updates current notify list */
+ wodHelper_NotifyCompletions(wwo, FALSE);
+
+ if (reset)
+ {
+ /* remove all wave headers and notify client that all headers were completed */
+ wodHelper_NotifyCompletions(wwo, TRUE);
+
+ wwo->lpPlayPtr = wwo->lpQueuePtr = wwo->lpLoopPtr = NULL;
+ wwo->state = WINE_WS_STOPPED;
+ wwo->dwPlayedTotal = wwo->dwWrittenTotal = wwo->bytesInJack = 0;
+
+ wwo->dwPartialOffset = 0; /* Clear partial wavehdr */
+ } else
+ {
+ if (wwo->lpLoopPtr)
+ {
+ /* complicated case, not handled yet (could imply modifying the loop counter) */
+ FIXME("Pausing while in loop isn't correctly handled yet, except strange results\n");
+ wwo->lpPlayPtr = wwo->lpLoopPtr;
+ wwo->dwPartialOffset = 0;
+ wwo->dwWrittenTotal = wwo->dwPlayedTotal; /* this is wrong !!! */
+ } else
+ {
+ LPWAVEHDR ptr;
+ DWORD sz = wwo->dwPartialOffset;
+
+ /* reset all the data as if we had written only up to lpPlayedTotal bytes */
+ /* compute the max size playable from lpQueuePtr */
+ for (ptr = wwo->lpQueuePtr; ptr != wwo->lpPlayPtr; ptr = ptr->lpNext)
+ {
+ sz += ptr->dwBufferLength;
+ }
+
+ /* because the reset lpPlayPtr will be lpQueuePtr */
+ if (wwo->dwWrittenTotal > wwo->dwPlayedTotal + sz) ERR("doh\n");
+ wwo->dwPartialOffset = sz - (wwo->dwWrittenTotal - wwo->dwPlayedTotal);
+ wwo->dwWrittenTotal = wwo->dwPlayedTotal;
+ wwo->lpPlayPtr = wwo->lpQueuePtr;
+ }
+
+ wwo->state = WINE_WS_PAUSED;
+ }
+
+ LeaveCriticalSection(&wwo->access_crst);
+}
+
+/**************************************************************************
+ * wodGetDevCaps [internal]
+ */
+static DWORD wodGetDevCaps(WORD wDevID, LPWAVEOUTCAPSA lpCaps, DWORD dwSize)
+{
+ TRACE("(%u, %p, %lu);\n", wDevID, lpCaps, dwSize);
+
+ if (lpCaps == NULL) return MMSYSERR_NOTENABLED;
+
+ if (wDevID >= MAX_WAVEOUTDRV)
+ {
+ TRACE("MAX_WAVOUTDRV reached !\n");
+ return MMSYSERR_BADDEVICEID;
+ }
+
+ memcpy(lpCaps, &WOutDev[wDevID].caps, min(dwSize, sizeof(*lpCaps)));
+ return MMSYSERR_NOERROR;
+}
+
+/**************************************************************************
+ * wodOpen [internal]
+ */
+static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
+{
+ WINE_WAVEOUT* wwo;
+ DWORD retval;
+
+ TRACE("(%u, %p, %08lX);\n", wDevID, lpDesc, dwFlags);
+ if (lpDesc == NULL)
+ {
+ WARN("Invalid Parameter !\n");
+ return MMSYSERR_INVALPARAM;
+ }
+ if (wDevID >= MAX_WAVEOUTDRV) {
+ TRACE("MAX_WAVOUTDRV reached !\n");
+ return MMSYSERR_BADDEVICEID;
+ }
+
+#if JACK_CLOSE_HACK
+ if(WOutDev[wDevID].client && WOutDev[wDevID].in_use)
+#else
+ if(WOutDev[wDevID].client)
+#endif
+ {
+ TRACE("device %d already allocated\n", wDevID);
+ return MMSYSERR_ALLOCATED;
+ }
+
+ /* make sure we aren't being opened in 8 bit mode */
+ if(lpDesc->lpFormat->wBitsPerSample == 8)
+ {
+ TRACE("8bits per sample unsupported, returning WAVERR_BADFORMAT\n");
+ return WAVERR_BADFORMAT;
+ }
+
+ wwo = &WOutDev[wDevID];
+ wwo->wDevID = wDevID;
+
+ /* Set things up before we call JACK_OpenDevice because */
+ /* we will start getting callbacks before JACK_OpenDevice */
+ /* even returns and we want to be initialized before then */
+ wwo->state = WINE_WS_STOPPED; /* start in a stopped state */
+ wwo->dwPlayedTotal = 0; /* zero out these totals */
+ wwo->dwWrittenTotal = 0;
+ wwo->bytesInJack = 0;
+ wwo->tickCountMS = 0;
+
+ InitializeCriticalSection(&wwo->access_crst); /* initialize the critical section */
+
+ /* open up jack ports for this device */
+ if (!JACK_OpenDevice(&WOutDev[wDevID]))
+ {
+ ERR("JACK_OpenDevice(%d) failed\n", wDevID);
+ return MMSYSERR_ERROR; /* return unspecified error */
+ }
+
+ /* only PCM format is supported so far... */
+ if (lpDesc->lpFormat->wFormatTag != WAVE_FORMAT_PCM ||
+ lpDesc->lpFormat->nChannels == 0 ||
+ lpDesc->lpFormat->nSamplesPerSec == 0)
+ {
+ WARN("Bad format: tag=%04X nChannels=%d nSamplesPerSec=%ld !\n",
+ lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels,
+ lpDesc->lpFormat->nSamplesPerSec);
+ return WAVERR_BADFORMAT;
+ }
+
+ if (dwFlags & WAVE_FORMAT_QUERY)
+ {
+ TRACE("Query format: tag=%04X nChannels=%d nSamplesPerSec=%ld !\n",
+ lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels,
+ lpDesc->lpFormat->nSamplesPerSec);
+ return MMSYSERR_NOERROR;
+ }
+
+ dwFlags &= ~WAVE_DIRECTSOUND; /* direct sound not supported, ignore the flag */
+
+ EnterCriticalSection(&wwo->access_crst);
+
+ wwo->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK);
+
+ memcpy(&wwo->waveDesc, lpDesc, sizeof(WAVEOPENDESC));
+ memcpy(&wwo->format, lpDesc->lpFormat, sizeof(PCMWAVEFORMAT));
+
+ LeaveCriticalSection(&wwo->access_crst);
+
+ /* display the current wave format */
+ TRACE("wBitsPerSample=%u, nAvgBytesPerSec=%lu, nSamplesPerSec=%lu, nChannels=%u nBlockAlign=%u!\n",
+ wwo->format.wBitsPerSample, wwo->format.wf.nAvgBytesPerSec,
+ wwo->format.wf.nSamplesPerSec, wwo->format.wf.nChannels,
+ wwo->format.wf.nBlockAlign);
+
+ /* make sure that we have the same sample rate in our audio stream */
+ /* as we do in the jack server */
+ if(wwo->format.wf.nSamplesPerSec != wwo->sample_rate)
+ {
+ TRACE("error: jack server sample rate is '%ld', wave sample rate is '%ld'\n",
+ wwo->sample_rate, wwo->format.wf.nSamplesPerSec);
+
+#if JACK_CLOSE_HACK
+ JACK_CloseDevice(wwo, FALSE); /* close this device, don't force the client to close */
+#else
+ JACK_CloseDevice(wwo); /* close this device */
+#endif
+ return WAVERR_BADFORMAT;
+ }
+
+ /* check for an invalid number of bits per sample */
+ if (wwo->format.wBitsPerSample == 0)
+ {
+ WARN("Resetting zeroed wBitsPerSample to 16\n");
+ wwo->format.wBitsPerSample = 16 *
+ (wwo->format.wf.nAvgBytesPerSec /
+ wwo->format.wf.nSamplesPerSec) /
+ wwo->format.wf.nChannels;
+ }
+
+ EnterCriticalSection(&wwo->access_crst);
+ retval = wodNotifyClient(wwo, WOM_OPEN, 0L, 0L);
+ LeaveCriticalSection(&wwo->access_crst);
+
+ return retval;
+}
+
+/**************************************************************************
+ * wodClose [internal]
+ */
+static DWORD wodClose(WORD wDevID)
+{
+ DWORD ret = MMSYSERR_NOERROR;
+ WINE_WAVEOUT* wwo;
+
+ TRACE("(%u);\n", wDevID);
+
+ if (wDevID >= MAX_WAVEOUTDRV || !WOutDev[wDevID].client)
+ {
+ WARN("bad device ID !\n");
+ return MMSYSERR_BADDEVICEID;
+ }
+
+ wwo = &WOutDev[wDevID];
+ if (wwo->lpQueuePtr)
+ {
+ WARN("buffers still playing !\n");
+ ret = WAVERR_STILLPLAYING;
+ } else
+ {
+ /* sanity check: this should not happen since the device must have been reset before */
+ if (wwo->lpQueuePtr || wwo->lpPlayPtr) ERR("out of sync\n");
+
+ wwo->state = WINE_WS_CLOSED; /* mark the device as closed */
+
+#if JACK_CLOSE_HACK
+ JACK_CloseDevice(wwo, FALSE); /* close the jack device, DO NOT force the client to close */
+#else
+ JACK_CloseDevice(wwo); /* close the jack device */
+ DeleteCriticalSection(&wwo->access_crst); /* delete the critical section so we can initialize it again from wodOpen() */
+#endif
+
+ ret = wodNotifyClient(wwo, WOM_CLOSE, 0L, 0L);
+ }
+
+ return ret;
+}
+
+/**************************************************************************
+ * wodWrite [internal]
+ *
+ */
+static DWORD wodWrite(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize)
+{
+ LPWAVEHDR*wh;
+ WINE_WAVEOUT *wwo;
+
+ TRACE("(%u, %p, %08lX);\n", wDevID, lpWaveHdr, dwSize);
+
+ /* first, do the sanity checks... */
+ if (wDevID >= MAX_WAVEOUTDRV || !WOutDev[wDevID].client)
+ {
+ WARN("bad dev ID !\n");
+ return MMSYSERR_BADDEVICEID;
+ }
+
+ wwo = &WOutDev[wDevID];
+
+ if (lpWaveHdr->lpData == NULL || !(lpWaveHdr->dwFlags & WHDR_PREPARED))
+ {
+ TRACE("unprepared\n");
+ return WAVERR_UNPREPARED;
+ }
+
+ if (lpWaveHdr->dwFlags & WHDR_INQUEUE)
+ {
+ TRACE("still playing\n");
+ return WAVERR_STILLPLAYING;
+ }
+
+ lpWaveHdr->dwFlags &= ~WHDR_DONE;
+ lpWaveHdr->dwFlags |= WHDR_INQUEUE;
+ lpWaveHdr->lpNext = 0;
+
+ EnterCriticalSection(&wwo->access_crst);
+
+ /* insert buffer at the end of queue */
+ for (wh = &(wwo->lpQueuePtr); *wh; wh = &((*wh)->lpNext));
+ *wh = lpWaveHdr;
+
+ LeaveCriticalSection(&wwo->access_crst);
+
+ EnterCriticalSection(&wwo->access_crst);
+ if (!wwo->lpPlayPtr)
+ wodHelper_BeginWaveHdr(wwo,lpWaveHdr);
+ if (wwo->state == WINE_WS_STOPPED)
+ wwo->state = WINE_WS_PLAYING;
+ LeaveCriticalSection(&wwo->access_crst);
+
+ return MMSYSERR_NOERROR;
+}
+
+/**************************************************************************
+ * wodPrepare [internal]
+ */
+static DWORD wodPrepare(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize)
+{
+ TRACE("(%u, %p, %08lX);\n", wDevID, lpWaveHdr, dwSize);
+
+ if (wDevID >= MAX_WAVEOUTDRV)
+ {
+ WARN("bad device ID !\n");
+ return MMSYSERR_BADDEVICEID;
+ }
+
+ if (lpWaveHdr->dwFlags & WHDR_INQUEUE)
+ return WAVERR_STILLPLAYING;
+
+ lpWaveHdr->dwFlags |= WHDR_PREPARED;
+ lpWaveHdr->dwFlags &= ~WHDR_DONE;
+ return MMSYSERR_NOERROR;
+}
+
+/**************************************************************************
+ * wodUnprepare [internal]
+ */
+static DWORD wodUnprepare(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize)
+{
+ TRACE("(%u, %p, %08lX);\n", wDevID, lpWaveHdr, dwSize);
+
+ if (wDevID >= MAX_WAVEOUTDRV)
+ {
+ WARN("bad device ID !\n");
+ return MMSYSERR_BADDEVICEID;
+ }
+
+ if (lpWaveHdr->dwFlags & WHDR_INQUEUE)
+ return WAVERR_STILLPLAYING;
+
+ lpWaveHdr->dwFlags &= ~WHDR_PREPARED;
+ lpWaveHdr->dwFlags |= WHDR_DONE;
+
+ return MMSYSERR_NOERROR;
+}
+
+/**************************************************************************
+ * wodPause [internal]
+ */
+static DWORD wodPause(WORD wDevID)
+{
+ TRACE("(%u);!\n", wDevID);
+
+ if (wDevID >= MAX_WAVEOUTDRV || !WOutDev[wDevID].client)
+ {
+ WARN("bad device ID !\n");
+ return MMSYSERR_BADDEVICEID;
+ }
+
+ TRACE("[3-PAUSING]\n");
+
+ EnterCriticalSection(&(WOutDev[wDevID].access_crst));
+ wodHelper_Reset(&WOutDev[wDevID], FALSE);
+ LeaveCriticalSection(&(WOutDev[wDevID].access_crst));
+
+ return MMSYSERR_NOERROR;
+}
+
+/**************************************************************************
+ * wodRestart [internal]
+ */
+static DWORD wodRestart(WORD wDevID)
+{
+ TRACE("(%u);\n", wDevID);
+
+ if (wDevID >= MAX_WAVEOUTDRV || !WOutDev[wDevID].client)
+ {
+ WARN("bad device ID !\n");
+ return MMSYSERR_BADDEVICEID;
+ }
+
+ if (WOutDev[wDevID].state == WINE_WS_PAUSED)
+ {
+ EnterCriticalSection(&(WOutDev[wDevID].access_crst));
+ WOutDev[wDevID].state = WINE_WS_PLAYING;
+ LeaveCriticalSection(&(WOutDev[wDevID].access_crst));
+ }
+
+ return MMSYSERR_NOERROR;
+}
+
+/**************************************************************************
+ * wodReset [internal]
+ */
+static DWORD wodReset(WORD wDevID)
+{
+ TRACE("(%u);\n", wDevID);
+
+ if (wDevID >= MAX_WAVEOUTDRV || !WOutDev[wDevID].client)
+ {
+ WARN("bad device ID !\n");
+ return MMSYSERR_BADDEVICEID;
+ }
+
+ EnterCriticalSection(&(WOutDev[wDevID].access_crst));
+ wodHelper_Reset(&WOutDev[wDevID], TRUE);
+ LeaveCriticalSection(&(WOutDev[wDevID].access_crst));
+
+ return MMSYSERR_NOERROR;
+}
+
+/**************************************************************************
+ * wodGetPosition [internal]
+ */
+static DWORD wodGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize)
+{
+ int time;
+ DWORD val;
+ WINE_WAVEOUT* wwo;
+ DWORD elapsedMS;
+
+ TRACE("(%u, %p, %lu);\n", wDevID, lpTime, uSize);
+
+ if (wDevID >= MAX_WAVEOUTDRV || !WOutDev[wDevID].client)
+ {
+ WARN("bad device ID !\n");
+ return MMSYSERR_BADDEVICEID;
+ }
+
+ /* if null pointer to time structure return error */
+ if (lpTime == NULL) return MMSYSERR_INVALPARAM;
+
+ wwo = &WOutDev[wDevID];
+
+ EnterCriticalSection(&(WOutDev[wDevID].access_crst));
+ val = wwo->dwPlayedTotal;
+ elapsedMS = GetTickCount() - wwo->tickCountMS;
+ LeaveCriticalSection(&(WOutDev[wDevID].access_crst));
+
+ /* account for the bytes played since the last JACK_Callback() */
+ val+=((elapsedMS * wwo->format.wf.nAvgBytesPerSec) / 1000);
+
+ TRACE("wType=%04X wBitsPerSample=%u nSamplesPerSec=%lu nChannels=%u nAvgBytesPerSec=%lu\n",
+ lpTime->wType, wwo->format.wBitsPerSample,
+ wwo->format.wf.nSamplesPerSec, wwo->format.wf.nChannels,
+ wwo->format.wf.nAvgBytesPerSec);
+ TRACE("dwPlayedTotal=%lu\n", val);
+
+ switch (lpTime->wType) {
+ case TIME_BYTES:
+ lpTime->u.cb = val;
+ TRACE("TIME_BYTES=%lu\n", lpTime->u.cb);
+ break;
+ case TIME_SAMPLES:
+ lpTime->u.sample = val * 8 / wwo->format.wBitsPerSample /wwo->format.wf.nChannels;
+ TRACE("TIME_SAMPLES=%lu\n", lpTime->u.sample);
+ break;
+ case TIME_SMPTE:
+ time = val / (wwo->format.wf.nAvgBytesPerSec / 1000);
+ lpTime->u.smpte.hour = time / 108000;
+ time -= lpTime->u.smpte.hour * 108000;
+ lpTime->u.smpte.min = time / 1800;
+ time -= lpTime->u.smpte.min * 1800;
+ lpTime->u.smpte.sec = time / 30;
+ time -= lpTime->u.smpte.sec * 30;
+ lpTime->u.smpte.frame = time;
+ lpTime->u.smpte.fps = 30;
+ TRACE("TIME_SMPTE=%02u:%02u:%02u:%02u\n",
+ lpTime->u.smpte.hour, lpTime->u.smpte.min,
+ lpTime->u.smpte.sec, lpTime->u.smpte.frame);
+ break;
+ default:
+ FIXME("Format %d not supported ! use TIME_MS !\n", lpTime->wType);
+ lpTime->wType = TIME_MS;
+ case TIME_MS:
+ lpTime->u.ms = val / (wwo->format.wf.nAvgBytesPerSec / 1000);
+ TRACE("TIME_MS=%lu\n", lpTime->u.ms);
+ break;
+ }
+ return MMSYSERR_NOERROR;
+}
+
+/**************************************************************************
+ * wodBreakLoop [internal]
+ */
+static DWORD wodBreakLoop(WORD wDevID)
+{
+ TRACE("(%u);\n", wDevID);
+
+ if (wDevID >= MAX_WAVEOUTDRV || !WOutDev[wDevID].client)
+ {
+ WARN("bad device ID !\n");
+ return MMSYSERR_BADDEVICEID;
+ }
+
+ EnterCriticalSection(&(WOutDev[wDevID].access_crst));
+
+ if (WOutDev[wDevID].state == WINE_WS_PLAYING && WOutDev[wDevID].lpLoopPtr != NULL)
+ {
+ /* ensure exit at end of current loop */
+ WOutDev[wDevID].dwLoops = 1;
+ }
+
+ LeaveCriticalSection(&(WOutDev[wDevID].access_crst));
+
+ return MMSYSERR_NOERROR;
+}
+
+/**************************************************************************
+ * wodGetVolume [internal]
+ */
+static DWORD wodGetVolume(WORD wDevID, LPDWORD lpdwVol)
+{
+ DWORD left, right;
+
+ left = WOutDev[wDevID].volume_left;
+ right = WOutDev[wDevID].volume_right;
+
+ TRACE("(%u, %p);\n", wDevID, lpdwVol);
+
+ *lpdwVol = ((left * 0xFFFFl) / 100) + (((right * 0xFFFFl) / 100) <<
+ 16);
+
+ return MMSYSERR_NOERROR;
+}
+
+/**************************************************************************
+ * wodSetVolume [internal]
+ */
+static DWORD wodSetVolume(WORD wDevID, DWORD dwParam)
+{
+ DWORD left, right;
+
+ left = (LOWORD(dwParam) * 100) / 0xFFFFl;
+ right = (HIWORD(dwParam) * 100) / 0xFFFFl;
+
+ TRACE("(%u, %08lX);\n", wDevID, dwParam);
+
+ EnterCriticalSection(&(WOutDev[wDevID].access_crst));
+
+ WOutDev[wDevID].volume_left = left;
+ WOutDev[wDevID].volume_right = right;
+
+ LeaveCriticalSection(&(WOutDev[wDevID].access_crst));
+
+ return MMSYSERR_NOERROR;
+}
+
+/**************************************************************************
+ * wodGetNumDevs [internal]
+ */
+static DWORD wodGetNumDevs(void)
+{
+ return MAX_WAVEOUTDRV;
+}
+
+/**************************************************************************
+ * wodMessage (WINEJACK.7)
+ */
+DWORD WINAPI JACK_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
+ DWORD dwParam1, DWORD dwParam2)
+{
+ TRACE("(%u, %04X, %08lX, %08lX, %08lX);\n",
+ wDevID, wMsg, dwUser, dwParam1, dwParam2);
+
+ switch (wMsg) {
+ case DRVM_INIT:
+ TRACE("DRVM_INIT\n");
+ return JACK_WaveInit();
+ case DRVM_EXIT:
+ TRACE("DRVM_EXIT\n");
+ return JACK_WaveRelease();
+ case DRVM_ENABLE:
+ /* FIXME: Pretend this is supported */
+ TRACE("DRVM_ENABLE\n");
+ return 0;
+ case DRVM_DISABLE:
+ /* FIXME: Pretend this is supported */
+ TRACE("DRVM_DISABLE\n");
+ return 0;
+ case WODM_OPEN: return wodOpen(wDevID, (LPWAVEOPENDESC)dwParam1, dwParam2);
+ case WODM_CLOSE: return wodClose(wDevID);
+ case WODM_WRITE: return wodWrite(wDevID, (LPWAVEHDR)dwParam1, dwParam2);
+ case WODM_PAUSE: return wodPause(wDevID);
+ case WODM_GETPOS: return wodGetPosition(wDevID, (LPMMTIME)dwParam1, dwParam2);
+ case WODM_BREAKLOOP: return wodBreakLoop(wDevID);
+ case WODM_PREPARE: return wodPrepare(wDevID, (LPWAVEHDR)dwParam1, dwParam2);
+ case WODM_UNPREPARE: return wodUnprepare(wDevID, (LPWAVEHDR)dwParam1, dwParam2);
+ case WODM_GETDEVCAPS: return wodGetDevCaps(wDevID, (LPWAVEOUTCAPSA)dwParam1, dwParam2);
+ case WODM_GETNUMDEVS: return wodGetNumDevs();
+ case WODM_GETPITCH: return MMSYSERR_NOTSUPPORTED;
+ case WODM_SETPITCH: return MMSYSERR_NOTSUPPORTED;
+ case WODM_GETPLAYBACKRATE: return MMSYSERR_NOTSUPPORTED;
+ case WODM_SETPLAYBACKRATE: return MMSYSERR_NOTSUPPORTED;
+ case WODM_GETVOLUME: return wodGetVolume(wDevID, (LPDWORD)dwParam1);
+ case WODM_SETVOLUME: return wodSetVolume(wDevID, dwParam1);
+ case WODM_RESTART: return wodRestart(wDevID);
+ case WODM_RESET: return wodReset(wDevID);
+
+ case DRV_QUERYDSOUNDIFACE: return wodDsCreate(wDevID, (PIDSDRIVER*)dwParam1);
+ default:
+ FIXME("unknown message %d!\n", wMsg);
+ }
+ return MMSYSERR_NOTSUPPORTED;
+}
+
+/*======================================================================*
+ * Low level DSOUND implementation *
+ *======================================================================*/
+
+typedef struct IDsDriverImpl IDsDriverImpl;
+typedef struct IDsDriverBufferImpl IDsDriverBufferImpl;
+
+struct IDsDriverImpl
+{
+ /* IUnknown fields */
+ ICOM_VFIELD(IDsDriver);
+ DWORD ref;
+ /* IDsDriverImpl fields */
+ UINT wDevID;
+ IDsDriverBufferImpl*primary;
+};
+
+struct IDsDriverBufferImpl
+{
+ /* IUnknown fields */
+ ICOM_VFIELD(IDsDriverBuffer);
+ DWORD ref;
+ /* IDsDriverBufferImpl fields */
+ IDsDriverImpl* drv;
+ DWORD buflen;
+};
+
+static DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv)
+{
+ /* we can't perform memory mapping as we don't have a file stream
+ interface with jack like we do with oss */
+ MESSAGE("This sound card's driver does not support direct access\n");
+ MESSAGE("The (slower) DirectSound HEL mode will be used instead.\n");
+ return MMSYSERR_NOTSUPPORTED;
+}
+
+/*======================================================================*
+ * Low level WAVE IN implementation *
+ *======================================================================*/
+
+/**************************************************************************
+ * widMessage (WINEJACK.6)
+ */
+DWORD WINAPI JACK_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
+ DWORD dwParam1, DWORD dwParam2)
+{
+ TRACE("(%u, %04X, %08lX, %08lX, %08lX);\n",
+ wDevID, wMsg, dwUser, dwParam1, dwParam2);
+
+ return MMSYSERR_NOTSUPPORTED;
+}
+
+#else /* !HAVE_JACK_JACK_H */
+
+/**************************************************************************
+ * wodMessage (WINEJACK.7)
+ */
+DWORD WINAPI JACK_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
+ DWORD dwParam1, DWORD dwParam2)
+{
+ FIXME("(%u, %04X, %08lX, %08lX, %08lX):jack support not compiled into wine\n", wDevID, wMsg, dwUser, dwParam1, dwParam2);
+ return MMSYSERR_NOTENABLED;
+}
+
+#endif /* HAVE_JACK_JACK_H */
diff --git a/dlls/winmm/winejack/jack.c b/dlls/winmm/winejack/jack.c
new file mode 100644
index 0000000..32f51bc
--- /dev/null
+++ b/dlls/winmm/winejack/jack.c
@@ -0,0 +1,178 @@
+/* -*- tab-width: 8; c-basic-offset: 4 -*- */
+/*
+ * Wine Driver for jack Sound Server
+ * http://jackit.sourceforge.net
+ *
+ * Copyright 2002 Chris Morgan
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "config.h"
+#include "wine/port.h"
+#include "wine/library.h"
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "mmddk.h"
+#include "jack.h"
+
+#ifdef HAVE_JACK_JACK_H
+static int jack = 0;
+
+/* set this to zero or one to enable or disable tracing in here */
+#define TRACING 0
+
+#if TRACING
+#define PRINTF(...) printf(...)
+#else
+#define PRINTF(...)
+#endif
+
+#ifndef JACK_SONAME
+#define JACK_SONAME "libjack.so"
+#endif
+
+void *jackhandle = NULL;
+
+/**************************************************************************
+ * JACK_drvLoad [internal]
+ */
+static DWORD JACK_drvLoad(void)
+{
+ PRINTF("JACK_drvLoad()\n");
+
+ /* dynamically load the jack library if not already loaded */
+ if(!jackhandle)
+ {
+ jackhandle = wine_dlopen(JACK_SONAME, RTLD_NOW, NULL, 0);
+ PRINTF("JACK_drvLoad: JACK_SONAME == %s\n", JACK_SONAME);
+ PRINTF("JACK_drvLoad: jackhandle == 0x%x\n", jackhandle);
+ if(!jackhandle)
+ {
+ PRINTF("JACK_drvLoad: error loading the jack library %s, please install this library to use jack\n", JACK_SONAME);
+ jackhandle = (void*)-1;
+ return 0;
+ }
+ }
+
+ return 1;
+}
+
+/**************************************************************************
+ * JACK_drvFree [internal]
+ */
+/* unload the jack library on driver free */
+static DWORD JACK_drvFree(void)
+{
+ PRINTF("JACK_drvFree()\n");
+
+ if(jackhandle && (jackhandle != (void*)-1))
+ {
+ PRINTF("JACK_drvFree: calling wine_dlclose() on jackhandle\n");
+ wine_dlclose(jackhandle, NULL, 0);
+ jackhandle = NULL;
+ }
+
+ return 1;
+}
+
+/**************************************************************************
+ * JACK_drvOpen [internal]
+ */
+static DWORD JACK_drvOpen(LPSTR str)
+{
+ /* if we were unable to load the jack library then fail the */
+ /* driver open */
+ if(!jackhandle)
+ {
+ PRINTF("JACK_drvOpen: unable to open the jack library, returning 0\n");
+ return 0;
+ }
+
+ if (jack)
+ {
+ PRINTF("JACK_drvOpen: jack != 0 (already open), returning 0\n");
+ return 0;
+ }
+
+ /* I know, this is ugly, but who cares... */
+ PRINTF("JACK_drvOpen: opened jack(set jack = 1), returning 1\n");
+ jack = 1;
+ return 1;
+}
+
+/**************************************************************************
+ * JACK_drvClose [internal]
+ */
+static DWORD JACK_drvClose(DWORD dwDevID)
+{
+ if (jack)
+ {
+ PRINTF("JACK_drvClose: jack is nonzero, setting jack to 0 and returning 1\n");
+ jack = 0;
+ return 1;
+ }
+
+ PRINTF("JACK_drvClose: jack is zero(closed), returning 0\n");
+ return 0;
+}
+#endif /* #ifdef HAVE_JACK_JACK_H */
+
+
+/**************************************************************************
+ * DriverProc (WINEJACK.1)
+ */
+LONG CALLBACK JACK_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
+ DWORD dwParam1, DWORD dwParam2)
+{
+/* EPP TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n", */
+/* EPP dwDevID, hDriv, wMsg, dwParam1, dwParam2); */
+
+ switch(wMsg) {
+#ifdef HAVE_JACK_JACK_H
+ case DRV_LOAD:
+ PRINTF("JACK_DriverProc: DRV_LOAD\n");
+ return JACK_drvLoad();
+ case DRV_FREE:
+ PRINTF("JACK_DriverProc: DRV_FREE\n");
+ return JACK_drvFree();
+ case DRV_OPEN:
+ PRINTF("JACK_DriverProc: DRV_OPEN\n");
+ return JACK_drvOpen((LPSTR)dwParam1);
+ case DRV_CLOSE:
+ PRINTF("JACK_DriverProc: DRV_CLOSE\n");
+ return JACK_drvClose(dwDevID);
+ case DRV_ENABLE:
+ PRINTF("JACK_DriverProc: DRV_ENABLE\n");
+ return 1;
+ case DRV_DISABLE:
+ PRINTF("JACK_DriverProc: DRV_DISABLE\n");
+ return 1;
+ case DRV_QUERYCONFIGURE: return 1;
+ case DRV_CONFIGURE: MessageBoxA(0, "jack audio driver!", "jack driver", MB_OK); return 1;
+ case DRV_INSTALL:
+ PRINTF("JACK_DriverProc: DRV_INSTALL\n");
+ return DRVCNF_RESTART;
+ case DRV_REMOVE:
+ PRINTF("JACK_DriverProc: DRV_REMOVE\n");
+ return DRVCNF_RESTART;
+#endif
+ default:
+ return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
+ }
+}
diff --git a/dlls/winmm/winejack/jack.h b/dlls/winmm/winejack/jack.h
new file mode 100644
index 0000000..d3ff230
--- /dev/null
+++ b/dlls/winmm/winejack/jack.h
@@ -0,0 +1,28 @@
+/* Definition for jack driver : wine multimedia system
+ *
+ * Copyright 2002 Chris Morgan
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __WINE_JACK_H
+#define __WINE_JACK_H
+
+extern void *jackhandle; /* pointer to the libjack library */
+
+extern LONG JACK_WaveInit(void);
+extern LONG JACK_WaveRelease(void);
+
+#endif /* __WINE_JACK_H */
diff --git a/dlls/winmm/winejack/winejack.drv.spec b/dlls/winmm/winejack/winejack.drv.spec
new file mode 100644
index 0000000..0a46390
--- /dev/null
+++ b/dlls/winmm/winejack/winejack.drv.spec
@@ -0,0 +1,2 @@
+@ stdcall DriverProc(long long long long long) JACK_DriverProc
+@ stdcall wodMessage(long long long long long) JACK_wodMessage
diff --git a/documentation/samples/config b/documentation/samples/config
index 7c04ca4..f00e7a9 100644
--- a/documentation/samples/config
+++ b/documentation/samples/config
@@ -253,8 +253,9 @@
"4" = "/usr/X11R6/lib/X11/fonts/Type1"
[WinMM]
-"Drivers" = "wineoss.drv"
#"Drivers" = "winearts.drv"
+#"Drivers" = "winejack.drv"
+"Drivers" = "wineoss.drv"
"WaveMapper" = "msacm.drv"
"MidiMapper" = "midimap.drv"
diff --git a/include/config.h.in b/include/config.h.in
index 40c36ad..d5b6ee5 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -197,6 +197,9 @@
/* Define to 1 if you have the `iswalnum' function. */
#undef HAVE_ISWALNUM
+/* Define to 1 if you have the <jack/jack.h> header file. */
+#undef HAVE_JACK_JACK_H
+
/* Define to 1 if you have the <jpeglib.h> header file. */
#undef HAVE_JPEGLIB_H
@@ -713,6 +716,9 @@
/* Define to the soname of the libGL library. */
#undef SONAME_LIBGL
+/* Define to the soname of the libjack library. */
+#undef SONAME_LIBJACK
+
/* Define to the soname of the libX11 library. */
#undef SONAME_LIBX11
