summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVito Caputo <vcaputo@pengaru.com>2020-09-08 23:41:38 -0700
committerVito Caputo <vcaputo@pengaru.com>2020-09-08 23:42:24 -0700
commite9aa96e3fa9be9117f5407619fc65292da34c441 (patch)
treef2635a070a88f5a0c4c738c2f7413ab7046fad82
parentb19afd5ed632358096e86240629134777f4ae669 (diff)
capture_audio: s/sound/audio/ where reasonable
Largely mechanical change just finishing up cosmetic rename of rmd_capture_sound->rmd_capture_audio
-rw-r--r--src/rmd_capture_audio.c10
-rw-r--r--src/rmd_capture_audio.h8
-rw-r--r--src/rmd_threads.c2
3 files changed, 10 insertions, 10 deletions
diff --git a/src/rmd_capture_audio.c b/src/rmd_capture_audio.c
index 217ef0a..1d5b596 100644
--- a/src/rmd_capture_audio.c
+++ b/src/rmd_capture_audio.c
@@ -42,12 +42,12 @@
#include <time.h>
-void *rmdCaptureSound(ProgData *pdata) {
+void *rmdCaptureAudio(ProgData *pdata) {
#ifdef HAVE_LIBASOUND
int frames = pdata->periodsize;
#endif
- rmdThreadsSetName("rmdCaptureSound");
+ rmdThreadsSetName("rmdCaptureAudio");
//start capturing only after first frame is taken
nanosleep(&(struct timespec){ .tv_nsec = pdata->frametime * 1000 }, NULL);
@@ -80,7 +80,7 @@ void *rmdCaptureSound(ProgData *pdata) {
//didn't magically change
);
if (pdata->sound_handle == NULL) {
- fprintf(stderr, "Couldn't reopen sound device.Exiting\n");
+ fprintf(stderr, "Couldn't reopen audio device. Exiting\n");
pdata->running = FALSE;
errno = 3;
pthread_exit(&errno);
@@ -95,7 +95,7 @@ void *rmdCaptureSound(ProgData *pdata) {
pdata->args.channels,
pdata->args.frequency);
if (pdata->sound_handle < 0) {
- fprintf(stderr, "Couldn't reopen sound device. Exiting\n");
+ fprintf(stderr, "Couldn't reopen audio device. Exiting\n");
pdata->running = FALSE;
errno = 3;
pthread_exit(&errno);
@@ -123,7 +123,7 @@ void *rmdCaptureSound(ProgData *pdata) {
snd_strerror(temp_sret));
snd_pcm_prepare(pdata->sound_handle);
} else if (temp_sret < 0) {
- fprintf(stderr, "An error occured while reading sound data:\n"
+ fprintf(stderr, "An error occured while reading audio data:\n"
" %s\n",
snd_strerror(temp_sret));
snd_pcm_prepare(pdata->sound_handle);
diff --git a/src/rmd_capture_audio.h b/src/rmd_capture_audio.h
index b403fa8..a55ea8c 100644
--- a/src/rmd_capture_audio.h
+++ b/src/rmd_capture_audio.h
@@ -24,19 +24,19 @@
* For further information contact me at johnvarouhakis@gmail.com *
******************************************************************************/
-#ifndef CAPTURE_SOUND_H
-#define CAPTURE_SOUND_H 1
+#ifndef CAPTURE_AUDIO_H
+#define CAPTURE_AUDIO_H 1
#include "rmd_types.h"
/**
-* Sound capturing thread. Data are placed on a
+* Audio capturing thread. Data are placed on a
* list to be picked up by other threads.
*
* \param pdata ProgData struct containing all program data
*/
-void *rmdCaptureSound(ProgData *pdata);
+void *rmdCaptureAudio(ProgData *pdata);
#endif
diff --git a/src/rmd_threads.c b/src/rmd_threads.c
index eea710c..1859a56 100644
--- a/src/rmd_threads.c
+++ b/src/rmd_threads.c
@@ -83,7 +83,7 @@ void rmdThreads(ProgData *pdata) {
if (!pdata->args.use_jack)
pthread_create( &sound_capture_t,
NULL,
- (void *)rmdCaptureSound,
+ (void *)rmdCaptureAudio,
(void *)pdata);
if (pdata->args.encOnTheFly)
© All Rights Reserved