aboutsummaryrefslogtreecommitdiffstats
path: root/Alc/null.c
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2010-11-21 06:32:59 -0800
committerChris Robinson <[email protected]>2010-11-21 06:32:59 -0800
commita7b4e0b5c5eefb8476836aad094035bd0a5cbcd5 (patch)
tree3a1d54115f2557e5540297625f20961b8b148e62 /Alc/null.c
parentbbb45e326c049aef5b4d7e86021f365d206d8bb3 (diff)
Get rid of the device timer stuff
Diffstat (limited to 'Alc/null.c')
-rw-r--r--Alc/null.c24
1 files changed, 2 insertions, 22 deletions
diff --git a/Alc/null.c b/Alc/null.c
index ad3d3f6a..ffff4224 100644
--- a/Alc/null.c
+++ b/Alc/null.c
@@ -30,9 +30,6 @@ typedef struct {
ALvoid *buffer;
ALuint size;
- ALuint startTime;
- ALuint64 baseTime;
-
volatile int killNow;
ALvoid *thread;
} null_data;
@@ -50,7 +47,7 @@ static ALuint NullProc(ALvoid *ptr)
Device->Frequency / 2;
done = 0;
- start = data->startTime;
+ start = timeGetTime();
while(!data->killNow && Device->Connected)
{
now = timeGetTime();
@@ -115,9 +112,6 @@ static ALCboolean null_reset_playback(ALCdevice *device)
}
SetDefaultWFXChannelOrder(device);
- device->TimeRes = 1000000;
-
- data->startTime = timeGetTime();
data->thread = StartThread(NullProc, device);
if(data->thread == NULL)
{
@@ -132,7 +126,6 @@ static ALCboolean null_reset_playback(ALCdevice *device)
static void null_stop_playback(ALCdevice *device)
{
null_data *data = (null_data*)device->ExtraData;
- ALuint ext;
if(!data->thread)
return;
@@ -143,9 +136,6 @@ static void null_stop_playback(ALCdevice *device)
data->killNow = 0;
- ext = timeGetTime() - data->startTime;
- data->baseTime += (ALuint64)ext * 1000000;
-
free(data->buffer);
data->buffer = NULL;
}
@@ -158,15 +148,6 @@ static ALCboolean null_open_capture(ALCdevice *device, const ALCchar *deviceName
return ALC_FALSE;
}
-static ALuint64 null_get_time(ALCdevice *Device)
-{
- null_data *data = (null_data*)Device->ExtraData;
- ALuint ext = 0;
- if(data->thread)
- ext = timeGetTime() - data->startTime;
- return data->baseTime + ((ALuint64)ext * 1000000);
-}
-
BackendFuncs null_funcs = {
null_open_playback,
@@ -178,8 +159,7 @@ BackendFuncs null_funcs = {
NULL,
NULL,
NULL,
- NULL,
- null_get_time
+ NULL
};
void alc_null_init(BackendFuncs *func_list)