Fixes to build with newer btstack v1.8 (#742)

Merging as the pico-examples build is broken by the btstack update

Author: peterharperuk

pico_w/bt/CMakeLists.txt

@@ -5,14 +5,15 @@ set(BTSTACK_EXAMPLE_PATH ${BTSTACK_ROOT}/example)
 set(BTSTACK_3RD_PARTY_PATH ${BTSTACK_ROOT}/3rd-party)
 set(BT_EXAMPLE_COMMON_DIR "${CMAKE_CURRENT_LIST_DIR}")
 
-if (NOT PICO_EXTRAS_PATH)
-        message("Skipping some Pico W BTstack examples that require pico-extras")
-else()
-        add_library(pico_btstack_audio_example INTERFACE)
+add_library(pico_btstack_audio_example INTERFACE)
+target_sources(pico_btstack_audio_example INTERFACE
+        ${PICO_BTSTACK_PATH}/src/btstack_audio.c
+        ${PICO_BTSTACK_PATH}/src/btstack_audio_generator.c
+        )
+if (PICO_EXTRAS_PATH)
         target_sources(pico_btstack_audio_example INTERFACE
-                ${PICO_BTSTACK_PATH}/src/btstack_audio.c
                 ${CMAKE_CURRENT_LIST_DIR}/btstack_audio_pico.c
-                )
+        )
         target_link_libraries(pico_btstack_audio_example INTERFACE
                 pico_audio_i2s
                 )
@@ -22,13 +23,17 @@ endif()
 add_library(pico_btstack_hxcmod_player INTERFACE)
 target_sources(pico_btstack_hxcmod_player INTERFACE
         ${BTSTACK_3RD_PARTY_PATH}/hxcmod-player/hxcmod.c
-        ${BTSTACK_3RD_PARTY_PATH}/hxcmod-player/mods/nao-deceased_by_disease.c
+        ${BTSTACK_3RD_PARTY_PATH}/hxcmod-player/mods/mod.c
         )
 target_include_directories(pico_btstack_hxcmod_player INTERFACE
         ${BTSTACK_3RD_PARTY_PATH}/hxcmod-player
         ${BTSTACK_3RD_PARTY_PATH}/hxcmod-player/mods
         )
-
+if (PICO_EXTRAS_PATH)
+        target_compile_definitions(pico_btstack_hxcmod_player INTERFACE
+                ENABLE_MODPLAYER=1
+                )
+endif()
 add_library(pico_btstack_sco_demo_util INTERFACE)
 target_sources(pico_btstack_sco_demo_util INTERFACE
         # sco demo utils
@@ -53,10 +58,10 @@ target_compile_definitions(picow_bt_example_common INTERFACE
         #WANT_HCI_DUMP=1 # This enables btstack debug
         #ENABLE_SEGGER_RTT=1
         )
-if (TARGET pico_btstack_audio_example)
-        target_link_libraries(picow_bt_example_common INTERFACE
-                pico_btstack_audio_example
-                )
+target_link_libraries(picow_bt_example_common INTERFACE
+        pico_btstack_audio_example
+        )
+if (PICO_EXTRAS_PATH)
         target_compile_definitions(picow_bt_example_common INTERFACE
                 TEST_AUDIO=1
                 )

pico_w/bt/btstack_audio_pico.c

@@ -59,7 +59,7 @@
 #define SAMPLES_PER_BUFFER 512
 
 // client
-static void (*playback_callback)(int16_t * buffer, uint16_t num_samples);
+static void (*playback_callback)(int16_t * buffer, uint16_t num_samples, const btstack_audio_context_t * timeinfo);
 
 // timer to fill output ring buffer
 static btstack_timer_source_t  driver_timer_sink;
@@ -117,7 +117,7 @@ static void btstack_audio_pico_sink_fill_buffers(void){
         }
 
         int16_t * buffer16 = (int16_t *) audio_buffer->buffer->bytes;
-        (*playback_callback)(buffer16, audio_buffer->max_sample_count);
+        (*playback_callback)(buffer16, audio_buffer->max_sample_count, 0);
 
         // duplicate samples for mono
         if (btstack_audio_pico_channel_count == 1){
@@ -146,7 +146,7 @@ static void driver_timer_handler_sink(btstack_timer_source_t * ts){
 static int btstack_audio_pico_sink_init(
     uint8_t channels,
     uint32_t samplerate, 
-    void (*playback)(int16_t * buffer, uint16_t num_samples)
+    void (*playback)(int16_t * buffer, uint16_t num_samples, const btstack_audio_context_t * timeinfo)
 ){
     btstack_assert(playback != NULL);
     btstack_assert(channels != 0);