Skip to content

W
wine-winehq
Commit 54751b23 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

Use round() instead of ceil() in wodGetPosition(TIME_SMPTE).

Fixes the corresponding winmm conformance test.
parent 3ce9c5f4
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
dlls/winmm/winealsa/audio.c
View file @ 54751b23
...@@ -1873,7 +1873,7 @@ static DWORD wodGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize) ...@@ -1873,7 +1873,7 @@ static DWORD wodGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize)
time -= lpTime->u.smpte.min * 60; time -= lpTime->u.smpte.min * 60;
lpTime->u.smpte.sec = time; lpTime->u.smpte.sec = time;
time -= lpTime->u.smpte.sec; time -= lpTime->u.smpte.sec;
lpTime->u.smpte.frame = ceil(time * 30); lpTime->u.smpte.frame = round(time * 30);
lpTime->u.smpte.fps = 30; lpTime->u.smpte.fps = 30;
TRACE("TIME_SMPTE=%02u:%02u:%02u:%02u\n", TRACE("TIME_SMPTE=%02u:%02u:%02u:%02u\n",
lpTime->u.smpte.hour, lpTime->u.smpte.min, lpTime->u.smpte.hour, lpTime->u.smpte.min,
......
dlls/winmm/winearts/audio.c
View file @ 54751b23
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
/*#define EMULATE_SB16*/ /*#define EMULATE_SB16*/
#include "config.h" #include "config.h"
#include "wine/port.h"
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>
...@@ -1427,7 +1428,7 @@ static DWORD wodGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize) ...@@ -1427,7 +1428,7 @@ static DWORD wodGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize)
time -= lpTime->u.smpte.min * 60; time -= lpTime->u.smpte.min * 60;
lpTime->u.smpte.sec = time; lpTime->u.smpte.sec = time;
time -= lpTime->u.smpte.sec; time -= lpTime->u.smpte.sec;
lpTime->u.smpte.frame = ceil(time * 30); lpTime->u.smpte.frame = round(time * 30);
lpTime->u.smpte.fps = 30; lpTime->u.smpte.fps = 30;
TRACE("TIME_SMPTE=%02u:%02u:%02u:%02u\n", TRACE("TIME_SMPTE=%02u:%02u:%02u:%02u\n",
lpTime->u.smpte.hour, lpTime->u.smpte.min, lpTime->u.smpte.hour, lpTime->u.smpte.min,
......
dlls/winmm/wineaudioio/audio.c
View file @ 54751b23
...@@ -1121,7 +1121,7 @@ static DWORD wodGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize) ...@@ -1121,7 +1121,7 @@ static DWORD wodGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize)
time -= lpTime->u.smpte.min * 60; time -= lpTime->u.smpte.min * 60;
lpTime->u.smpte.sec = time; lpTime->u.smpte.sec = time;
time -= lpTime->u.smpte.sec; time -= lpTime->u.smpte.sec;
lpTime->u.smpte.frame = ceil(time * 30); lpTime->u.smpte.frame = round(time * 30);
lpTime->u.smpte.fps = 30; lpTime->u.smpte.fps = 30;
TRACE("TIME_SMPTE=%02u:%02u:%02u:%02u\n", TRACE("TIME_SMPTE=%02u:%02u:%02u:%02u\n",
lpTime->u.smpte.hour, lpTime->u.smpte.min, lpTime->u.smpte.hour, lpTime->u.smpte.min,
......
dlls/winmm/winejack/audio.c
View file @ 54751b23
...@@ -1591,7 +1591,7 @@ static DWORD wodGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize) ...@@ -1591,7 +1591,7 @@ static DWORD wodGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize)
time -= lpTime->u.smpte.min * 60; time -= lpTime->u.smpte.min * 60;
lpTime->u.smpte.sec = time; lpTime->u.smpte.sec = time;
time -= lpTime->u.smpte.sec; time -= lpTime->u.smpte.sec;
lpTime->u.smpte.frame = ceil(time * 30); lpTime->u.smpte.frame = round(time * 30);
lpTime->u.smpte.fps = 30; lpTime->u.smpte.fps = 30;
TRACE("TIME_SMPTE=%02u:%02u:%02u:%02u\n", TRACE("TIME_SMPTE=%02u:%02u:%02u:%02u\n",
lpTime->u.smpte.hour, lpTime->u.smpte.min, lpTime->u.smpte.hour, lpTime->u.smpte.min,
......
dlls/winmm/winenas/audio.c
View file @ 54751b23
...@@ -1165,7 +1165,7 @@ static DWORD wodGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize) ...@@ -1165,7 +1165,7 @@ static DWORD wodGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize)
time -= lpTime->u.smpte.min * 60; time -= lpTime->u.smpte.min * 60;
lpTime->u.smpte.sec = time; lpTime->u.smpte.sec = time;
time -= lpTime->u.smpte.sec; time -= lpTime->u.smpte.sec;
lpTime->u.smpte.frame = ceil(time * 30); lpTime->u.smpte.frame = round(time * 30);
lpTime->u.smpte.fps = 30; lpTime->u.smpte.fps = 30;
TRACE("TIME_SMPTE=%02u:%02u:%02u:%02u\n", TRACE("TIME_SMPTE=%02u:%02u:%02u:%02u\n",
lpTime->u.smpte.hour, lpTime->u.smpte.min, lpTime->u.smpte.hour, lpTime->u.smpte.min,
......
dlls/winmm/wineoss/audio.c
View file @ 54751b23
...@@ -2123,7 +2123,7 @@ static DWORD wodGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize) ...@@ -2123,7 +2123,7 @@ static DWORD wodGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize)
time -= lpTime->u.smpte.min * 60; time -= lpTime->u.smpte.min * 60;
lpTime->u.smpte.sec = time; lpTime->u.smpte.sec = time;
time -= lpTime->u.smpte.sec; time -= lpTime->u.smpte.sec;
lpTime->u.smpte.frame = ceil(time * 30); lpTime->u.smpte.frame = round(time * 30);
lpTime->u.smpte.fps = 30; lpTime->u.smpte.fps = 30;
TRACE("TIME_SMPTE=%02u:%02u:%02u:%02u\n", TRACE("TIME_SMPTE=%02u:%02u:%02u:%02u\n",
lpTime->u.smpte.hour, lpTime->u.smpte.min, lpTime->u.smpte.hour, lpTime->u.smpte.min,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment