From c61b3cef66c4aa05f2fa615ca6aaea2fd375a79e Mon Sep 17 00:00:00 2001
From: Matthias Ringwald <matthias@ringwald.ch>
Date: Mon, 6 Feb 2023 10:31:54 +0100
Subject: [PATCH] btstack_audio: use named struct initializer
---
CHANGELOG.md | 3 ++-
platform/embedded/btstack_audio_embedded.c | 20 +++++++++----------
.../components/btstack/btstack_audio_esp32.c | 20 +++++++++----------
3 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a939e8811..b42d01341 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,7 +23,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## Changed
- GAP: add gap_set_peer_privacy_mode with default LE_PRIVACY_MODE_DEVICE
-- bluetooth: indicated identity address in resolved address types
+- bluetooth: indicated identity address in resolved address type names
+- btstack_audio: added get_samplerate function to help with audio sample rate synchronization
- btstack_flash_bank: write empty tag instead of overwriting existing tag with ENABLE_TLV_FLASH_WRITE_ONCE
diff --git a/platform/embedded/btstack_audio_embedded.c b/platform/embedded/btstack_audio_embedded.c
index 4f1813762..9c9ae0baf 100644
--- a/platform/embedded/btstack_audio_embedded.c
+++ b/platform/embedded/btstack_audio_embedded.c
@@ -260,19 +260,19 @@ static void btstack_audio_embedded_source_close(void){
}
static const btstack_audio_sink_t btstack_audio_embedded_sink = {
- /* int (*init)(..);*/ &btstack_audio_embedded_sink_init,
- /* void (*set_volume)(uint8_t volume); */ &btstack_audio_embedded_sink_set_volume,
- /* void (*start_stream(void));*/ &btstack_audio_embedded_sink_start_stream,
- /* void (*stop_stream)(void) */ &btstack_audio_embedded_sink_stop_stream,
- /* void (*close)(void); */ &btstack_audio_embedded_sink_close
+ .init = &btstack_audio_embedded_sink_init,
+ .set_volume = &btstack_audio_embedded_sink_set_volume,
+ .start_stream = &btstack_audio_embedded_sink_start_stream,
+ .stop_stream = &btstack_audio_embedded_sink_stop_stream,
+ .close = &btstack_audio_embedded_sink_close
};
static const btstack_audio_source_t btstack_audio_embedded_source = {
- /* int (*init)(..);*/ &btstack_audio_embedded_source_init,
- /* void (*set_gain)(uint8_t gain); */ &btstack_audio_embedded_source_set_gain,
- /* void (*start_stream(void));*/ &btstack_audio_embedded_source_start_stream,
- /* void (*stop_stream)(void) */ &btstack_audio_embedded_source_stop_stream,
- /* void (*close)(void); */ &btstack_audio_embedded_source_close
+ .init = &btstack_audio_embedded_source_init,
+ .set_gain = &btstack_audio_embedded_source_set_gain,
+ .start_stream = &btstack_audio_embedded_source_start_stream,
+ .stop_stream = &btstack_audio_embedded_source_stop_stream,
+ .close = &btstack_audio_embedded_source_close
};
const btstack_audio_sink_t * btstack_audio_embedded_sink_get_instance(void){
diff --git a/port/esp32/components/btstack/btstack_audio_esp32.c b/port/esp32/components/btstack/btstack_audio_esp32.c
index 605e11bd3..a54f2cd3d 100644
--- a/port/esp32/components/btstack/btstack_audio_esp32.c
+++ b/port/esp32/components/btstack/btstack_audio_esp32.c
@@ -417,11 +417,11 @@ static void btstack_audio_esp32_sink_close(void){
}
static const btstack_audio_sink_t btstack_audio_esp32_sink = {
- /* int (*init)(..);*/ &btstack_audio_esp32_sink_init,
- /* void (*set_volume)(uint8_t gain); */ &btstack_audio_esp32_sink_set_volume,
- /* void (*start_stream(void));*/ &btstack_audio_esp32_sink_start_stream,
- /* void (*stop_stream)(void) */ &btstack_audio_esp32_sink_stop_stream,
- /* void (*close)(void); */ &btstack_audio_esp32_sink_close
+ .init = &btstack_audio_esp32_sink_init,
+ .set_volume = &btstack_audio_esp32_sink_set_volume,
+ .start_stream = &btstack_audio_esp32_sink_start_stream,
+ .stop_stream = &btstack_audio_esp32_sink_stop_stream,
+ .close = &btstack_audio_esp32_sink_close
};
const btstack_audio_sink_t * btstack_audio_esp32_sink_get_instance(void){
@@ -519,11 +519,11 @@ static void btstack_audio_esp32_source_close(void){
}
static const btstack_audio_source_t btstack_audio_esp32_source = {
- /* int (*init)(..);*/ &btstack_audio_esp32_source_init,
- /* void (*set_gain)(uint8_t gain); */ &btstack_audio_esp32_source_set_gain,
- /* void (*start_stream(void));*/ &btstack_audio_esp32_source_start_stream,
- /* void (*stop_stream)(void) */ &btstack_audio_esp32_source_stop_stream,
- /* void (*close)(void); */ &btstack_audio_esp32_source_close
+ .init = &btstack_audio_esp32_source_init,
+ .set_gain = &btstack_audio_esp32_source_set_gain,
+ .start_stream = &btstack_audio_esp32_source_start_stream,
+ .stop_stream = &btstack_audio_esp32_source_stop_stream,
+ .close = &btstack_audio_esp32_source_close
};
const btstack_audio_source_t * btstack_audio_esp32_source_get_instance(void){