ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winealsa: Cosmetic stuff.

This commit is contained in:
Maarten Lankhorst 2007-01-29 16:27:14 +01:00 committed by Alexandre Julliard
parent 2d2feb0700
commit 2db89f8fa5
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/winealsa.drv/alsa.c
View File

@ -44,12 +44,13 @@
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(wave); WINE_DEFAULT_DEBUG_CHANNEL(alsa);
/* unless someone makes a wineserver kernel module, Unix pipes are faster than win32 events */ /* unless someone makes a wineserver kernel module, Unix pipes are faster than win32 events */
#define USE_PIPE_SYNC #define USE_PIPE_SYNC
#ifdef USE_PIPE_SYNC #ifdef USE_PIPE_SYNC
#define INIT_OMR(omr) do { if (pipe(omr->msg_pipe) < 0) { omr->msg_pipe[0] = omr->msg_pipe[1] = -1; } } while (0)
#define CLOSE_OMR(Omr) do { close(omr->msg_pipe[0]); close(omr->msg_pipe[1]); } while (0)
#define SIGNAL_OMR(omr) do { int x = 0; write((omr)->msg_pipe[1], &x, sizeof(x)); } while (0) #define SIGNAL_OMR(omr) do { int x = 0; write((omr)->msg_pipe[1], &x, sizeof(x)); } while (0)
#define CLEAR_OMR(omr) do { int x = 0; read((omr)->msg_pipe[0], &x, sizeof(x)); } while (0) #define CLEAR_OMR(omr) do { int x = 0; read((omr)->msg_pipe[0], &x, sizeof(x)); } while (0)
#define RESET_OMR(omr) do { } while (0) #define RESET_OMR(omr) do { } while (0)
@ -57,6 +58,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave);
do { struct pollfd pfd; pfd.fd = (omr)->msg_pipe[0]; \ do { struct pollfd pfd; pfd.fd = (omr)->msg_pipe[0]; \
pfd.events = POLLIN; poll(&pfd, 1, sleep); } while (0) pfd.events = POLLIN; poll(&pfd, 1, sleep); } while (0)
#else #else
#define INIT_OMR(omr) do { omr->msg_event = CreateEventW(NULL, FALSE, FALSE, NULL); } while (0)
#define CLOSE_OMR(omr) do { CloseHandle(omr->msg_event); } while (0)
#define SIGNAL_OMR(omr) do { SetEvent((omr)->msg_event); } while (0) #define SIGNAL_OMR(omr) do { SetEvent((omr)->msg_event); } while (0)
#define CLEAR_OMR(omr) do { } while (0) #define CLEAR_OMR(omr) do { } while (0)
#define RESET_OMR(omr) do { ResetEvent((omr)->msg_event); } while (0) #define RESET_OMR(omr) do { ResetEvent((omr)->msg_event); } while (0)
@ -76,15 +79,7 @@ int ALSA_InitRingMessage(ALSA_MSG_RING* omr)
{ {
omr->msg_toget = 0; omr->msg_toget = 0;
omr->msg_tosave = 0; omr->msg_tosave = 0;
#ifdef USE_PIPE_SYNC INIT_OMR(omr);
if (pipe(omr->msg_pipe) < 0) {
omr->msg_pipe[0] = -1;
omr->msg_pipe[1] = -1;
ERR("could not create pipe, error=%s\n", strerror(errno));
}
#else
omr->msg_event = CreateEventW(NULL, FALSE, FALSE, NULL);
#endif
omr->ring_buffer_size = ALSA_RING_BUFFER_INCREMENT; omr->ring_buffer_size = ALSA_RING_BUFFER_INCREMENT;
omr->messages = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,omr->ring_buffer_size * sizeof(ALSA_MSG)); omr->messages = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,omr->ring_buffer_size * sizeof(ALSA_MSG));
@ -99,12 +94,7 @@ int ALSA_InitRingMessage(ALSA_MSG_RING* omr)
*/ */
int ALSA_DestroyRingMessage(ALSA_MSG_RING* omr) int ALSA_DestroyRingMessage(ALSA_MSG_RING* omr)
{ {
#ifdef USE_PIPE_SYNC CLOSE_OMR(omr);
close(omr->msg_pipe[0]);
close(omr->msg_pipe[1]);
#else
CloseHandle(omr->msg_event);
#endif
HeapFree(GetProcessHeap(),0,omr->messages); HeapFree(GetProcessHeap(),0,omr->messages);
omr->ring_buffer_size = 0; omr->ring_buffer_size = 0;
omr->msg_crst.DebugInfo->Spare[0] = 0; omr->msg_crst.DebugInfo->Spare[0] = 0;
@ -144,7 +134,6 @@ int ALSA_AddRingMessage(ALSA_MSG_RING* omr, enum win_wm_message msg, DWORD param
{ {
int old_ring_buffer_size = omr->ring_buffer_size; int old_ring_buffer_size = omr->ring_buffer_size;
omr->ring_buffer_size += ALSA_RING_BUFFER_INCREMENT; omr->ring_buffer_size += ALSA_RING_BUFFER_INCREMENT;
TRACE("omr->ring_buffer_size=%d\n",omr->ring_buffer_size);
omr->messages = HeapReAlloc(GetProcessHeap(),0,omr->messages, omr->ring_buffer_size * sizeof(ALSA_MSG)); omr->messages = HeapReAlloc(GetProcessHeap(),0,omr->messages, omr->ring_buffer_size * sizeof(ALSA_MSG));
/* Now we need to rearrange the ring buffer so that the new /* Now we need to rearrange the ring buffer so that the new
buffers just allocated are in between omr->msg_tosave and buffers just allocated are in between omr->msg_tosave and