Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
ce91ee44
Commit
ce91ee44
authored
14 years ago
by
Maarten Lankhorst
Committed by
Alexandre Julliard
14 years ago
Browse files
Options
Downloads
Patches
Plain Diff
winenas.drv: Move opening wave device to audio.c.
parent
0ceed8be
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/winenas.drv/audio.c
+4
-3
4 additions, 3 deletions
dlls/winenas.drv/audio.c
dlls/winenas.drv/nas.c
+2
-4
2 additions, 4 deletions
dlls/winenas.drv/nas.c
dlls/winenas.drv/nas.h
+0
-28
0 additions, 28 deletions
dlls/winenas.drv/nas.h
with
6 additions
and
35 deletions
dlls/winenas.drv/audio.c
+
4
−
3
View file @
ce91ee44
...
...
@@ -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 */
...
...
This diff is collapsed.
Click to expand it.
dlls/winenas.drv/nas.c
+
2
−
4
View file @
ce91ee44
...
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
dlls/winenas.drv/nas.h
deleted
100644 → 0
+
0
−
28
View file @
0ceed8be
/* 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 */
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment