wineesd.drv: Remove the unused ESD_WaveClose/ESD_WaveInit functions.
Michael Stefaniuc
mstefani at redhat.de
Wed Apr 21 15:23:44 CDT 2010
---
Maarten,
any reason you didn't remove this functions too?
Actually the proper fix is a git rm -r dlls/wineesd.drv/ but i
digress...
bye
michael
dlls/wineesd.drv/audio.c | 122 ----------------------------------------------
1 files changed, 0 insertions(+), 122 deletions(-)
diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c
index 3d4225a..dffaccf 100644
--- a/dlls/wineesd.drv/audio.c
+++ b/dlls/wineesd.drv/audio.c
@@ -387,128 +387,6 @@ static void ESD_CloseWaveInDevice(WINE_WAVEIN* wwi)
wwi->stream_fd = -1;
}
-static int WAVE_loadcount;
-/******************************************************************
- * ESD_WaveClose
- */
-static LONG ESD_WaveClose(void)
-{
- int iDevice;
-
- if (--WAVE_loadcount)
- return 1;
-
- /* close all open devices */
- for(iDevice = 0; iDevice < MAX_WAVEOUTDRV; iDevice++)
- {
- if(WOutDev[iDevice].stream_fd != -1)
- {
- ESD_CloseWaveOutDevice(&WOutDev[iDevice]);
- }
- }
-
- for(iDevice = 0; iDevice < MAX_WAVEINDRV; iDevice++)
- {
- if(WInDev[iDevice].stream_fd != -1)
- {
- ESD_CloseWaveInDevice(&WInDev[iDevice]);
- }
- }
-
- return 1;
-}
-
-/******************************************************************
- * ESD_WaveInit
- *
- * Initialize internal structures from ESD server info
- */
-static LONG ESD_WaveInit(void)
-{
- int i;
- int fd;
-
- TRACE("called\n");
- if (WAVE_loadcount++)
- return 1;
-
- /* Testing whether the esd host is alive. */
- if ((fd = esd_open_sound(NULL)) < 0)
- {
- WARN("esd_open_sound() failed (%d)\n", errno);
- return 0;
- }
- esd_close(fd);
-
- /* initialize all device handles to -1 */
- for (i = 0; i < MAX_WAVEOUTDRV; ++i)
- {
- 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].stream_fd = -1;
- memset(&WOutDev[i].caps, 0, sizeof(WOutDev[i].caps)); /* zero out
- caps values */
- WOutDev[i].caps.wMid = 0x00FF; /* Manufacturer ID */
- WOutDev[i].caps.wPid = 0x0001; /* Product ID */
- lstrcpyW(WOutDev[i].caps.szPname, ini);
- snprintf(WOutDev[i].interface_name, sizeof(WOutDev[i].interface_name), "wineesd: %d", i);
-
- WOutDev[i].caps.vDriverVersion = 0x0100;
- WOutDev[i].caps.dwFormats = 0x00000000;
- WOutDev[i].caps.dwSupport = WAVECAPS_VOLUME;
-
- WOutDev[i].caps.wChannels = 2;
- WOutDev[i].caps.dwSupport |= WAVECAPS_LRVOLUME;
-
- WOutDev[i].caps.dwFormats |= WAVE_FORMAT_4M08;
- WOutDev[i].caps.dwFormats |= WAVE_FORMAT_4S08;
- WOutDev[i].caps.dwFormats |= WAVE_FORMAT_4S16;
- WOutDev[i].caps.dwFormats |= WAVE_FORMAT_4M16;
- WOutDev[i].caps.dwFormats |= WAVE_FORMAT_2M08;
- WOutDev[i].caps.dwFormats |= WAVE_FORMAT_2S08;
- WOutDev[i].caps.dwFormats |= WAVE_FORMAT_2M16;
- WOutDev[i].caps.dwFormats |= WAVE_FORMAT_2S16;
- WOutDev[i].caps.dwFormats |= WAVE_FORMAT_1M08;
- WOutDev[i].caps.dwFormats |= WAVE_FORMAT_1S08;
- WOutDev[i].caps.dwFormats |= WAVE_FORMAT_1M16;
- WOutDev[i].caps.dwFormats |= WAVE_FORMAT_1S16;
- }
-
- for (i = 0; i < MAX_WAVEINDRV; ++i)
- {
- 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].stream_fd = -1;
- memset(&WInDev[i].caps, 0, sizeof(WInDev[i].caps)); /* zero out
- caps values */
- WInDev[i].caps.wMid = 0x00FF;
- WInDev[i].caps.wPid = 0x0001;
- lstrcpyW(WInDev[i].caps.szPname, ini);
- snprintf(WInDev[i].interface_name, sizeof(WInDev[i].interface_name), "wineesd: %d", i);
-
- WInDev[i].caps.vDriverVersion = 0x0100;
- WInDev[i].caps.dwFormats = 0x00000000;
-
- WInDev[i].caps.wChannels = 2;
-
- WInDev[i].caps.dwFormats |= WAVE_FORMAT_4M08;
- WInDev[i].caps.dwFormats |= WAVE_FORMAT_4S08;
- WInDev[i].caps.dwFormats |= WAVE_FORMAT_4S16;
- WInDev[i].caps.dwFormats |= WAVE_FORMAT_4M16;
- WInDev[i].caps.dwFormats |= WAVE_FORMAT_2M08;
- WInDev[i].caps.dwFormats |= WAVE_FORMAT_2S08;
- WInDev[i].caps.dwFormats |= WAVE_FORMAT_2M16;
- WInDev[i].caps.dwFormats |= WAVE_FORMAT_2S16;
- WInDev[i].caps.dwFormats |= WAVE_FORMAT_1M08;
- WInDev[i].caps.dwFormats |= WAVE_FORMAT_1S08;
- WInDev[i].caps.dwFormats |= WAVE_FORMAT_1M16;
- WInDev[i].caps.dwFormats |= WAVE_FORMAT_1S16;
-
- WInDev[i].caps.wReserved1 = 0;
- }
- return 1;
-}
-
/******************************************************************
* ESD_InitRingMessage
*
--
1.7.1.rc2
More information about the wine-patches
mailing list