Commit 4c719464 authored by Alexandre Julliard's avatar Alexandre Julliard

winenas.drv: Remove unnecessary ifdefs.

parent 6eea1119
......@@ -9039,10 +9039,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audio_AuCreateFlow" >&5
$as_echo "$ac_cv_lib_audio_AuCreateFlow" >&6; }
if test "x$ac_cv_lib_audio_AuCreateFlow" = x""yes; then :
$as_echo "#define HAVE_NAS 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauGetBestAuthByAddr in -lXau" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauGetBestAuthByAddr in -lXau" >&5
$as_echo_n "checking for XauGetBestAuthByAddr in -lXau... " >&6; }
if test "${ac_cv_lib_Xau_XauGetBestAuthByAddr+set}" = set; then :
$as_echo_n "(cached) " >&6
......
......@@ -1112,8 +1112,7 @@ OpenGL and Direct3D won't be supported.])
AC_CHECK_HEADERS(audio/audiolib.h,
[AC_CHECK_HEADERS(audio/soundlib.h,,,[#include <audio/audiolib.h>])
AC_CHECK_LIB(audio,AuCreateFlow,
[AC_DEFINE(HAVE_NAS,1,[Define if you have NAS including devel headers])
AC_CHECK_LIB(Xau,XauGetBestAuthByAddr,
[AC_CHECK_LIB(Xau,XauGetBestAuthByAddr,
[NASLIBS="-lXau -laudio -lXt $X_LIBS $XLIB $X_EXTRA_LIBS"],
[NASLIBS="-laudio -lXt $X_LIBS $XLIB $X_EXTRA_LIBS"],
[$X_LIBS])
......
......@@ -4,7 +4,6 @@ EXTRAINCL = @X_CFLAGS@
EXTRALIBS = @NASLIBS@
C_SRCS = \
audio.c \
nas.c
audio.c
@MAKE_DLL_RULES@
......@@ -89,8 +89,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave);
/* Allow 1% deviation for sample rates (some ES137x cards) */
#define NEAR_MATCH(rate1,rate2) (((100*((int)(rate1)-(int)(rate2)))/(rate1))==0)
#ifdef HAVE_NAS
static AuServer *AuServ;
#define MAX_WAVEOUTDRV (1)
......@@ -1489,14 +1487,27 @@ static int nas_end(void)
return 1;
}
#else /* !HAVE_NAS */
/**************************************************************************
* wodMessage (WINENAS.@)
* DriverProc (WINENAS.@)
*/
DWORD WINAPI NAS_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2)
LRESULT CALLBACK NAS_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
LPARAM dwParam1, LPARAM dwParam2)
{
FIXME("(%u, %04X, %08X, %08X, %08X):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2);
return MMSYSERR_NOTENABLED;
switch(wMsg) {
case DRV_LOAD:
case DRV_FREE:
case DRV_OPEN:
case DRV_CLOSE:
case DRV_ENABLE:
case DRV_DISABLE:
case DRV_QUERYCONFIGURE:
return 1;
case DRV_CONFIGURE: MessageBoxA(0, "NAS MultiMedia Driver !", "NAS Driver", MB_OK); return 1;
case DRV_INSTALL:
case DRV_REMOVE:
return DRV_SUCCESS;
default:
return 0;
}
}
#endif
/* -*- tab-width: 8; c-basic-offset: 4 -*- */
/*
*
* Wine Driver for NAS Network Audio System
* http://radscan.com/nas.html
*
* Copyright 2002 Nicolas Escuder <n.escuder@alineanet.com>
*
* Code massively copied from Eric Pouech's OSS driver
* and Chris Morgan aRts driver
*
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "mmddk.h"
/**************************************************************************
* DriverProc (WINENAS.@)
*/
LRESULT CALLBACK NAS_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
LPARAM dwParam1, LPARAM dwParam2)
{
switch(wMsg) {
#ifdef HAVE_NAS
case DRV_LOAD:
case DRV_FREE:
case DRV_OPEN:
case DRV_CLOSE:
case DRV_ENABLE:
case DRV_DISABLE:
case DRV_QUERYCONFIGURE:
return 1;
case DRV_CONFIGURE: MessageBoxA(0, "NAS MultiMedia Driver !", "NAS Driver", MB_OK); return 1;
case DRV_INSTALL:
case DRV_REMOVE:
return DRV_SUCCESS;
#endif
default:
return 0;
}
}
......@@ -503,9 +503,6 @@
/* Define to 1 if you have the <mpg123.h> header file. */
#undef HAVE_MPG123_H
/* Define if you have NAS including devel headers */
#undef HAVE_NAS
/* Define to 1 if you have the <ncurses.h> header file. */
#undef HAVE_NCURSES_H
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment