mirror of
https://github.com/sle118/squeezelite-esp32.git
synced 2025-12-09 04:57:06 +03:00
more aggressive handling of Spotify loudness war... - release
This commit is contained in:
@@ -125,7 +125,7 @@ function(NANOPB_GENERATE_CPP SRCS HDRS)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
set(CALL_PREFIX call)
|
set(CUSTOM_COMMAND_PREFIX call)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NANOPB_GENERATE_CPP_APPEND_PATH)
|
if(NANOPB_GENERATE_CPP_APPEND_PATH)
|
||||||
@@ -187,7 +187,7 @@ function(NANOPB_GENERATE_CPP SRCS HDRS)
|
|||||||
set(GENERATOR_CORE_PYTHON_SRC ${GENERATOR_CORE_PYTHON_SRC} ${output})
|
set(GENERATOR_CORE_PYTHON_SRC ${GENERATOR_CORE_PYTHON_SRC} ${output})
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT ${output}
|
OUTPUT ${output}
|
||||||
COMMAND ${CALL_PREFIX} ${PROTOBUF_PROTOC_EXECUTABLE}
|
COMMAND ${CUSTOM_COMMAND_PREFIX} ${PROTOBUF_PROTOC_EXECUTABLE}
|
||||||
ARGS -I${GENERATOR_PATH}/proto
|
ARGS -I${GENERATOR_PATH}/proto
|
||||||
--python_out=${GENERATOR_CORE_DIR} ${ABS_FIL}
|
--python_out=${GENERATOR_CORE_DIR} ${ABS_FIL}
|
||||||
DEPENDS ${ABS_FIL}
|
DEPENDS ${ABS_FIL}
|
||||||
@@ -279,7 +279,7 @@ function(NANOPB_GENERATE_CPP SRCS HDRS)
|
|||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_PATH_REL}/${FIL_WE}.pb.c"
|
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_PATH_REL}/${FIL_WE}.pb.c"
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_PATH_REL}/${FIL_WE}.pb.h"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_PATH_REL}/${FIL_WE}.pb.h"
|
||||||
COMMAND ${CALL_PREFIX} ${PROTOBUF_PROTOC_EXECUTABLE}
|
COMMAND ${CUSTOM_COMMAND_PREFIX} ${PROTOBUF_PROTOC_EXECUTABLE}
|
||||||
ARGS -I${GENERATOR_PATH} -I${GENERATOR_CORE_DIR}
|
ARGS -I${GENERATOR_PATH} -I${GENERATOR_CORE_DIR}
|
||||||
-I${CMAKE_CURRENT_BINARY_DIR} ${_nanopb_include_path}
|
-I${CMAKE_CURRENT_BINARY_DIR} ${_nanopb_include_path}
|
||||||
--plugin=protoc-gen-nanopb=${NANOPB_GENERATOR_PLUGIN}
|
--plugin=protoc-gen-nanopb=${NANOPB_GENERATOR_PLUGIN}
|
||||||
@@ -297,7 +297,7 @@ function(NANOPB_GENERATE_CPP SRCS HDRS)
|
|||||||
set(${HDRS} ${${HDRS}} ${NANOPB_HDRS} PARENT_SCOPE)
|
set(${HDRS} ${${HDRS}} ${NANOPB_HDRS} PARENT_SCOPE)
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
unset(CALL_PREFIX)
|
unset(CUSTOM_COMMAND_PREFIX)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|||||||
@@ -406,7 +406,7 @@ static bool cspot_cmd_handler(cspot_event_t cmd, va_list args)
|
|||||||
case CSPOT_VOLUME: {
|
case CSPOT_VOLUME: {
|
||||||
u32_t volume = va_arg(args, u32_t);
|
u32_t volume = va_arg(args, u32_t);
|
||||||
LOG_INFO("CSpot volume %u", volume);
|
LOG_INFO("CSpot volume %u", volume);
|
||||||
volume = 65536 * powf(volume / 65536.0f, 2);
|
volume = 65536 * powf(volume / 65536.0f, 4);
|
||||||
set_volume(volume, volume);
|
set_volume(volume, volume);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|||||||
Reference in New Issue
Block a user