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
3d94ea82
Commit
3d94ea82
authored
Jun 22, 2010
by
Jörg Höhle
Committed by
Alexandre Julliard
Jun 23, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winealsa: Only linear PCM is supported.
parent
bee78503
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
27 deletions
+0
-27
alsa.c
dlls/winealsa.drv/alsa.c
+0
-15
waveout.c
dlls/winealsa.drv/waveout.c
+0
-12
No files found.
dlls/winealsa.drv/alsa.c
View file @
3d94ea82
...
...
@@ -358,10 +358,6 @@ void ALSA_copyFormat(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2)
iLength
=
sizeof
(
WAVEFORMATPCMEX
);
else
iLength
=
sizeof
(
WAVEFORMATEX
)
+
wf1
->
cbSize
;
if
(
iLength
>
sizeof
(
WAVEFORMATPCMEX
))
{
ERR
(
"calculated %u bytes, capping
\n
"
,
iLength
);
iLength
=
sizeof
(
WAVEFORMATPCMEX
);
}
memcpy
(
wf2
,
wf1
,
iLength
);
}
...
...
@@ -395,17 +391,6 @@ BOOL ALSA_supportedFormat(LPWAVEFORMATEX wf)
}
else
WARN
(
"only KSDATAFORMAT_SUBTYPE_PCM and KSDATAFORMAT_SUBTYPE_IEEE_FLOAT "
"supported
\n
"
);
}
else
if
(
wf
->
wFormatTag
==
WAVE_FORMAT_MULAW
||
wf
->
wFormatTag
==
WAVE_FORMAT_ALAW
)
{
if
(
wf
->
wBitsPerSample
==
8
)
return
TRUE
;
else
ERR
(
"WAVE_FORMAT_MULAW and WAVE_FORMAT_ALAW wBitsPerSample must = 8
\n
"
);
}
else
if
(
wf
->
wFormatTag
==
WAVE_FORMAT_ADPCM
)
{
if
(
wf
->
wBitsPerSample
==
4
)
return
TRUE
;
else
ERR
(
"WAVE_FORMAT_ADPCM wBitsPerSample must = 4
\n
"
);
}
else
WARN
(
"only WAVE_FORMAT_PCM and WAVE_FORMAT_EXTENSIBLE supported
\n
"
);
...
...
dlls/winealsa.drv/waveout.c
View file @
3d94ea82
...
...
@@ -716,18 +716,6 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
}
else
if
((
wwo
->
format
.
Format
.
wFormatTag
==
WAVE_FORMAT_EXTENSIBLE
)
&&
IsEqualGUID
(
&
wwo
->
format
.
SubFormat
,
&
KSDATAFORMAT_SUBTYPE_IEEE_FLOAT
)){
format
=
(
wwo
->
format
.
Format
.
wBitsPerSample
==
32
)
?
SND_PCM_FORMAT_FLOAT_LE
:
-
1
;
}
else
if
(
wwo
->
format
.
Format
.
wFormatTag
==
WAVE_FORMAT_MULAW
)
{
FIXME
(
"unimplemented format: WAVE_FORMAT_MULAW
\n
"
);
retcode
=
WAVERR_BADFORMAT
;
goto
errexit
;
}
else
if
(
wwo
->
format
.
Format
.
wFormatTag
==
WAVE_FORMAT_ALAW
)
{
FIXME
(
"unimplemented format: WAVE_FORMAT_ALAW
\n
"
);
retcode
=
WAVERR_BADFORMAT
;
goto
errexit
;
}
else
if
(
wwo
->
format
.
Format
.
wFormatTag
==
WAVE_FORMAT_ADPCM
)
{
FIXME
(
"unimplemented format: WAVE_FORMAT_ADPCM
\n
"
);
retcode
=
WAVERR_BADFORMAT
;
goto
errexit
;
}
else
{
ERR
(
"invalid format: %0x04x
\n
"
,
wwo
->
format
.
Format
.
wFormatTag
);
retcode
=
WAVERR_BADFORMAT
;
...
...
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