ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winenas.drv: Move opening wave device to audio.c.

This commit is contained in:
Maarten Lankhorst 2010-04-21 13:45:30 +02:00 committed by Alexandre Julliard
parent 0ceed8beb1
commit ce91ee441a
3 changed files with 6 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/winenas.drv/audio.c
View File

@ -81,7 +81,6 @@
#include "mmddk.h"
#include "dsound.h"
#include "dsdriver.h"
#include "nas.h"
#include "wine/unicode.h"
#include "wine/debug.h"
@ -396,7 +395,7 @@ static void NAS_CloseDevice(WINE_WAVEOUT* wwo)
/******************************************************************
* NAS_WaveClose
*/
LONG NAS_WaveClose(void)
static LONG NAS_WaveClose(void)
{
nas_end(); /* free up nas server */
return 1;
@ -407,7 +406,7 @@ LONG NAS_WaveClose(void)
*
* Initialize internal structures from NAS server info
*/
LONG NAS_WaveInit(void)
static LONG NAS_WaveInit(void)
{
int i;
if (!nas_init()) return MMSYSERR_ERROR;
@ -1213,7 +1212,9 @@ DWORD WINAPI NAS_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
switch (wMsg) {
case DRVM_INIT:
return NAS_WaveInit();
case DRVM_EXIT:
return NAS_WaveClose();
case DRVM_ENABLE:
case DRVM_DISABLE:
/* FIXME: Pretend this is supported */

6
dlls/winenas.drv/nas.c
View File

@ -33,7 +33,6 @@
#include "wingdi.h"
#include "winuser.h"
#include "mmddk.h"
#include "nas.h"
/**************************************************************************
* DriverProc (WINENAS.@)
@ -43,9 +42,8 @@ LRESULT CALLBACK NAS_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
{
switch(wMsg) {
#ifdef HAVE_NAS
case DRV_LOAD: NAS_WaveInit();
return 1;
case DRV_FREE: return NAS_WaveClose();
case DRV_LOAD:
case DRV_FREE:
case DRV_OPEN:
case DRV_CLOSE:
case DRV_ENABLE:

28
dlls/winenas.drv/nas.h
View File

@ -1,28 +0,0 @@
/* Definition for NAS driver : wine multimedia system
*
* Copyright 2002 Nicolas Escuder <n.escuder@alineanet.com>
*
* 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
*/
#ifndef __WINE_NAS_H
#define __WINE_NAS_H
extern LONG NAS_WaveInit(void);
extern LONG NAS_WaveClose(void);
typedef unsigned int AFormat;
#endif /* __WINE_NAS_H */