March 2009 - Wine-commits - list.winehq.org

Francois Gouget : wineesd.drv: Improve the accuracy of wodUpdatePlayedTotal ().
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 14d2c98834f9f50263229f7d1718def8c4aa6953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14d2c98834f9f50263229f7d1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Mar 28 11:48:38 2009 +0100 wineesd.drv: Improve the accuracy of wodUpdatePlayedTotal(). We do so by querying the EsounD latency and estimating dwPlayedTotal based on the elapsed time since the last write. This benefits the accuracy of the completion notifications and of wodGetPosition(). --- dlls/wineesd.drv/audio.c | 47 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index eefc624..9fde808 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -179,6 +179,8 @@ typedef struct { DWORD dwPlayedTotal; /* number of bytes actually played since opening */ DWORD dwWrittenTotal; /* number of bytes written to the audio device since opening */ + DWORD dwLastWrite; /* Time of last write */ + DWORD dwLatency; /* Num of milliseconds between when data is sent to the server and when it is played */ /* synchronization stuff */ HANDLE hStartUpEvent; @@ -672,13 +674,31 @@ static DWORD wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD_PTR dwParam1, /************************************************************************** * wodUpdatePlayedTotal [internal] * + * dwPlayedTotal is used for wodPlayer_NotifyCompletions() and + * wodGetPosition(), so a byte must only be reported as played once it has + * reached the speakers. So give our best estimate based on the latency + * reported by the esd server, and on the elapsed time since the last byte + * was sent to the server. */ -static BOOL wodUpdatePlayedTotal(WINE_WAVEOUT* wwo) +static void wodUpdatePlayedTotal(WINE_WAVEOUT* wwo) { - /* total played is the bytes written less the bytes to write ;-) */ - wwo->dwPlayedTotal = wwo->dwWrittenTotal; + DWORD elapsed; - return TRUE; + if (wwo->dwPlayedTotal == wwo->dwWrittenTotal) + return; + + /* GetTickCount() wraps every now and then, but these being all unsigned it's ok */ + elapsed = GetTickCount() - wwo->dwLastWrite; + if (elapsed < wwo->dwLatency) + { + wwo->dwPlayedTotal = wwo->dwWrittenTotal - (wwo->dwLatency - elapsed) * wwo->waveFormat.Format.nAvgBytesPerSec / 1000; + TRACE("written=%u - elapsed=%u -> played=%u\n", wwo->dwWrittenTotal, elapsed, wwo->dwPlayedTotal); + } + else + { + wwo->dwPlayedTotal = wwo->dwWrittenTotal; + TRACE("elapsed=%u -> played=written=%u\n", elapsed, wwo->dwPlayedTotal); + } } /************************************************************************** @@ -783,6 +803,7 @@ static int wodPlayer_WriteMaxFrags(WINE_WAVEOUT* wwo) { DWORD dwLength = wwo->lpPlayPtr->dwBufferLength - wwo->dwPartialOffset; int written; + DWORD now; TRACE("Writing wavehdr %p.%u[%u]\n", wwo->lpPlayPtr, wwo->dwPartialOffset, wwo->lpPlayPtr->dwBufferLength); @@ -794,8 +815,10 @@ static int wodPlayer_WriteMaxFrags(WINE_WAVEOUT* wwo) TRACE("write(%u) failed, errno=%d\n", dwLength, errno); return 0; } - TRACE("Wrote %d bytes out of %u\n", written, dwLength); + now = GetTickCount(); + TRACE("Wrote %d bytes out of %u, %ums since last\n", written, dwLength, now-wwo->dwLastWrite); + wwo->dwLastWrite = now; wwo->dwWrittenTotal += written; /* update stats on this wave device */ if (written == dwLength) { @@ -1159,10 +1182,22 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwo->stream_name = get_stream_name("out", wDevID); wwo->stream_id = 0; - wwo->esd_fd = -1; wwo->dwPlayedTotal = 0; wwo->dwWrittenTotal = 0; + wwo->esd_fd = esd_open_sound(NULL); + if (wwo->esd_fd >= 0) + { + wwo->dwLatency = 1000 * esd_get_latency(wwo->esd_fd) * 4 / wwo->waveFormat.Format.nAvgBytesPerSec; + } + else + { + WARN("esd_open_sound() failed"); + /* just do a rough guess at the latency and continue anyway */ + wwo->dwLatency = 1000 * (2 * ESD_BUF_SIZE) / out_rate; + } + TRACE("dwLatency = %ums\n", wwo->dwLatency); + /* ESD_BUF_SIZE is the socket buffer size in samples. Set dwSleepTime * to a fraction of that so it never get empty. */

1 0

Alexandre Julliard : ntdll: Remove no longer used pthread_functions structure.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 5170b1b456aac69010f947be7f79b73daad1dabf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5170b1b456aac69010f947be7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 15:04:51 2009 +0200 ntdll: Remove no longer used pthread_functions structure. --- dlls/ntdll/thread.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index a69746c..8c6d72c 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -37,7 +37,6 @@ #include "winternl.h" #include "wine/library.h" #include "wine/server.h" -#include "wine/pthread.h" #include "wine/debug.h" #include "ntdll_misc.h" #include "ddk/wdm.h" @@ -69,9 +68,6 @@ static size_t sigstack_total_size; static ULONG sigstack_zero_bits; static int nb_threads = 1; -static struct wine_pthread_functions pthread_functions; - - static RTL_CRITICAL_SECTION ldt_section; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = { @@ -289,7 +285,6 @@ HANDLE thread_init(void) thread_data->debug_info = &debug_info; InsertHeadList( &tls_links, &teb->TlsLinks ); - wine_pthread_get_functions( &pthread_functions, sizeof(pthread_functions) ); signal_init_thread( teb ); virtual_init_threading();

1 0

Alexandre Julliard : loader: Don't bother checking for pthread.h existence, we require it anyway.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 17c09347c0e3e814698f8a6fe98b00c33d5e92cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c09347c0e3e814698f8a6fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 15:05:07 2009 +0200 loader: Don't bother checking for pthread.h existence, we require it anyway. --- dlls/ntdll/ntdll_misc.h | 4 +--- loader/main.c | 4 +--- loader/main.h | 2 -- loader/pthread.c | 45 --------------------------------------------- 4 files changed, 2 insertions(+), 53 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 56e2b2f..75e60ef 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -22,9 +22,7 @@ #include <stdarg.h> #include <signal.h> #include <sys/types.h> -#ifdef HAVE_PTHREAD_H -# include <pthread.h> -#endif +#include <pthread.h> #include "windef.h" #include "winnt.h" diff --git a/loader/main.c b/loader/main.c index 4c2cb50..c3189ec 100644 --- a/loader/main.c +++ b/loader/main.c @@ -33,9 +33,7 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#ifdef HAVE_PTHREAD_H -# include <pthread.h> -#endif +#include <pthread.h> #include "wine/library.h" #include "main.h" diff --git a/loader/main.h b/loader/main.h index 0c6fc84..b06423f 100644 --- a/loader/main.h +++ b/loader/main.h @@ -22,8 +22,6 @@ #ifndef __WINE_LOADER_MAIN_H #define __WINE_LOADER_MAIN_H -#include "wine/pthread.h" - struct wine_preload_info { void *addr; diff --git a/loader/pthread.c b/loader/pthread.c index e4e0831..712bd37 100644 --- a/loader/pthread.c +++ b/loader/pthread.c @@ -39,9 +39,7 @@ #include <sys/ucontext.h> #include <sys/thr.h> #endif -#ifdef HAVE_PTHREAD_H #include <pthread.h> -#endif #ifdef HAVE_PTHREAD_NP_H #include <pthread_np.h> #endif @@ -49,8 +47,6 @@ #include "wine/library.h" #include "wine/pthread.h" -#ifdef HAVE_PTHREAD_H - static int init_done; static int nb_threads = 1; @@ -223,47 +219,6 @@ static void DECLSPEC_NORETURN abort_thread( long status ) pthread_exit( (void *)status ); } -#else /* HAVE_PTHREAD_H */ - -static void init_process( const struct wine_pthread_callbacks *callbacks, size_t size ) -{ -} - -static void init_thread( struct wine_pthread_thread_info *info ) -{ -} - -static int create_thread( struct wine_pthread_thread_info *info ) -{ - return -1; -} - -static void init_current_teb( struct wine_pthread_thread_info *info ) -{ -} - -static void *get_current_teb(void) -{ - return NULL; -} - -static void DECLSPEC_NORETURN exit_thread( struct wine_pthread_thread_info *info ) -{ - abort(); -} - -static void DECLSPEC_NORETURN abort_thread( long status ) -{ - abort(); -} - -static int pthread_sigmask( int how, const sigset_t *newset, sigset_t *oldset ) -{ - return -1; -} - -#endif /* HAVE_PTHREAD_H */ - /*********************************************************************** * pthread_functions

1 0

Alexandre Julliard : loader: Add missing install dependency for extra binaries.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: bfeaad0d45db33f8fee0674ea72c6ffa256956a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfeaad0d45db33f8fee0674ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 15:05:17 2009 +0200 loader: Add missing install dependency for extra binaries. --- loader/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/loader/Makefile.in b/loader/Makefile.in index ae2f386..afe3f73 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -45,7 +45,7 @@ wine: $(MAIN_OBJS) Makefile.in wine-installed: $(MAIN_OBJS) Makefile.in $(CC) -o $@ $(LDEXECFLAGS) $(MAIN_OBJS) $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(LDRPATH_INSTALL) -$(EXTRA_BINARIES:%=__install__%): $(DESTDIR)$(bindir) dummy +$(EXTRA_BINARIES:%=__install__%): $(EXTRA_BINARIES) $(DESTDIR)$(bindir) dummy f=`expr $@ : '__install__$.*$'` && $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f .PHONY: $(EXTRA_BINARIES:%=__install__%)

1 0

Francois Gouget : winealsa.drv: Remove a few unneeded initialisations and unused variables.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: e71cfdc1dec8f4137c6be0bdd9f82df58e408196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e71cfdc1dec8f4137c6be0bdd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Mar 28 11:20:02 2009 +0100 winealsa.drv: Remove a few unneeded initialisations and unused variables. --- dlls/winealsa.drv/waveout.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index e389806..1bc8609 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -97,15 +97,14 @@ static DWORD wodNotifyClient(WINE_WAVEDEV* wwo, WORD wMsg, DWORD_PTR dwParam1, D */ static BOOL wodUpdatePlayedTotal(WINE_WAVEDEV* wwo, snd_pcm_status_t* ps) { - snd_pcm_sframes_t delay = 0; - snd_pcm_sframes_t avail = 0; + snd_pcm_sframes_t delay; + snd_pcm_sframes_t avail; snd_pcm_uframes_t buf_size = 0; snd_pcm_state_t state; - int err; state = snd_pcm_state(wwo->pcm); avail = snd_pcm_avail_update(wwo->pcm); - err = snd_pcm_hw_params_get_buffer_size(wwo->hw_params, &buf_size); + snd_pcm_hw_params_get_buffer_size(wwo->hw_params, &buf_size); delay = buf_size - avail; if (state != SND_PCM_STATE_RUNNING && state != SND_PCM_STATE_PREPARED)

1 0

Francois Gouget : wineesd.drv: Fix a trace and remove an unneeded cast.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 8e3a907727b7708d4527398976cde15f2298c000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e3a907727b7708d452739897… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Mar 28 11:21:32 2009 +0100 wineesd.drv: Fix a trace and remove an unneeded cast. --- dlls/wineesd.drv/audio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index b2691bf..b6a167b 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -1287,8 +1287,8 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) } wwo->hStartUpEvent = INVALID_HANDLE_VALUE; - TRACE("esd=0x%lx, dwBufferSize=%d\n", - (long)wwo->esd_fd, wwo->dwBufferSize); + TRACE("esd=%d, dwBufferSize=%d\n", + wwo->esd_fd, wwo->dwBufferSize); TRACE("wBitsPerSample=%u, nAvgBytesPerSec=%u, nSamplesPerSec=%u, nChannels=%u nBlockAlign=%u!\n", wwo->waveFormat.Format.wBitsPerSample, wwo->waveFormat.Format.nAvgBytesPerSec,

1 0

Francois Gouget : wineesd.drv: Remove some unused WINE_WAVExxx fields.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: e7c5759af1b39b61ceb67565cb021f0be12d45bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c5759af1b39b61ceb67565c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Mar 28 11:22:47 2009 +0100 wineesd.drv: Remove some unused WINE_WAVExxx fields. --- dlls/wineesd.drv/audio.c | 21 +++------------------ 1 files changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index b6a167b..9ba2b2a 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -166,8 +166,6 @@ typedef struct { /* esd information */ int esd_fd; /* the socket fd we get from esd when opening a stream for playing */ - int bytes_per_frame; - DWORD dwBufferSize; /* size of whole buffer in bytes */ char* sound_buffer; long buffer_size; @@ -188,7 +186,6 @@ typedef struct { /* synchronization stuff */ HANDLE hStartUpEvent; HANDLE hThread; - DWORD dwThreadID; ESD_MSG_RING msgRing; } WINE_WAVEOUT; @@ -202,7 +199,6 @@ typedef struct { /* esd information */ int esd_fd; /* the socket fd we get from esd when opening a stream for recording */ - int bytes_per_frame; LPWAVEHDR lpQueuePtr; DWORD dwRecordedTotal; @@ -210,7 +206,6 @@ typedef struct { /* synchronization stuff */ HANDLE hStartUpEvent; HANDLE hThread; - DWORD dwThreadID; ESD_MSG_RING msgRing; } WINE_WAVEIN; @@ -1241,8 +1236,6 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) else if (wwo->waveFormat.Format.wBitsPerSample == 16) out_bits = ESD_BITS16; - wwo->bytes_per_frame = (wwo->waveFormat.Format.wBitsPerSample * wwo->waveFormat.Format.nChannels) / 8; - if (wwo->waveFormat.Format.nChannels == 1) out_channels = ESD_MONO; else if (wwo->waveFormat.Format.nChannels == 2) @@ -1260,9 +1253,6 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) if(wwo->esd_fd < 0) return MMSYSERR_ALLOCATED; - wwo->dwBufferSize = ESD_BUF_SIZE; - TRACE("Buffer size is now (%d)\n",wwo->dwBufferSize); - wwo->dwPlayedTotal = 0; wwo->dwWrittenTotal = 0; @@ -1278,17 +1268,15 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) if (!(dwFlags & WAVE_DIRECTSOUND)) { wwo->hStartUpEvent = CreateEventW(NULL, FALSE, FALSE, NULL); wwo->hThread = CreateThread(NULL, 0, wodPlayer, (LPVOID)(DWORD_PTR)wDevID, - 0, &(wwo->dwThreadID)); + 0, NULL); WaitForSingleObject(wwo->hStartUpEvent, INFINITE); CloseHandle(wwo->hStartUpEvent); } else { wwo->hThread = INVALID_HANDLE_VALUE; - wwo->dwThreadID = 0; } wwo->hStartUpEvent = INVALID_HANDLE_VALUE; - TRACE("esd=%d, dwBufferSize=%d\n", - wwo->esd_fd, wwo->dwBufferSize); + TRACE("esd=%d\n", wwo->esd_fd); TRACE("wBitsPerSample=%u, nAvgBytesPerSec=%u, nSamplesPerSec=%u, nChannels=%u nBlockAlign=%u!\n", wwo->waveFormat.Format.wBitsPerSample, wwo->waveFormat.Format.nAvgBytesPerSec, @@ -1895,8 +1883,6 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) else if (wwi->waveFormat.Format.wBitsPerSample == 16) in_bits = ESD_BITS16; - wwi->bytes_per_frame = (wwi->waveFormat.Format.wBitsPerSample * wwi->waveFormat.Format.nChannels) / 8; - if (wwi->waveFormat.Format.nChannels == 1) in_channels = ESD_MONO; else if (wwi->waveFormat.Format.nChannels == 2) @@ -1935,12 +1921,11 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) if (!(dwFlags & WAVE_DIRECTSOUND)) { wwi->hStartUpEvent = CreateEventW(NULL, FALSE, FALSE, NULL); wwi->hThread = CreateThread(NULL, 0, widRecorder, (LPVOID)(DWORD_PTR)wDevID, - 0, &(wwi->dwThreadID)); + 0, NULL); WaitForSingleObject(wwi->hStartUpEvent, INFINITE); CloseHandle(wwi->hStartUpEvent); } else { wwi->hThread = INVALID_HANDLE_VALUE; - wwi->dwThreadID = 0; } wwi->hStartUpEvent = INVALID_HANDLE_VALUE;

