From 702c364cebf2ca07045d7b341710779c8450fb10 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Thu, 27 Feb 2014 00:20:43 -0700 Subject: [PATCH 1/3] Fix a memory leak in ca_warn (CoreAudio) --- plugins/mac-capture/mac-audio.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/mac-capture/mac-audio.c b/plugins/mac-capture/mac-audio.c index f858201cc..906e1baec 100644 --- a/plugins/mac-capture/mac-audio.c +++ b/plugins/mac-capture/mac-audio.c @@ -83,9 +83,12 @@ static inline void ca_warn(struct coreaudio_data *ca, const char *func, struct dstr str = {0}; va_start(args, format); + dstr_printf(&str, "[%s]:[device '%s'] ", func, ca->device_name); dstr_vcatf(&str, format, args); blog(LOG_WARNING, "%s", str.array); + dstr_free(&str); + va_end(args); } From 9e8c003282fa8a17411563327fcc6c01b947a296 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Thu, 27 Feb 2014 00:32:03 -0700 Subject: [PATCH 2/3] Remove redundant connect message --- plugins/mac-capture/mac-audio.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/plugins/mac-capture/mac-audio.c b/plugins/mac-capture/mac-audio.c index 906e1baec..dd5259e74 100644 --- a/plugins/mac-capture/mac-audio.c +++ b/plugins/mac-capture/mac-audio.c @@ -293,11 +293,8 @@ static void *reconnect_thread(void *param) ca->reconnecting = true; while (event_timedwait(ca->exit_event, RETRY_TIME) == ETIMEDOUT) { - if (coreaudio_init(ca)) { - blog(LOG_INFO, "coreaudio: device '%s' connected", - ca->device_name); + if (coreaudio_init(ca)) break; - } } blog(LOG_DEBUG, "coreaudio: exit the reconnect thread"); From 9236b940a2c51ba3e7081a186c2db888e9b5bd82 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Thu, 27 Feb 2014 04:12:41 -0700 Subject: [PATCH 3/3] Fix audio startup (CoreAudio) Forgot to add a '!'. --- plugins/mac-capture/mac-audio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/mac-capture/mac-audio.c b/plugins/mac-capture/mac-audio.c index dd5259e74..d51457a5b 100644 --- a/plugins/mac-capture/mac-audio.c +++ b/plugins/mac-capture/mac-audio.c @@ -503,7 +503,7 @@ static bool coreaudio_init(struct coreaudio_data *ca) if (!ca_success(stat, ca, "coreaudio_initialize", "initialize")) goto fail; - if (coreaudio_start(ca)) + if (!coreaudio_start(ca)) goto fail; blog(LOG_INFO, "coreaudio: device '%s' initialized", ca->device_name);