Skip to content

Commit 8bb5e89

Browse files
pschatzmannpschatzmann
committed
compile warnings
1 parent b77fc8b commit 8bb5e89

File tree

9 files changed

+99
-22
lines changed

9 files changed

+99
-22
lines changed

‎examples/examples-stk/streams-stk_files-audiokit/CMakeLists.txt renamed to ‎examples/examples-stk/streams-stk-desktop/CMakeLists.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@ set (DCMAKE_CXX_FLAGS "-Werror")
88
include(FetchContent)
99
option(BUILD_SHARED_LIBS "Build using shared libraries" OFF)
1010

11-
# Build with arduino-audio-tools
12-
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
13-
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../.. ${CMAKE_CURRENT_BINARY_DIR}/arduino-audio-tools )
14-
endif()
15-
1611
FetchContent_Declare(arduino-stk GIT_REPOSITORY "https://github.com/pschatzmann/Arduino-STK.git" )
1712
FetchContent_GetProperties(arduino-stk)
1813
if(NOT arduino-stk_POPULATED)
1914
FetchContent_Populate(arduino-stk)
20-
add_subdirectory(${arduino-stk_SOURCE_DIR})
15+
add_subdirectory(${arduino-stk_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/arduino-stk)
2116
endif()
2217

18+
# Build with arduino-audio-tools
19+
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
20+
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../.. ${CMAKE_CURRENT_BINARY_DIR}/arduino-audio-tools )
21+
endif()
2322

2423
# build sketch as executable
25-
set_source_files_properties(streams-stk_files-audiokit.ino PROPERTIES LANGUAGE CXX)
26-
add_executable (stk_example streams-stk_files-audiokit.ino)
24+
set_source_files_properties(streams-stk-desktop.ino PROPERTIES LANGUAGE CXX)
25+
add_executable (stk_example streams-stk-desktop.ino)
2726

2827
# set preprocessor defines
2928
target_compile_definitions(arduino_emulator PUBLIC -DDEFINE_MAIN)
3029
target_compile_definitions(stk_example PUBLIC -DARDUINO -DIS_DESKTOP -DEXIT_ON_STOP)
30+
target_compile_definitions(arduino-stk PUBLIC -DIS_DESKTOP)
3131

3232
# OS/X might need this setting for core audio
3333
#target_compile_definitions(arduino-stk PUBLIC -DPA_USE_COREAUDIO=1)
3434

3535
# specify libraries
36-
target_link_libraries(stk_example arduino-stk_static arduino_emulator arduino-audio-tools arduino-stk)
36+
target_link_libraries(stk_example arduino-stk portaudio_static arduino_emulator arduino-audio-tools )
3737

‎examples/examples-stk/streams-stk-desktop/streams-stk-desktop.ino

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
/**
2+
* @file streams-stk-desktop.ino
3+
* @brief Build and run on desktop using PortAudio
4+
* @author Phil Schatzmann
5+
* @copyright Copyright (c) 2021
6+
*/
7+
8+
#include "Arduino.h"
9+
#include "AudioTools.h"
10+
#include "AudioLibs/AudioSTK.h"
11+
#include "AudioLibs/PortAudioStream.h"
12+
13+
STKStream<Instrmnt> in;
14+
PortAudioStream out;
15+
StreamCopy copier;
16+
MusicalNotes notes;
17+
Instrmnt* p_instrument=nullptr; // instrument depends on file system
18+
19+
float note_amplitude = 0.5;
20+
static uint16_t notes_array[] = { // frequencies aleatoric C-scale
21+
N_C3, N_D3, N_E3, N_F3, N_G3, N_A3, N_B3,
22+
N_C4, N_D4, N_E4, N_F4, N_G4, N_A4, N_B4,
23+
N_C5, N_D5, N_E5, N_F5, N_G5, N_A5, N_B5
24+
};
25+
26+
void play() {
27+
static bool active=true;
28+
static float freq;
29+
static uint64_t timeout;
30+
31+
if (millis()>timeout){
32+
if (active){
33+
// play note for 800 ms
34+
freq = notes_array[random(static_cast<long>(sizeof(notes_array)/sizeof(uint16_t)))];
35+
36+
Serial.print("playing ");
37+
Serial.println(freq);
38+
39+
p_instrument->noteOn(freq, note_amplitude);
40+
timeout = millis()+800;
41+
active = false;
42+
} else {
43+
// silence for 100 ms
44+
p_instrument->noteOff(note_amplitude);
45+
timeout = millis()+100;
46+
active = true;
47+
}
48+
}
49+
}
50+
51+
void setup() {
52+
Serial.begin(115200);
53+
AudioLogger::instance().begin(Serial,AudioLogger::Warning);
54+
55+
// We can allocate the incstument only after SD_M
56+
p_instrument = new BeeThree();
57+
in.setInput(p_instrument);;
58+
59+
// setup input
60+
auto icfg = in.defaultConfig();
61+
in.begin(icfg);
62+
63+
// setup output
64+
auto ocfg = out.defaultConfig(TX_MODE);
65+
ocfg.copyFrom(icfg);
66+
out.begin(ocfg);
67+
68+
}
69+
70+
void loop() {
71+
play();
72+
copier.copy();
73+
}

‎src/AudioCodecs/AudioEncoded.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class AudioDecoder : public AudioWriter, public AudioBaseInfoSource {
3030
setOutputStream(*p_print);
3131
setNotifyAudioChange(out_stream);
3232
}
33-
virtual void setOutputStream(Print &out_stream) = 0;
33+
virtual void setOutputStream(Print &out_stream) override = 0;
3434
// Th decoding result is PCM data
3535
virtual bool isResultPCM() { return true;}
3636
};
@@ -259,7 +259,7 @@ class EncodedAudioStream : public AudioPrint {
259259
return cfg;
260260
}
261261

262-
virtual void setAudioInfo(AudioBaseInfo info) {
262+
virtual void setAudioInfo(AudioBaseInfo info) override {
263263
LOGD(LOG_METHOD);
264264
AudioPrint::setAudioInfo(info);
265265
decoder_ptr->setAudioInfo(info);

‎src/AudioLibs/AudioSTK.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#pragma once
22

33
#include "AudioConfig.h"
4-
54
#include "Arduino.h"
6-
#include "freertos/FreeRTOS.h"
5+
#ifdef ESP32
6+
# include "freertos/FreeRTOS.h"
7+
#endif
78
#include "StkAll.h"
89

910
namespace audio_tools {

‎src/AudioLibs/PortAudioStream.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ class PortAudioStream : public AudioStreamX {
6363
result.is_input = true;
6464
result.is_output = true;
6565
break;
66+
default:
67+
LOGE("Unsupported Mode")
68+
break;
6669
}
6770

6871
return result;

‎src/AudioTools/AudioOutput.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class AudioPrint : public Print, public AudioBaseInfoDependent, public AudioBase
3838
}
3939

4040
// overwrite to do something useful
41-
virtual void setAudioInfo(AudioBaseInfo info) {
41+
virtual void setAudioInfo(AudioBaseInfo info) override {
4242
LOGD(LOG_METHOD);
4343
cfg = info;
4444
info.logInfo();
@@ -47,7 +47,7 @@ class AudioPrint : public Print, public AudioBaseInfoDependent, public AudioBase
4747
}
4848
}
4949

50-
virtual void setNotifyAudioChange(AudioBaseInfoDependent &bi) {
50+
virtual void setNotifyAudioChange(AudioBaseInfoDependent &bi) override {
5151
p_notify = &bi;
5252
}
5353

@@ -686,7 +686,7 @@ class MemoryPrint : public AudioPrint {
686686
}
687687
}
688688

689-
int availableForWrite() {
689+
int availableForWrite() override {
690690
return size-pos;
691691
}
692692

‎src/AudioTools/AudioSource.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class AudioSourceCallback : public AudioSource {
9494
return indexStreamCallback == nullptr ? nullptr : indexStreamCallback(index);
9595
}
9696
/// Returns audio stream by path
97-
virtual Stream* selectStream(const char* path) {
97+
virtual Stream* selectStream(const char* path) override {
9898
this->path = path;
9999
return indexStreamCallback == nullptr ? nullptr : indexStreamCallback(-1);
100100
};

‎src/AudioTools/AudioStreams.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ class GeneratedSoundStream : public AudioStreamX {
533533
bool begin() override {
534534
LOGD(LOG_METHOD);
535535
if (generator_ptr==nullptr){
536-
LOGE(source_not_defined_error);
536+
LOGE("%s",source_not_defined_error);
537537
return false;
538538
}
539539
generator_ptr->begin();
@@ -547,7 +547,7 @@ class GeneratedSoundStream : public AudioStreamX {
547547
bool begin(AudioBaseInfo cfg) {
548548
LOGD(LOG_METHOD);
549549
if (generator_ptr==nullptr){
550-
LOGE(source_not_defined_error);
550+
LOGE("%s",source_not_defined_error);
551551
return false;
552552
}
553553
generator_ptr->begin(cfg);
@@ -1322,7 +1322,7 @@ class MeasuringStream : public AudioStreamX {
13221322
if (p_logout!=nullptr){
13231323
p_logout->println(msg);
13241324
} else {
1325-
LOGI(msg);
1325+
LOGI("%s",msg);
13261326
}
13271327
}
13281328

‎src/AudioTools/AudioStreamsConverter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class ChannelFormatConverterStreamT : public AudioStreamX {
8484
buffer.resize(result_samples);
8585
result = converter.convert((uint8_t*)buffer.data(),(uint8_t*) in_data, size);
8686
if (result!=result_samples*sizeof(T)){
87-
LOGE("size %d -> result: %d - expeced: %d", (int) size, (int) result, (int) result_samples*sizeof(T));
87+
LOGE("size %d -> result: %d - expeced: %d", (int) size, (int) result, static_cast<int>(result_samples*sizeof(T)));
8888
}
8989
return result;
9090
}
@@ -280,7 +280,7 @@ class NumberFormatConverterStreamT : public AudioStreamX {
280280
p_print = &print;
281281
}
282282

283-
bool begin(){
283+
bool begin() override {
284284
return true;
285285
}
286286

0 commit comments

Comments
 (0)