1 0

Francois Gouget : wineesd.drv: Move the wodDsXxx() functions around to avoid forward declarations.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 91d42b37ef82a85ed4081d28968a5299223e1393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91d42b37ef82a85ed4081d289… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Mar 28 11:23:18 2009 +0100 wineesd.drv: Move the wodDsXxx() functions around to avoid forward declarations. --- dlls/wineesd.drv/audio.c | 45 ++++++++++++++++++++++----------------------- 1 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index 9ba2b2a..9703d3c 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -212,9 +212,6 @@ typedef struct { static WINE_WAVEOUT WOutDev [MAX_WAVEOUTDRV]; static WINE_WAVEIN WInDev [MAX_WAVEINDRV]; -static DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv); -static DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc); - /* These strings used only for tracing */ static const char *wodPlayerCmdString[] = { "WINE_WM_PAUSING", @@ -228,6 +225,28 @@ static const char *wodPlayerCmdString[] = { "WINE_WM_STOPPING", }; + +/*======================================================================* + * Low level DSOUND implementation * + *======================================================================*/ + +static DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv) +{ + /* we can't perform memory mapping as we don't have a file stream + interface with esd like we do with oss */ + MESSAGE("This sound card's driver does not support direct access\n"); + MESSAGE("The (slower) DirectSound HEL mode will be used instead.\n"); + return MMSYSERR_NOTSUPPORTED; +} + +static DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc) +{ + memset(desc, 0, sizeof(*desc)); + strcpy(desc->szDesc, "Wine EsounD DirectSound Driver"); + strcpy(desc->szDrvname, "wineesd.drv"); + return MMSYSERR_NOERROR; +} + /*======================================================================* * Low level WAVE implementation * *======================================================================*/ @@ -2071,26 +2090,6 @@ DWORD WINAPI ESD_widMessage(UINT wDevID, UINT wMsg, DWORD dwUser, return MMSYSERR_NOTSUPPORTED; } -/*======================================================================* - * Low level DSOUND implementation * - *======================================================================*/ -static DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv) -{ - /* we can't perform memory mapping as we don't have a file stream - interface with esd like we do with oss */ - MESSAGE("This sound card's driver does not support direct access\n"); - MESSAGE("The (slower) DirectSound HEL mode will be used instead.\n"); - return MMSYSERR_NOTSUPPORTED; -} - -static DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc) -{ - memset(desc, 0, sizeof(*desc)); - strcpy(desc->szDesc, "Wine EsounD DirectSound Driver"); - strcpy(desc->szDrvname, "wineesd.drv"); - return MMSYSERR_NOERROR; -} - #else /* !HAVE_ESD */ /**************************************************************************

