From 64853b73787ab6d3adec78f8dec0dcb96cdb2801 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <[EMAIL REDACTED]>
Date: Tue, 6 Apr 2021 18:34:17 -0400
Subject: [PATCH] audio: Changed a disk and dummy backends to use _this instead
of this.
---
src/audio/disk/SDL_diskaudio.c | 48 ++++++++++++++++----------------
src/audio/disk/SDL_diskaudio.h | 2 +-
src/audio/dummy/SDL_dummyaudio.c | 4 +--
src/audio/dummy/SDL_dummyaudio.h | 2 +-
4 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/audio/disk/SDL_diskaudio.c b/src/audio/disk/SDL_diskaudio.c
index 5b2fa145f..4cb1370fb 100644
--- a/src/audio/disk/SDL_diskaudio.c
+++ b/src/audio/disk/SDL_diskaudio.c
@@ -46,19 +46,19 @@
static void
DISKAUDIO_WaitDevice(_THIS)
{
- SDL_Delay(this->hidden->io_delay);
+ SDL_Delay(_this->hidden->io_delay);
}
static void
DISKAUDIO_PlayDevice(_THIS)
{
- const size_t written = SDL_RWwrite(this->hidden->io,
- this->hidden->mixbuf,
- 1, this->spec.size);
+ const size_t written = SDL_RWwrite(_this->hidden->io,
+ _this->hidden->mixbuf,
+ 1, _this->spec.size);
/* If we couldn't write, assume fatal error for now */
- if (written != this->spec.size) {
- SDL_OpenedAudioDeviceDisconnected(this);
+ if (written != _this->spec.size) {
+ SDL_OpenedAudioDeviceDisconnected(_this);
}
#ifdef DEBUG_AUDIO
fprintf(stderr, "Wrote %d bytes of audio data\n", written);
@@ -68,13 +68,13 @@ DISKAUDIO_PlayDevice(_THIS)
static Uint8 *
DISKAUDIO_GetDeviceBuf(_THIS)
{
- return (this->hidden->mixbuf);
+ return (_this->hidden->mixbuf);
}
static int
DISKAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
{
- struct SDL_PrivateAudioData *h = this->hidden;
+ struct SDL_PrivateAudioData *h = _this->hidden;
const int origbuflen = buflen;
SDL_Delay(h->io_delay);
@@ -90,7 +90,7 @@ DISKAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
}
/* if we ran out of file, just write silence. */
- SDL_memset(buffer, this->spec.silence, buflen);
+ SDL_memset(buffer, _this->spec.silence, buflen);
return origbuflen;
}
@@ -105,11 +105,11 @@ DISKAUDIO_FlushCapture(_THIS)
static void
DISKAUDIO_CloseDevice(_THIS)
{
- if (this->hidden->io != NULL) {
- SDL_RWclose(this->hidden->io);
+ if (_this->hidden->io != NULL) {
+ SDL_RWclose(_this->hidden->io);
}
- SDL_free(this->hidden->mixbuf);
- SDL_free(this->hidden);
+ SDL_free(_this->hidden->mixbuf);
+ SDL_free(_this->hidden);
}
@@ -132,32 +132,32 @@ DISKAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture)
const char *fname = get_filename(iscapture, handle ? NULL : devname);
const char *envr = SDL_getenv(DISKENVR_IODELAY);
- this->hidden = (struct SDL_PrivateAudioData *)
- SDL_malloc(sizeof(*this->hidden));
- if (this->hidden == NULL) {
+ _this->hidden = (struct SDL_PrivateAudioData *)
+ SDL_malloc(sizeof(*_this->hidden));
+ if (_this->hidden == NULL) {
return SDL_OutOfMemory();
}
- SDL_zerop(this->hidden);
+ SDL_zerop(_this->hidden);
if (envr != NULL) {
- this->hidden->io_delay = SDL_atoi(envr);
+ _this->hidden->io_delay = SDL_atoi(envr);
} else {
- this->hidden->io_delay = ((this->spec.samples * 1000) / this->spec.freq);
+ _this->hidden->io_delay = ((_this->spec.samples * 1000) / _this->spec.freq);
}
/* Open the audio device */
- this->hidden->io = SDL_RWFromFile(fname, iscapture ? "rb" : "wb");
- if (this->hidden->io == NULL) {
+ _this->hidden->io = SDL_RWFromFile(fname, iscapture ? "rb" : "wb");
+ if (_this->hidden->io == NULL) {
return -1;
}
/* Allocate mixing buffer */
if (!iscapture) {
- this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->spec.size);
- if (this->hidden->mixbuf == NULL) {
+ _this->hidden->mixbuf = (Uint8 *) SDL_malloc(_this->spec.size);
+ if (_this->hidden->mixbuf == NULL) {
return SDL_OutOfMemory();
}
- SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size);
+ SDL_memset(_this->hidden->mixbuf, _this->spec.silence, _this->spec.size);
}
SDL_LogCritical(SDL_LOG_CATEGORY_AUDIO,
diff --git a/src/audio/disk/SDL_diskaudio.h b/src/audio/disk/SDL_diskaudio.h
index 9548fe502..8fdde7cac 100644
--- a/src/audio/disk/SDL_diskaudio.h
+++ b/src/audio/disk/SDL_diskaudio.h
@@ -27,7 +27,7 @@
#include "../SDL_sysaudio.h"
/* Hidden "this" pointer for the audio functions */
-#define _THIS SDL_AudioDevice *this
+#define _THIS SDL_AudioDevice *_this
struct SDL_PrivateAudioData
{
diff --git a/src/audio/dummy/SDL_dummyaudio.c b/src/audio/dummy/SDL_dummyaudio.c
index a62be1c83..6d6d61c0a 100644
--- a/src/audio/dummy/SDL_dummyaudio.c
+++ b/src/audio/dummy/SDL_dummyaudio.c
@@ -37,10 +37,10 @@ static int
DUMMYAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
{
/* Delay to make this sort of simulate real audio input. */
- SDL_Delay((this->spec.samples * 1000) / this->spec.freq);
+ SDL_Delay((_this->spec.samples * 1000) / _this->spec.freq);
/* always return a full buffer of silence. */
- SDL_memset(buffer, this->spec.silence, buflen);
+ SDL_memset(buffer, _this->spec.silence, buflen);
return buflen;
}
diff --git a/src/audio/dummy/SDL_dummyaudio.h b/src/audio/dummy/SDL_dummyaudio.h
index acab160fe..a39f439aa 100644
--- a/src/audio/dummy/SDL_dummyaudio.h
+++ b/src/audio/dummy/SDL_dummyaudio.h
@@ -26,7 +26,7 @@
#include "../SDL_sysaudio.h"
/* Hidden "this" pointer for the audio functions */
-#define _THIS SDL_AudioDevice *this
+#define _THIS SDL_AudioDevice *_this
struct SDL_PrivateAudioData
{