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
2113c422
Commit
2113c422
authored
Oct 21, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mp3dmod: Use the bundled mpg123 and build with msvcrt.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
bafb747d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
8 deletions
+4
-8
Makefile.in
dlls/mp3dmod/Makefile.in
+2
-5
mp3dmod.c
dlls/mp3dmod/mp3dmod.c
+2
-3
No files found.
dlls/mp3dmod/Makefile.in
View file @
2113c422
MODULE
=
mp3dmod.dll
IMPORTS
=
dmoguids msdmo ole32 uuid wmcodecdspuuid
EXTRAINCL
=
$(MPG123_CFLAGS)
EXTRALIBS
=
$(MPG123_LIBS)
EXTRADLLFLAGS
=
-mcygwin
IMPORTS
=
$(MPG123_PE_LIBS)
dmoguids msdmo ole32 uuid wmcodecdspuuid kernelbase
EXTRAINCL
=
$(MPG123_PE_CFLAGS)
C_SRCS
=
\
mp3dmod.c
...
...
dlls/mp3dmod/mp3dmod.c
View file @
2113c422
...
...
@@ -513,7 +513,7 @@ static HRESULT WINAPI MediaObject_ProcessOutput(IMediaObject *iface, DWORD flags
else
if
(
err
!=
MPG123_OK
)
ERR
(
"mpg123_read() returned %d
\n
"
,
err
);
if
(
written
<
framesize
)
ERR
(
"short write: %
z
d/%u
\n
"
,
written
,
framesize
);
ERR
(
"short write: %
I
d/%u
\n
"
,
written
,
framesize
);
got_data
=
1
;
...
...
@@ -668,7 +668,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **obj)
*/
HRESULT
WINAPI
DllRegisterServer
(
void
)
{
static
const
WCHAR
nameW
[]
=
{
'M'
,
'P'
,
'3'
,
' '
,
'D'
,
'e'
,
'c'
,
'o'
,
'd'
,
'e'
,
'r'
,
' '
,
'D'
,
'M'
,
'O'
,
0
};
DMO_PARTIAL_MEDIATYPE
in
,
out
;
HRESULT
hr
;
...
...
@@ -676,7 +675,7 @@ HRESULT WINAPI DllRegisterServer(void)
in
.
subtype
=
WMMEDIASUBTYPE_MP3
;
out
.
type
=
WMMEDIATYPE_Audio
;
out
.
subtype
=
WMMEDIASUBTYPE_PCM
;
hr
=
DMORegister
(
nameW
,
&
CLSID_CMP3DecMediaObject
,
&
DMOCATEGORY_AUDIO_DECODER
,
hr
=
DMORegister
(
L"MP3 Decoder DMO"
,
&
CLSID_CMP3DecMediaObject
,
&
DMOCATEGORY_AUDIO_DECODER
,
0
,
1
,
&
in
,
1
,
&
out
);
if
(
FAILED
(
hr
))
return
hr
;
...
...
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