1 0

Francois Gouget : wineesd.drv: Rename esd_fd to stream_fd.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: d1a7136b6f1572bf8fcd0e207f15778bf2a9a581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1a7136b6f1572bf8fcd0e207… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Mar 28 11:24:36 2009 +0100 wineesd.drv: Rename esd_fd to stream_fd. It is used to send/receive stream data, not to send RPCs to the sound server as esd_fd would imply. This is a no-op. --- dlls/wineesd.drv/audio.c | 62 +++++++++++++++++++++++----------------------- 1 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index 9703d3c..1b7d5fb 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -165,7 +165,7 @@ typedef struct { DWORD dwSleepTime; /* Num of milliseconds to sleep between filling the dsp buffers */ /* esd information */ - int esd_fd; /* the socket fd we get from esd when opening a stream for playing */ + int stream_fd; /* the socket fd we get from esd when opening a stream for playing */ char* sound_buffer; long buffer_size; @@ -198,7 +198,7 @@ typedef struct { char interface_name[32]; /* esd information */ - int esd_fd; /* the socket fd we get from esd when opening a stream for recording */ + int stream_fd; /* the socket fd we get from esd when opening a stream for recording */ LPWAVEHDR lpQueuePtr; DWORD dwRecordedTotal; @@ -397,8 +397,8 @@ static void copy_format(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2) */ static void ESD_CloseWaveOutDevice(WINE_WAVEOUT* wwo) { - esd_close(wwo->esd_fd); /* close the esd socket fd */ - wwo->esd_fd = -1; + esd_close(wwo->stream_fd); + wwo->stream_fd = -1; /* free up the buffer we use for volume and reset the size */ HeapFree(GetProcessHeap(), 0, wwo->sound_buffer); @@ -412,8 +412,8 @@ static void ESD_CloseWaveOutDevice(WINE_WAVEOUT* wwo) */ static void ESD_CloseWaveInDevice(WINE_WAVEIN* wwi) { - esd_close(wwi->esd_fd); /* close the esd socket fd */ - wwi->esd_fd = -1; + esd_close(wwi->stream_fd); + wwi->stream_fd = -1; } /****************************************************************** @@ -426,7 +426,7 @@ LONG ESD_WaveClose(void) /* close all open devices */ for(iDevice = 0; iDevice < MAX_WAVEOUTDRV; iDevice++) { - if(WOutDev[iDevice].esd_fd != -1) + if(WOutDev[iDevice].stream_fd != -1) { ESD_CloseWaveOutDevice(&WOutDev[iDevice]); } @@ -434,7 +434,7 @@ LONG ESD_WaveClose(void) for(iDevice = 0; iDevice < MAX_WAVEINDRV; iDevice++) { - if(WInDev[iDevice].esd_fd != -1) + if(WInDev[iDevice].stream_fd != -1) { ESD_CloseWaveInDevice(&WInDev[iDevice]); } @@ -468,7 +468,7 @@ LONG ESD_WaveInit(void) { static const WCHAR ini[] = {'E','s','o','u','n','D',' ','W','a','v','e','O','u','t','D','r','i','v','e','r',0}; - WOutDev[i].esd_fd = -1; + WOutDev[i].stream_fd = -1; memset(&WOutDev[i].caps, 0, sizeof(WOutDev[i].caps)); /* zero out caps values */ WOutDev[i].caps.wMid = 0x00FF; /* Manufacturer ID */ @@ -501,7 +501,7 @@ LONG ESD_WaveInit(void) { static const WCHAR ini[] = {'E','s','o','u','n','D',' ','W','a','v','e','I','n','D','r','i','v','e','r',0}; - WInDev[i].esd_fd = -1; + WInDev[i].stream_fd = -1; memset(&WInDev[i].caps, 0, sizeof(WInDev[i].caps)); /* zero out caps values */ WInDev[i].caps.wMid = 0x00FF; @@ -870,7 +870,7 @@ static int wodPlayer_WriteMaxFrags(WINE_WAVEOUT* wwo, DWORD* bytes) } /* send the audio data to esd for playing */ - written = write(wwo->esd_fd, wwo->sound_buffer, toWrite); + written = write(wwo->stream_fd, wwo->sound_buffer, toWrite); TRACE("written = %d\n", written); @@ -1211,7 +1211,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) } /* if this device is already open tell the app that it is allocated */ - if(WOutDev[wDevID].esd_fd != -1) + if(WOutDev[wDevID].stream_fd != -1) { TRACE("device already allocated\n"); return MMSYSERR_ALLOCATED; @@ -1264,13 +1264,13 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) out_rate = (int) wwo->waveFormat.Format.nSamplesPerSec; TRACE("esd output format = 0x%08x, rate = %d\n", out_format, out_rate); - wwo->esd_fd = esd_play_stream(out_format, out_rate, NULL, "wineesd"); + wwo->stream_fd = esd_play_stream(out_format, out_rate, NULL, "wineesd"); /* clear these so we don't have any confusion ;-) */ wwo->sound_buffer = 0; wwo->buffer_size = 0; - if(wwo->esd_fd < 0) return MMSYSERR_ALLOCATED; + if(wwo->stream_fd < 0) return MMSYSERR_ALLOCATED; wwo->dwPlayedTotal = 0; wwo->dwWrittenTotal = 0; @@ -1295,7 +1295,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) } wwo->hStartUpEvent = INVALID_HANDLE_VALUE; - TRACE("esd=%d\n", wwo->esd_fd); + TRACE("stream=%d\n", wwo->stream_fd); TRACE("wBitsPerSample=%u, nAvgBytesPerSec=%u, nSamplesPerSec=%u, nChannels=%u nBlockAlign=%u!\n", wwo->waveFormat.Format.wBitsPerSample, wwo->waveFormat.Format.nAvgBytesPerSec, @@ -1315,7 +1315,7 @@ static DWORD wodClose(WORD wDevID) TRACE("(%u);\n", wDevID); - if (wDevID >= MAX_WAVEOUTDRV || WOutDev[wDevID].esd_fd == -1) { + if (wDevID >= MAX_WAVEOUTDRV || WOutDev[wDevID].stream_fd == -1) { WARN("bad device ID !\n"); return MMSYSERR_BADDEVICEID; } @@ -1348,7 +1348,7 @@ static DWORD wodWrite(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize) TRACE("(%u, %p, %08X);\n", wDevID, lpWaveHdr, dwSize); /* first, do the sanity checks... */ - if (wDevID >= MAX_WAVEOUTDRV || WOutDev[wDevID].esd_fd == -1) { + if (wDevID >= MAX_WAVEOUTDRV || WOutDev[wDevID].stream_fd == -1) { WARN("bad dev ID !\n"); return MMSYSERR_BADDEVICEID; } @@ -1383,7 +1383,7 @@ static DWORD wodPause(WORD wDevID) { TRACE("(%u);!\n", wDevID); - if (wDevID >= MAX_WAVEOUTDRV || WOutDev[wDevID].esd_fd == -1) { + if (wDevID >= MAX_WAVEOUTDRV || WOutDev[wDevID].stream_fd == -1) { WARN("bad device ID !\n"); return MMSYSERR_BADDEVICEID; } @@ -1401,7 +1401,7 @@ static DWORD wodRestart(WORD wDevID) { TRACE("(%u);\n", wDevID); - if (wDevID >= MAX_WAVEOUTDRV || WOutDev[wDevID].esd_fd == -1) { + if (wDevID >= MAX_WAVEOUTDRV || WOutDev[wDevID].stream_fd == -1) { WARN("bad device ID !\n"); return MMSYSERR_BADDEVICEID; } @@ -1426,7 +1426,7 @@ static DWORD wodReset(WORD wDevID) { TRACE("(%u);\n", wDevID); - if (wDevID >= MAX_WAVEOUTDRV || WOutDev[wDevID].esd_fd == -1) { + if (wDevID >= MAX_WAVEOUTDRV || WOutDev[wDevID].stream_fd == -1) { WARN("bad device ID !\n"); return MMSYSERR_BADDEVICEID; } @@ -1446,7 +1446,7 @@ static DWORD wodGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize) TRACE("(%u, %p, %u);\n", wDevID, lpTime, uSize); - if (wDevID >= MAX_WAVEOUTDRV || WOutDev[wDevID].esd_fd == -1) { + if (wDevID >= MAX_WAVEOUTDRV || WOutDev[wDevID].stream_fd == -1) { WARN("bad device ID !\n"); return MMSYSERR_BADDEVICEID; } @@ -1469,7 +1469,7 @@ static DWORD wodBreakLoop(WORD wDevID) { TRACE("(%u);\n", wDevID); - if (wDevID >= MAX_WAVEOUTDRV || WOutDev[wDevID].esd_fd == -1) { + if (wDevID >= MAX_WAVEOUTDRV || WOutDev[wDevID].stream_fd == -1) { WARN("bad device ID !\n"); return MMSYSERR_BADDEVICEID; } @@ -1711,7 +1711,7 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) while(wwi->lpQueuePtr) { TRACE("attempt to read %d bytes\n",lpWaveHdr->dwBufferLength - lpWaveHdr->dwBytesRecorded); - bytesRead = read(wwi->esd_fd, + bytesRead = read(wwi->stream_fd, lpWaveHdr->lpData + lpWaveHdr->dwBytesRecorded, lpWaveHdr->dwBufferLength - lpWaveHdr->dwBytesRecorded); TRACE("bytesRead=%d\n",bytesRead); @@ -1858,7 +1858,7 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) } /* if this device is already open tell the app that it is allocated */ - if(WInDev[wDevID].esd_fd != -1) + if(WInDev[wDevID].stream_fd != -1) { TRACE("device already allocated\n"); return MMSYSERR_ALLOCATED; @@ -1912,11 +1912,11 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) TRACE("esd input format = 0x%08x, rate = %d\n", in_format, in_rate); #ifdef WID_USE_ESDMON - wwi->esd_fd = esd_monitor_stream(in_format, in_rate, NULL, "wineesd"); + wwi->stream_fd = esd_monitor_stream(in_format, in_rate, NULL, "wineesd"); #else - wwi->esd_fd = esd_record_stream(in_format, in_rate, NULL, "wineesd"); + wwi->stream_fd = esd_record_stream(in_format, in_rate, NULL, "wineesd"); #endif - TRACE("(wwi->esd_fd=%d)\n",wwi->esd_fd); + TRACE("(wwi->stream_fd=%d)\n",wwi->stream_fd); wwi->state = WINE_WS_STOPPED; if (wwi->lpQueuePtr) { @@ -1924,12 +1924,12 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwi->lpQueuePtr = NULL; } - if(wwi->esd_fd < 0) return MMSYSERR_ALLOCATED; + if(wwi->stream_fd < 0) return MMSYSERR_ALLOCATED; - /* Set the esd socket O_NONBLOCK, so we can stop recording smoothly */ - mode = fcntl(wwi->esd_fd, F_GETFL); + /* Set the socket to O_NONBLOCK, so we can stop recording smoothly */ + mode = fcntl(wwi->stream_fd, F_GETFL); mode |= O_NONBLOCK; - fcntl(wwi->esd_fd, F_SETFL, mode); + fcntl(wwi->stream_fd, F_SETFL, mode); wwi->dwRecordedTotal = 0; wwi->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK);

1 0

Francois Gouget : wineesd.drv: Build a unique name so we can identify our stream.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 45a59683585fa3991c7bab37e42d9b9525bae147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a59683585fa3991c7bab37e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Mar 28 11:26:39 2009 +0100 wineesd.drv: Build a unique name so we can identify our stream. Put the windows application name in it to make it user friendly as it is displayed by EsounD mixers. --- dlls/wineesd.drv/audio.c | 45 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index 1b7d5fb..d0eed60 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -165,6 +165,7 @@ typedef struct { DWORD dwSleepTime; /* Num of milliseconds to sleep between filling the dsp buffers */ /* esd information */ + char* stream_name; /* a unique name identifying the esd stream */ int stream_fd; /* the socket fd we get from esd when opening a stream for playing */ char* sound_buffer; @@ -198,6 +199,7 @@ typedef struct { char interface_name[32]; /* esd information */ + char* stream_name; /* a unique name identifying the esd stream */ int stream_fd; /* the socket fd we get from esd when opening a stream for recording */ LPWAVEHDR lpQueuePtr; @@ -391,12 +393,35 @@ static void copy_format(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2) memcpy(wf2, wf1, sizeof(WAVEFORMATEX) + wf1->cbSize); } +static char* get_stream_name(const char* direction, unsigned int dev_id) +{ + char exename[MAX_PATH]; + char *basename, *s; + char* stream_name; + + GetModuleFileNameA(NULL, exename, sizeof(exename)); + exename[sizeof(exename)-1]='\0'; + basename = s = exename; + while (*s) + { + if (*s == '/' || *s == '\\') + basename = s+1; + s++; + } + + stream_name = HeapAlloc(GetProcessHeap(), 0, 4+strlen(basename)+10+strlen(direction)+10+1); + sprintf(stream_name, "%s (%lu:%s%u)", basename, (unsigned long)getpid(), direction, dev_id); + + return stream_name; +} + /****************************************************************** * ESD_CloseWaveOutDevice * */ static void ESD_CloseWaveOutDevice(WINE_WAVEOUT* wwo) { + HeapFree(GetProcessHeap(), 0, wwo->stream_name); esd_close(wwo->stream_fd); wwo->stream_fd = -1; @@ -412,6 +437,7 @@ static void ESD_CloseWaveOutDevice(WINE_WAVEOUT* wwo) */ static void ESD_CloseWaveInDevice(WINE_WAVEIN* wwi) { + HeapFree(GetProcessHeap(), 0, wwi->stream_name); esd_close(wwi->stream_fd); wwi->stream_fd = -1; } @@ -1264,14 +1290,15 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) out_rate = (int) wwo->waveFormat.Format.nSamplesPerSec; TRACE("esd output format = 0x%08x, rate = %d\n", out_format, out_rate); - wwo->stream_fd = esd_play_stream(out_format, out_rate, NULL, "wineesd"); + wwo->stream_fd = esd_play_stream(out_format, out_rate, NULL, wwo->stream_name); + TRACE("wwo->stream_fd=%d\n", wwo->stream_fd); + if(wwo->stream_fd < 0) return MMSYSERR_ALLOCATED; + wwo->stream_name = get_stream_name("out", wDevID); /* clear these so we don't have any confusion ;-) */ wwo->sound_buffer = 0; wwo->buffer_size = 0; - if(wwo->stream_fd < 0) return MMSYSERR_ALLOCATED; - wwo->dwPlayedTotal = 0; wwo->dwWrittenTotal = 0; @@ -1295,8 +1322,6 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) } wwo->hStartUpEvent = INVALID_HANDLE_VALUE; - TRACE("stream=%d\n", wwo->stream_fd); - TRACE("wBitsPerSample=%u, nAvgBytesPerSec=%u, nSamplesPerSec=%u, nChannels=%u nBlockAlign=%u!\n", wwo->waveFormat.Format.wBitsPerSample, wwo->waveFormat.Format.nAvgBytesPerSec, wwo->waveFormat.Format.nSamplesPerSec, wwo->waveFormat.Format.nChannels, @@ -1912,11 +1937,13 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) TRACE("esd input format = 0x%08x, rate = %d\n", in_format, in_rate); #ifdef WID_USE_ESDMON - wwi->stream_fd = esd_monitor_stream(in_format, in_rate, NULL, "wineesd"); + wwi->stream_fd = esd_monitor_stream(in_format, in_rate, NULL, wwi->stream_name); #else - wwi->stream_fd = esd_record_stream(in_format, in_rate, NULL, "wineesd"); + wwi->stream_fd = esd_record_stream(in_format, in_rate, NULL, wwi->stream_name); #endif - TRACE("(wwi->stream_fd=%d)\n",wwi->stream_fd); + TRACE("wwi->stream_fd=%d\n",wwi->stream_fd); + if(wwi->stream_fd < 0) return MMSYSERR_ALLOCATED; + wwi->stream_name = get_stream_name("in", wDevID); wwi->state = WINE_WS_STOPPED; if (wwi->lpQueuePtr) { @@ -1924,8 +1951,6 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwi->lpQueuePtr = NULL; } - if(wwi->stream_fd < 0) return MMSYSERR_ALLOCATED; - /* Set the socket to O_NONBLOCK, so we can stop recording smoothly */ mode = fcntl(wwi->stream_fd, F_GETFL); mode |= O_NONBLOCK;

1 0