system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-04 20:47:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

mp3dmod: Use the bundled mpg123 and build with msvcrt.

Browse source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2021-10-21 11:40:09 +02:00
parent bafb747d2d
commit 2113c42263
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dlls/mp3dmod/Makefile.in
View file

@ -1,9 +1,6 @@
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

5
dlls/mp3dmod/mp3dmod.c
View file

@ -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: %zd/%u\n", written, framesize);
ERR("short write: %Id/%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;