Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
927f0530
Commit
927f0530
authored
Nov 08, 2022
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
faudio: Import upstream release 22.11.
parent
1d636da2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
12 deletions
+20
-12
FAudio.h
libs/faudio/include/FAudio.h
+1
-1
FACT.c
libs/faudio/src/FACT.c
+0
-1
FAudio.c
libs/faudio/src/FAudio.c
+17
-10
FAudioFX_reverb.c
libs/faudio/src/FAudioFX_reverb.c
+2
-0
No files found.
libs/faudio/include/FAudio.h
View file @
927f0530
...
...
@@ -485,7 +485,7 @@ extern FAudioGUID DATAFORMAT_SUBTYPE_IEEE_FLOAT;
#define FAUDIO_ABI_VERSION 0
#define FAUDIO_MAJOR_VERSION 22
#define FAUDIO_MINOR_VERSION
8
#define FAUDIO_MINOR_VERSION
11
#define FAUDIO_PATCH_VERSION 0
#define FAUDIO_COMPILED_VERSION ( \
...
...
libs/faudio/src/FACT.c
View file @
927f0530
...
...
@@ -2409,7 +2409,6 @@ uint32_t FACTCue_Destroy(FACTCue *pCue)
{
FACTCue
*
cue
,
*
prev
;
FAudioMutex
mutex
;
FACTNotification
note
;
if
(
pCue
==
NULL
)
{
return
1
;
...
...
libs/faudio/src/FAudio.c
View file @
927f0530
...
...
@@ -678,16 +678,27 @@ uint32_t FAudio_CreateMasteringVoice(
uint32_t
DeviceIndex
,
const
FAudioEffectChain
*
pEffectChain
)
{
FAudioDeviceDetails
details
;
LOG_API_ENTER
(
audio
)
/* For now we only support one allocated master voice at a time */
FAudio_assert
(
audio
->
master
==
NULL
);
if
(
FAudio_GetDeviceDetails
(
audio
,
DeviceIndex
,
&
details
)
!=
0
)
if
(
InputChannels
==
FAUDIO_DEFAULT_CHANNELS
||
InputSampleRate
==
FAUDIO_DEFAULT_SAMPLERATE
)
{
return
FAUDIO_E_INVALID_CALL
;
FAudioDeviceDetails
details
;
if
(
FAudio_GetDeviceDetails
(
audio
,
DeviceIndex
,
&
details
)
!=
0
)
{
return
FAUDIO_E_INVALID_CALL
;
}
if
(
InputChannels
==
FAUDIO_DEFAULT_CHANNELS
)
{
InputChannels
=
details
.
OutputFormat
.
Format
.
nChannels
;
}
if
(
InputSampleRate
==
FAUDIO_DEFAULT_SAMPLERATE
)
{
InputSampleRate
=
details
.
OutputFormat
.
Format
.
nSamplesPerSec
;
}
}
*
ppMasteringVoice
=
(
FAudioMasteringVoice
*
)
audio
->
pMalloc
(
sizeof
(
FAudioVoice
));
...
...
@@ -704,12 +715,8 @@ uint32_t FAudio_CreateMasteringVoice(
(
*
ppMasteringVoice
)
->
volume
=
1
.
0
f
;
/* Master Properties */
(
*
ppMasteringVoice
)
->
master
.
inputChannels
=
(
InputChannels
==
FAUDIO_DEFAULT_CHANNELS
)
?
details
.
OutputFormat
.
Format
.
nChannels
:
InputChannels
;
(
*
ppMasteringVoice
)
->
master
.
inputSampleRate
=
(
InputSampleRate
==
FAUDIO_DEFAULT_SAMPLERATE
)
?
details
.
OutputFormat
.
Format
.
nSamplesPerSec
:
InputSampleRate
;
(
*
ppMasteringVoice
)
->
master
.
inputChannels
=
InputChannels
;
(
*
ppMasteringVoice
)
->
master
.
inputSampleRate
=
InputSampleRate
;
/* Sends/Effects */
FAudio_zero
(
&
(
*
ppMasteringVoice
)
->
sends
,
sizeof
(
FAudioVoiceSends
));
...
...
libs/faudio/src/FAudioFX_reverb.c
View file @
927f0530
...
...
@@ -130,11 +130,13 @@ static inline float DspDelay_Process(DspDelay *filter, float sample_in)
return
delay_out
;
}
/* FIXME: This is currently unused! What was it for...? -flibit
static inline float DspDelay_Tap(DspDelay *filter, uint32_t delay)
{
FAudio_assert(delay <= filter->delay);
return filter->buffer[(filter->write_idx - delay + filter->capacity) % filter->capacity];
}
*/
static
inline
void
DspDelay_Reset
(
DspDelay
*
filter
)
{
...
...
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