encode_audio_buffer: s/sound/audio/ where appropriate

Largely mechanical cosmetic changes for more consistency

5 files changed, 12 insertions, 12 deletions

diff --git a/src/rmd_encode_audio_buffer.c b/src/rmd_encode_audio_buffer.c
index 1aa9943..0be0e2f 100644
--- a/src/rmd_encode_audio_buffer.c
+++ b/src/rmd_encode_audio_buffer.c
@@ -37,7 +37,7 @@
 #include <errno.h>
 
 
-void *rmdEncodeSoundBuffer(ProgData *pdata) {
+void *rmdEncodeAudioBuffer(ProgData *pdata) {
 	int	sampread = pdata->periodsize;
 #ifdef HAVE_LIBJACK
 	void	*jackbuf = NULL;
@@ -46,7 +46,7 @@ void *rmdEncodeSoundBuffer(ProgData *pdata) {
 		jackbuf = malloc(pdata->sound_framesize * pdata->jdata->buffersize);
 #endif
 
-	rmdThreadsSetName("rmdEncodeSound");
+	rmdThreadsSetName("rmdEncodeAudio");
 
 	pdata->v_encoding_clean = 0;
 	while (pdata->running) {
@@ -136,7 +136,7 @@ void *rmdEncodeSoundBuffer(ProgData *pdata) {
 	pthread_exit(&errno);
 }
 
-void rmdSyncEncodeSoundBuffer(ProgData *pdata, signed char *buff) {
+void rmdSyncEncodeAudioBuffer(ProgData *pdata, signed char *buff) {
 	int	sampread = (buff != NULL) ? pdata->periodsize : 0;
 	float	**vorbis_buffer = vorbis_analysis_buffer(&pdata->enc_data->m_vo_dsp, sampread);
 
diff --git a/src/rmd_encode_audio_buffer.h b/src/rmd_encode_audio_buffer.h
index 7d5c312..bf34b0b 100644
--- a/src/rmd_encode_audio_buffer.h
+++ b/src/rmd_encode_audio_buffer.h
@@ -24,28 +24,28 @@
 *   For further information contact me at johnvarouhakis@gmail.com            *
 ******************************************************************************/
 
-#ifndef ENCODE_SOUND_BUFFER_H
-#define ENCODE_SOUND_BUFFER_H 1
+#ifndef ENCODE_AUDIO_BUFFER_H
+#define ENCODE_AUDIO_BUFFER_H 1
 
 #include "rmd_types.h"
 
 
 /**
-* Sound encoding thread. Picks up data from the buffer queue ,
+* Audio encoding thread. Picks up data from the buffer queue ,
 * encodes and places them on the vorbis stream.
 *
 * \param pdata ProgData struct containing all program data
 */
-void *rmdEncodeSoundBuffer(ProgData *pdata);
+void *rmdEncodeAudioBuffer(ProgData *pdata);
 
 /**
-* As rmdEncodeSoundBuffer, only with the assumption that
+* As rmdEncodeAudioBuffer, only with the assumption that
 * this is not a thread on it's own
 *
 * \param pdata ProgData struct containing all program data
 *
 */
-void rmdSyncEncodeSoundBuffer(ProgData *pdata,signed char *buff);
+void rmdSyncEncodeAudioBuffer(ProgData *pdata,signed char *buff);
 
 
 #endif
diff --git a/src/rmd_flush_to_ogg.c b/src/rmd_flush_to_ogg.c
index ced0ea4..100c5d1 100644
--- a/src/rmd_flush_to_ogg.c
+++ b/src/rmd_flush_to_ogg.c
@@ -149,7 +149,7 @@ void *rmdFlushToOgg(ProgData *pdata) {
 					while (!pdata->v_encoding_clean)
 						pthread_cond_wait(&pdata->vorbis_lib_clean, &pdata->vorbis_lib_mutex);
 					pthread_mutex_unlock(&pdata->vorbis_lib_mutex);
-					rmdSyncEncodeSoundBuffer(pdata, NULL);
+					rmdSyncEncodeAudioBuffer(pdata, NULL);
 				}
 			}
 		}
diff --git a/src/rmd_load_cache.c b/src/rmd_load_cache.c
index 24c22e1..4fbacfd 100644
--- a/src/rmd_load_cache.c
+++ b/src/rmd_load_cache.c
@@ -300,7 +300,7 @@ void *rmdLoadCache(ProgData *pdata) {
 				if (nbytes <= 0)
 					audio_end = 1;
 				else
-					rmdSyncEncodeSoundBuffer(pdata, sound_data);
+					rmdSyncEncodeAudioBuffer(pdata, sound_data);
 			}
 		}
 	}
diff --git a/src/rmd_threads.c b/src/rmd_threads.c
index f7937c4..dcc9f51 100644
--- a/src/rmd_threads.c
+++ b/src/rmd_threads.c
@@ -89,7 +89,7 @@ void rmdThreads(ProgData *pdata) {
 		if (pdata->args.encOnTheFly)
 			pthread_create(	&sound_encode_t,
 					NULL,
-					(void *)rmdEncodeSoundBuffer,
+					(void *)rmdEncodeAudioBuffer,
 					(void *)pdata);
 		else
 			pthread_create(	&sound_cache_t,