2014-06-13 13:47:13 -07:00
|
|
|
From 5b3f36aed665d2edb524eda22908664442234184 Mon Sep 17 00:00:00 2001
|
2013-12-06 12:09:21 -08:00
|
|
|
From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
|
2014-06-13 13:47:13 -07:00
|
|
|
Date: Sat, 8 Feb 2014 16:08:55 +0100
|
2013-12-06 12:09:21 -08:00
|
|
|
Subject: [PATCH 30/42] winepulse: fix unneeded free in write..
|
|
|
|
|
|
|
|
---
|
|
|
|
dlls/winepulse.drv/mmdevdrv.c | 6 +++++-
|
|
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c
|
|
|
|
index a4575d5..3ca68fd 100644
|
|
|
|
--- a/dlls/winepulse.drv/mmdevdrv.c
|
|
|
|
+++ b/dlls/winepulse.drv/mmdevdrv.c
|
|
|
|
@@ -1886,6 +1886,10 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface,
|
|
|
|
return hr;
|
|
|
|
}
|
|
|
|
|
|
|
|
+static void pulse_free_noop(void *buf)
|
|
|
|
+{
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
static HRESULT WINAPI AudioRenderClient_ReleaseBuffer(
|
|
|
|
IAudioRenderClient *iface, UINT32 written_frames, DWORD flags)
|
|
|
|
{
|
|
|
|
@@ -1921,7 +1925,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer(
|
|
|
|
if (This->locked_ptr)
|
|
|
|
pa_stream_write(This->stream, This->locked_ptr, written_bytes, NULL, 0, PA_SEEK_RELATIVE);
|
|
|
|
else
|
|
|
|
- pa_stream_write(This->stream, This->tmp_buffer, written_bytes, NULL, 0, PA_SEEK_RELATIVE);
|
|
|
|
+ pa_stream_write(This->stream, This->tmp_buffer, written_bytes, pulse_free_noop, 0, PA_SEEK_RELATIVE);
|
|
|
|
This->pad += written_bytes;
|
|
|
|
This->locked_ptr = NULL;
|
|
|
|
TRACE("Released %u, pad %zu\n", written_frames, This->pad / pa_frame_size(&This->ss));
|
|
|
|
--
|
2014-01-05 16:26:32 -08:00
|
|
|
1.8.5.2
|
2013-12-06 12:09:21 -08:00
|
|
|
|