Module: wine Branch: master Commit: 158a9e738421cd16f2e8296f11baa724c64c8ca7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=158a9e738421cd16f2e8296f1...
Author: Akihiro Sagawa sagawa.aki@gmail.com Date: Wed Jan 20 22:23:46 2021 +0900
winmm: Get rid of TIME_SMPTE format support in waveOutGetPosition().
Signed-off-by: Akihiro Sagawa sagawa.aki@gmail.com Signed-off-by: Andrew Eikum aeikum@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/winmm/tests/wave.c | 2 +- dlls/winmm/waveform.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 786e724c0f0..8afb32d5c73 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -527,7 +527,7 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime)); ok(rc==MMSYSERR_NOERROR, "waveOutGetPosition(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); - todo_wine ok(mmtime.wType == TIME_BYTES, "(waveOutGetPosition(%s): returned %s\n", + ok(mmtime.wType == TIME_BYTES, "(waveOutGetPosition(%s): returned %s\n", dev_name(device), wave_time_format(mmtime.wType)); returned = time_to_bytes(&mmtime, pwfx); ok(returned == bytes, "waveOutGetPosition(%s): SMPTE test failed\n", diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 876b9d3d91d..37dfc919174 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2038,16 +2038,6 @@ static MMRESULT WINMM_FramesToMMTime(MMTIME *time, UINT32 played_frames, case TIME_SAMPLES: time->u.sample = played_frames; return MMSYSERR_NOERROR; - case TIME_SMPTE: - time->u.smpte.fps = 30; - played_frames += sample_rate / time->u.smpte.fps - 1; /* round up */ - time->u.smpte.frame = (played_frames % sample_rate) * time->u.smpte.fps / sample_rate; - played_frames /= sample_rate; /* yields seconds */ - time->u.smpte.sec = played_frames % 60; - played_frames /= 60; - time->u.smpte.min = played_frames % 60; - time->u.smpte.hour= played_frames / 60; - return MMSYSERR_NOERROR; default: time->wType = TIME_BYTES; /* fall through */