diff options
Diffstat (limited to 'Alc/backends')
-rw-r--r-- | Alc/backends/alsa.c | 4 | ||||
-rw-r--r-- | Alc/backends/coreaudio.c | 2 | ||||
-rw-r--r-- | Alc/backends/dsound.c | 4 | ||||
-rw-r--r-- | Alc/backends/loopback.c | 2 | ||||
-rw-r--r-- | Alc/backends/mmdevapi.c | 2 | ||||
-rw-r--r-- | Alc/backends/null.c | 2 | ||||
-rw-r--r-- | Alc/backends/opensl.c | 2 | ||||
-rw-r--r-- | Alc/backends/oss.c | 4 | ||||
-rw-r--r-- | Alc/backends/portaudio.c | 4 | ||||
-rw-r--r-- | Alc/backends/pulseaudio.c | 8 | ||||
-rw-r--r-- | Alc/backends/sndio.c | 2 | ||||
-rw-r--r-- | Alc/backends/solaris.c | 2 | ||||
-rw-r--r-- | Alc/backends/wave.c | 2 | ||||
-rw-r--r-- | Alc/backends/winmm.c | 4 |
14 files changed, 22 insertions, 22 deletions
diff --git a/Alc/backends/alsa.c b/Alc/backends/alsa.c index fa5ef1a6..8bd86be0 100644 --- a/Alc/backends/alsa.c +++ b/Alc/backends/alsa.c @@ -621,7 +621,7 @@ static ALCenum alsa_open_playback(ALCdevice *device, const ALCchar *deviceName) return ALC_OUT_OF_MEMORY; } - device->szDeviceName = strdup(deviceName); + device->DeviceName = strdup(deviceName); device->ExtraData = data; return ALC_NO_ERROR; } @@ -986,7 +986,7 @@ static ALCenum alsa_open_capture(ALCdevice *pDevice, const ALCchar *deviceName) } } - pDevice->szDeviceName = strdup(deviceName); + pDevice->DeviceName = strdup(deviceName); pDevice->ExtraData = data; return ALC_NO_ERROR; diff --git a/Alc/backends/coreaudio.c b/Alc/backends/coreaudio.c index 1c02930e..8f9434ca 100644 --- a/Alc/backends/coreaudio.c +++ b/Alc/backends/coreaudio.c @@ -181,7 +181,7 @@ static ALCenum ca_open_playback(ALCdevice *device, const ALCchar *deviceName) return ALC_INVALID_VALUE; } - device->szDeviceName = strdup(deviceName); + device->DeviceName = strdup(deviceName); device->ExtraData = data; return ALC_NO_ERROR; } diff --git a/Alc/backends/dsound.c b/Alc/backends/dsound.c index 0eab62a4..04e428a2 100644 --- a/Alc/backends/dsound.c +++ b/Alc/backends/dsound.c @@ -383,7 +383,7 @@ static ALCenum DSoundOpenPlayback(ALCdevice *device, const ALCchar *deviceName) return ALC_INVALID_VALUE; } - device->szDeviceName = strdup(deviceName); + device->DeviceName = strdup(deviceName); device->ExtraData = pData; return ALC_NO_ERROR; } @@ -824,7 +824,7 @@ static ALCenum DSoundOpenCapture(ALCdevice *device, const ALCchar *deviceName) pData->dwBufferBytes = DSCBDescription.dwBufferBytes; SetDefaultWFXChannelOrder(device); - device->szDeviceName = strdup(deviceName); + device->DeviceName = strdup(deviceName); device->ExtraData = pData; return ALC_NO_ERROR; diff --git a/Alc/backends/loopback.c b/Alc/backends/loopback.c index 3726974c..eafed3e3 100644 --- a/Alc/backends/loopback.c +++ b/Alc/backends/loopback.c @@ -28,7 +28,7 @@ static ALCenum loopback_open_playback(ALCdevice *device, const ALCchar *deviceName) { - device->szDeviceName = strdup(deviceName); + device->DeviceName = strdup(deviceName); return ALC_NO_ERROR; } diff --git a/Alc/backends/mmdevapi.c b/Alc/backends/mmdevapi.c index 6861430e..f85c9956 100644 --- a/Alc/backends/mmdevapi.c +++ b/Alc/backends/mmdevapi.c @@ -622,7 +622,7 @@ static DWORD CALLBACK MMDevApiMsgProc(void *ptr) if(SUCCEEDED(hr)) { data->client = ptr; - device->szDeviceName = get_device_name(data->mmdev); + device->DeviceName = get_device_name(data->mmdev); } if(FAILED(hr)) diff --git a/Alc/backends/null.c b/Alc/backends/null.c index 8fc60b66..cd0f935c 100644 --- a/Alc/backends/null.c +++ b/Alc/backends/null.c @@ -84,7 +84,7 @@ static ALCenum null_open_playback(ALCdevice *device, const ALCchar *deviceName) data = (null_data*)calloc(1, sizeof(*data)); - device->szDeviceName = strdup(deviceName); + device->DeviceName = strdup(deviceName); device->ExtraData = data; return ALC_NO_ERROR; } diff --git a/Alc/backends/opensl.c b/Alc/backends/opensl.c index 5ff60276..1240b2e8 100644 --- a/Alc/backends/opensl.c +++ b/Alc/backends/opensl.c @@ -231,7 +231,7 @@ static ALCenum opensl_open_playback(ALCdevice *Device, const ALCchar *deviceName return ALC_INVALID_VALUE; } - Device->szDeviceName = strdup(deviceName); + Device->DeviceName = strdup(deviceName); Device->ExtraData = data; return ALC_NO_ERROR; diff --git a/Alc/backends/oss.c b/Alc/backends/oss.c index a577d8be..302ba101 100644 --- a/Alc/backends/oss.c +++ b/Alc/backends/oss.c @@ -170,7 +170,7 @@ static ALCenum oss_open_playback(ALCdevice *device, const ALCchar *deviceName) return ALC_INVALID_VALUE; } - device->szDeviceName = strdup(deviceName); + device->DeviceName = strdup(deviceName); device->ExtraData = data; return ALC_NO_ERROR; } @@ -431,7 +431,7 @@ static ALCenum oss_open_capture(ALCdevice *device, const ALCchar *deviceName) return ALC_OUT_OF_MEMORY; } - device->szDeviceName = strdup(deviceName); + device->DeviceName = strdup(deviceName); return ALC_NO_ERROR; } diff --git a/Alc/backends/portaudio.c b/Alc/backends/portaudio.c index c4f80e1a..13c83cef 100644 --- a/Alc/backends/portaudio.c +++ b/Alc/backends/portaudio.c @@ -219,7 +219,7 @@ retry_open: } device->ExtraData = data; - device->szDeviceName = strdup(deviceName); + device->DeviceName = strdup(deviceName); return ALC_NO_ERROR; } @@ -361,7 +361,7 @@ static ALCenum pa_open_capture(ALCdevice *device, const ALCchar *deviceName) goto error; } - device->szDeviceName = strdup(deviceName); + device->DeviceName = strdup(deviceName); device->ExtraData = data; return ALC_NO_ERROR; diff --git a/Alc/backends/pulseaudio.c b/Alc/backends/pulseaudio.c index 156f8ffd..e40419e3 100644 --- a/Alc/backends/pulseaudio.c +++ b/Alc/backends/pulseaudio.c @@ -525,8 +525,8 @@ static void sink_name_callback(pa_context *context, const pa_sink_info *info, in return; } - free(device->szDeviceName); - device->szDeviceName = strdup(info->description); + free(device->DeviceName); + device->DeviceName = strdup(info->description); } static void source_name_callback(pa_context *context, const pa_source_info *info, int eol, void *pdata) @@ -541,8 +541,8 @@ static void source_name_callback(pa_context *context, const pa_source_info *info return; } - free(device->szDeviceName); - device->szDeviceName = strdup(info->description); + free(device->DeviceName); + device->DeviceName = strdup(info->description); } diff --git a/Alc/backends/sndio.c b/Alc/backends/sndio.c index fc368951..b732f2b5 100644 --- a/Alc/backends/sndio.c +++ b/Alc/backends/sndio.c @@ -183,7 +183,7 @@ static ALCenum sndio_open_playback(ALCdevice *device, const ALCchar *deviceName) return ALC_INVALID_VALUE; } - device->szDeviceName = strdup(deviceName); + device->DeviceName = strdup(deviceName); device->ExtraData = data; return ALC_NO_ERROR; diff --git a/Alc/backends/solaris.c b/Alc/backends/solaris.c index 26d923c7..2eb5776f 100644 --- a/Alc/backends/solaris.c +++ b/Alc/backends/solaris.c @@ -113,7 +113,7 @@ static ALCenum solaris_open_playback(ALCdevice *device, const ALCchar *deviceNam return ALC_INVALID_VALUE; } - device->szDeviceName = strdup(deviceName); + device->DeviceName = strdup(deviceName); device->ExtraData = data; return ALC_NO_ERROR; } diff --git a/Alc/backends/wave.c b/Alc/backends/wave.c index d9f1fdc7..f4f21ecb 100644 --- a/Alc/backends/wave.c +++ b/Alc/backends/wave.c @@ -178,7 +178,7 @@ static ALCenum wave_open_playback(ALCdevice *device, const ALCchar *deviceName) return ALC_INVALID_VALUE; } - device->szDeviceName = strdup(deviceName); + device->DeviceName = strdup(deviceName); device->ExtraData = data; return ALC_NO_ERROR; } diff --git a/Alc/backends/winmm.c b/Alc/backends/winmm.c index 9641bcf8..21d1b50b 100644 --- a/Alc/backends/winmm.c +++ b/Alc/backends/winmm.c @@ -345,7 +345,7 @@ retry_open: goto failure; } - pDevice->szDeviceName = strdup(PlaybackDeviceList[lDeviceID]); + pDevice->DeviceName = strdup(PlaybackDeviceList[lDeviceID]); return ALC_NO_ERROR; failure: @@ -615,7 +615,7 @@ static ALCenum WinMMOpenCapture(ALCdevice *pDevice, const ALCchar *deviceName) if (pData->hWaveThread == NULL) goto failure; - pDevice->szDeviceName = strdup(CaptureDeviceList[lDeviceID]); + pDevice->DeviceName = strdup(CaptureDeviceList[lDeviceID]); return ALC_NO_ERROR; failure: |