Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
41d9d0a2
Commit
41d9d0a2
authored
Mar 28, 2011
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winecoreaudio.drv: Remove unnecessary ifdefs.
parent
6a4c47c9
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
1 addition
and
66 deletions
+1
-66
audio.c
dlls/winecoreaudio.drv/audio.c
+0
-27
audiounit.c
dlls/winecoreaudio.drv/audiounit.c
+0
-4
coreaudio.c
dlls/winecoreaudio.drv/coreaudio.c
+1
-5
coremidi.c
dlls/winecoreaudio.drv/coremidi.c
+0
-3
midi.c
dlls/winecoreaudio.drv/midi.c
+0
-16
mixer.c
dlls/winecoreaudio.drv/mixer.c
+0
-11
No files found.
dlls/winecoreaudio.drv/audio.c
View file @
41d9d0a2
...
...
@@ -59,9 +59,6 @@
#include "wine/list.h"
WINE_DEFAULT_DEBUG_CHANNEL
(
wave
);
#if defined(HAVE_COREAUDIO_COREAUDIO_H) && defined(HAVE_AUDIOUNIT_AUDIOUNIT_H)
WINE_DECLARE_DEBUG_CHANNEL
(
coreaudio
);
/*
...
...
@@ -2547,27 +2544,3 @@ OSStatus CoreAudio_wiAudioUnitIOProc(void *inRefCon,
if
(
needNotify
)
wodSendNotifyInputCompletionsMessage
(
wwi
);
return
err
;
}
#else
/**************************************************************************
* widMessage (WINECOREAUDIO.6)
*/
DWORD
WINAPI
CoreAudio_widMessage
(
WORD
wDevID
,
WORD
wMsg
,
DWORD
dwUser
,
DWORD
dwParam1
,
DWORD
dwParam2
)
{
FIXME
(
"(%u, %04X, %08X, %08X, %08X): CoreAudio support not compiled into wine
\n
"
,
wDevID
,
wMsg
,
dwUser
,
dwParam1
,
dwParam2
);
return
MMSYSERR_NOTENABLED
;
}
/**************************************************************************
* wodMessage (WINECOREAUDIO.7)
*/
DWORD
WINAPI
CoreAudio_wodMessage
(
WORD
wDevID
,
WORD
wMsg
,
DWORD
dwUser
,
DWORD
dwParam1
,
DWORD
dwParam2
)
{
FIXME
(
"(%u, %04X, %08X, %08X, %08X): CoreAudio support not compiled into wine
\n
"
,
wDevID
,
wMsg
,
dwUser
,
dwParam1
,
dwParam2
);
return
MMSYSERR_NOTENABLED
;
}
#endif
dlls/winecoreaudio.drv/audiounit.c
View file @
41d9d0a2
...
...
@@ -20,8 +20,6 @@
#include "config.h"
#ifdef HAVE_AUDIOUNIT_AUDIOUNIT_H
#define ULONG CoreFoundation_ULONG
#define HRESULT CoreFoundation_HRESULT
#ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H
...
...
@@ -503,5 +501,3 @@ int SynthUnit_Close(AUGraph graph)
return
1
;
}
#endif
dlls/winecoreaudio.drv/coreaudio.c
View file @
41d9d0a2
...
...
@@ -34,7 +34,6 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
coreaudio
);
#ifdef HAVE_COREAUDIO_COREAUDIO_H
/**************************************************************************
* CoreAudio_drvLoad [internal]
...
...
@@ -80,7 +79,6 @@ static DWORD CoreAudio_drvClose(DWORD dwDevID)
TRACE
(
"(%08x)
\n
"
,
dwDevID
);
return
1
;
}
#endif
/* HAVE_COREAUDIO_COREAUDIO_H */
/**************************************************************************
* DriverProc (WINECOREAUDIO.1)
...
...
@@ -100,9 +98,8 @@ LRESULT CALLBACK CoreAudio_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
wMsg
==
DRV_INSTALL
?
"DRV_INSTALL"
:
wMsg
==
DRV_REMOVE
?
"DRV_REMOVE"
:
"UNKNOWN"
,
wMsg
,
dwParam1
,
dwParam2
);
switch
(
wMsg
)
{
#ifdef HAVE_COREAUDIO_COREAUDIO_H
case
DRV_LOAD
:
return
CoreAudio_drvLoad
();
case
DRV_FREE
:
return
CoreAudio_drvFree
();
case
DRV_OPEN
:
return
CoreAudio_drvOpen
((
LPSTR
)
dwParam1
);
...
...
@@ -113,7 +110,6 @@ LRESULT CALLBACK CoreAudio_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
case
DRV_CONFIGURE
:
MessageBoxA
(
0
,
"CoreAudio driver!"
,
"CoreAudio driver"
,
MB_OK
);
return
1
;
case
DRV_INSTALL
:
return
DRVCNF_RESTART
;
case
DRV_REMOVE
:
return
DRVCNF_RESTART
;
#endif
default:
return
DefDriverProc
(
dwDevID
,
hDriv
,
wMsg
,
dwParam1
,
dwParam2
);
}
...
...
dlls/winecoreaudio.drv/coremidi.c
View file @
41d9d0a2
...
...
@@ -21,8 +21,6 @@
#include "config.h"
#ifdef HAVE_COREAUDIO_COREAUDIO_H
#include <CoreMIDI/CoreMIDI.h>
#include <mach/mach_time.h>
...
...
@@ -84,4 +82,3 @@ void MIDIOut_Send(MIDIPortRef port, MIDIEndpointRef dest, UInt8 *buffer, unsigne
if
(
packet
)
MIDISend
(
port
,
dest
,
packetList
);
}
#endif
/* HAVE_COREAUDIO_COREAUDIO_H */
dlls/winecoreaudio.drv/midi.c
View file @
41d9d0a2
...
...
@@ -44,7 +44,6 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
midi
);
#if defined(HAVE_COREAUDIO_COREAUDIO_H)
#include <CoreAudio/CoreAudio.h>
#define WINE_DEFINITIONS
...
...
@@ -1021,18 +1020,3 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw
}
return
MMSYSERR_NOTSUPPORTED
;
}
#else
DWORD
WINAPI
CoreAudio_modMessage
(
UINT
wDevID
,
UINT
wMsg
,
DWORD
dwUser
,
DWORD
dwParam1
,
DWORD
dwParam2
)
{
TRACE
(
"%08x, %08x, %08x, %08x, %08x
\n
"
,
wDevID
,
wMsg
,
dwUser
,
dwParam1
,
dwParam2
);
return
MMSYSERR_NOTENABLED
;
}
DWORD
WINAPI
CoreAudio_midMessage
(
UINT
wDevID
,
UINT
wMsg
,
DWORD
dwUser
,
DWORD
dwParam1
,
DWORD
dwParam2
)
{
TRACE
(
"%08x, %08x, %08x, %08x, %08x
\n
"
,
wDevID
,
wMsg
,
dwUser
,
dwParam1
,
dwParam2
);
return
MMSYSERR_NOTENABLED
;
}
#endif
dlls/winecoreaudio.drv/mixer.c
View file @
41d9d0a2
...
...
@@ -43,7 +43,6 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
mixer
);
#if defined(HAVE_COREAUDIO_COREAUDIO_H)
#include <CoreAudio/CoreAudio.h>
#include <CoreFoundation/CoreFoundation.h>
...
...
@@ -1027,13 +1026,3 @@ DWORD WINAPI CoreAudio_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
return
MMSYSERR_NOTSUPPORTED
;
}
}
#else
DWORD
WINAPI
CoreAudio_mxdMessage
(
UINT
wDevID
,
UINT
wMsg
,
DWORD_PTR
dwUser
,
DWORD_PTR
dwParam1
,
DWORD_PTR
dwParam2
)
{
TRACE
(
"(%04X, %04x, %08lX, %08lX, %08lX);
\n
"
,
wDevID
,
wMsg
,
dwUser
,
dwParam1
,
dwParam2
);
return
MMSYSERR_NOTENABLED
;
}
#endif
/* HAVE_COREAUDIO_COREAUDIO_H */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment