chore: cleanup SDL2 definitions (#6467)
This commit is contained in:
@@ -706,11 +706,6 @@ bool AudioQueue::isPlaying(uint8_t id)
|
||||
|
||||
void AudioQueue::playTone(uint16_t freq, uint16_t len, uint16_t pause, uint8_t flags, int8_t freqIncr, int8_t fragmentVolume)
|
||||
{
|
||||
#if defined(SIMU) && !defined(SIMU_AUDIO)
|
||||
#warning "NO audio"
|
||||
return;
|
||||
#endif
|
||||
|
||||
_audio_lock();
|
||||
|
||||
freq = limit<uint16_t>(BEEP_MIN_FREQ, freq, BEEP_MAX_FREQ);
|
||||
@@ -772,14 +767,6 @@ void AudioQueue::playFile(const char * filename, uint8_t flags, uint8_t id, int8
|
||||
|
||||
void AudioQueue::stopPlay(uint8_t id)
|
||||
{
|
||||
#if defined(SIMU)
|
||||
TRACE("stopPlay(id=%d)", id);
|
||||
#endif
|
||||
|
||||
#if defined(SIMU) && !defined(SIMU_AUDIO)
|
||||
return;
|
||||
#endif
|
||||
|
||||
_audio_lock();
|
||||
|
||||
fragmentsFifo.removePromptById(id);
|
||||
|
||||
+1
-4
@@ -88,7 +88,7 @@ constexpr uint8_t AUDIO_FILENAME_MAXLEN = (AUDIO_LUA_FILENAME_MAXLEN > AUDIO_MOD
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(SIMU) && defined(SIMU_AUDIO)
|
||||
#if defined(SIMU)
|
||||
#define AUDIO_BUFFER_COUNT (10) // simulator needs more buffers for smooth audio
|
||||
#elif defined(AUDIO_SPI)
|
||||
#define AUDIO_BUFFER_COUNT (2) // smaller than Taranis since there is also a buffer on the ADC chip
|
||||
@@ -421,9 +421,6 @@ class AudioFragmentFifo
|
||||
|
||||
class AudioQueue {
|
||||
|
||||
#if defined(SIMU_AUDIO)
|
||||
friend void fillAudioBuffer(void *, uint8_t *, int);
|
||||
#endif
|
||||
#if defined(CLI)
|
||||
friend void printAudioVars();
|
||||
#endif
|
||||
|
||||
@@ -36,14 +36,6 @@ set(SIMU_DRIVERS ${SIMU_DRIVERS}
|
||||
)
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
if(SDL2_FOUND)
|
||||
include_directories(${SDL2_INCLUDE_DIRS})
|
||||
target_compile_options(radiolib_native PUBLIC -DSIMU_AUDIO)
|
||||
if(TARGET SDL2::SDL2)
|
||||
set(SDL2_LIBRARIES SDL2::SDL2)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(SIMU_LUA_COMPILER)
|
||||
add_definitions(-DLUA_COMPILER)
|
||||
endif()
|
||||
@@ -99,7 +91,9 @@ if(Qt6Widgets_FOUND)
|
||||
list(APPEND SIMULATOR_SRC ${SIMU_SRC} opentxsimulator.cpp)
|
||||
|
||||
add_library(${SIMULATOR_TARGET} SHARED ${SIMULATOR_SRC})
|
||||
if(SDL2_FOUND)
|
||||
|
||||
if(TARGET SDL2::SDL2)
|
||||
set(SDL2_LIBRARIES SDL2::SDL2)
|
||||
target_sources(${SIMULATOR_TARGET} PRIVATE simuaudio.cpp)
|
||||
else()
|
||||
target_sources(${SIMULATOR_TARGET} PRIVATE no_audio.cpp)
|
||||
@@ -170,28 +164,26 @@ endif()
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS}")
|
||||
|
||||
add_executable(simu
|
||||
EXCLUDE_FROM_ALL
|
||||
${SIMU_SRC}
|
||||
simuaudio.cpp
|
||||
display.cpp
|
||||
widgets.cpp
|
||||
knobs.cpp
|
||||
sdl_simu.cpp
|
||||
)
|
||||
if(TARGET SDL2:SDL2)
|
||||
add_executable(simu
|
||||
EXCLUDE_FROM_ALL
|
||||
${SIMU_SRC}
|
||||
simuaudio.cpp
|
||||
display.cpp
|
||||
widgets.cpp
|
||||
knobs.cpp
|
||||
sdl_simu.cpp
|
||||
)
|
||||
|
||||
include(FetchImgui)
|
||||
target_compile_options(simu PUBLIC -DSIMU)
|
||||
include(FetchImgui)
|
||||
target_compile_options(simu PUBLIC -DSIMU)
|
||||
|
||||
add_png_target(image_assets "assets/images/*.png")
|
||||
add_dependencies(simu image_assets)
|
||||
add_png_target(image_assets "assets/images/*.png")
|
||||
add_dependencies(simu image_assets)
|
||||
|
||||
set(STB_DIR ${RADIO_SRC_DIR}/thirdparty/stb)
|
||||
target_include_directories(simu PUBLIC ${STB_DIR})
|
||||
target_link_libraries(simu PUBLIC imgui)
|
||||
|
||||
target_link_libraries(simu PUBLIC
|
||||
${SDL2_LIBRARIES}
|
||||
)
|
||||
set(STB_DIR ${RADIO_SRC_DIR}/thirdparty/stb)
|
||||
target_include_directories(simu PUBLIC ${STB_DIR})
|
||||
target_link_libraries(simu PUBLIC imgui)
|
||||
endif()
|
||||
|
||||
PrintTargetReport("simu/libsimulator")
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#include <stdint.h>
|
||||
#include <SDL.h>
|
||||
|
||||
#define SIMU_AUDIO_FMT AUDIO_S16SYS
|
||||
#define AUDIO_FMT AUDIO_S16SYS
|
||||
|
||||
static SDL_AudioDeviceID _sdl_audio_device = 0;
|
||||
|
||||
@@ -33,7 +33,7 @@ void simuQueueAudio(const uint8_t* data, uint32_t len)
|
||||
{
|
||||
#if !defined(SOFTWARE_VOLUME)
|
||||
int volume = (simuAudioGetVolume() * SDL_MIX_MAXVOLUME ) / VOLUME_LEVEL_MAX;
|
||||
SDL_MixAudioFormat((uint8_t*)data, data, SIMU_AUDIO_FMT, len, volume);
|
||||
SDL_MixAudioFormat((uint8_t*)data, data, AUDIO_FMT, len, volume);
|
||||
#endif
|
||||
|
||||
SDL_QueueAudio(_sdl_audio_device, data, len);
|
||||
@@ -43,7 +43,7 @@ bool simuAudioInit()
|
||||
{
|
||||
SDL_AudioSpec wanted = {
|
||||
.freq = AUDIO_SAMPLE_RATE,
|
||||
.format = SIMU_AUDIO_FMT,
|
||||
.format = AUDIO_FMT,
|
||||
.channels = 1,
|
||||
.silence = 0,
|
||||
.samples = 1024,
|
||||
|
||||
Reference in New Issue
Block a user