Skip to content

Commit ac8a699

Browse files
committed
Fix Windows build break from CALLBACK macro collision in input mode enum
1 parent 0e6ce51 commit ac8a699

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/gui/app.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1851,8 +1851,8 @@ bool App::startRadioRx() {
18511851

18521852
audio_.setInputCaptureMode(
18531853
radio_rx_force_queue_mode_
1854-
? AudioEngine::InputCaptureMode::QUEUE
1855-
: AudioEngine::InputCaptureMode::AUTO);
1854+
? AudioEngine::InputCaptureMode::Queue
1855+
: AudioEngine::InputCaptureMode::Auto);
18561856

18571857
std::string input_dev = getInputDeviceName();
18581858
if (!input_dev.empty()) {

src/gui/audio_engine.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,13 @@ bool AudioEngine::openInput(const std::string& device) {
135135

136136
bool use_queue_capture = false;
137137
switch (input_capture_mode_) {
138-
case InputCaptureMode::QUEUE:
138+
case InputCaptureMode::Queue:
139139
use_queue_capture = true;
140140
break;
141-
case InputCaptureMode::CALLBACK:
141+
case InputCaptureMode::Callback:
142142
use_queue_capture = false;
143143
break;
144-
case InputCaptureMode::AUTO:
144+
case InputCaptureMode::Auto:
145145
#ifdef _WIN32
146146
// Win10 low-end stability: prefer queued capture by default.
147147
use_queue_capture = true;

src/gui/audio_engine.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ using AudioEngineMutex = std::mutex;
4141
class AudioEngine {
4242
public:
4343
enum class InputCaptureMode {
44-
AUTO,
45-
CALLBACK,
46-
QUEUE
44+
Auto,
45+
Callback,
46+
Queue
4747
};
4848

4949
AudioEngine();
@@ -135,7 +135,7 @@ class AudioEngine {
135135
SDL_AudioDeviceID output_device_ = 0;
136136
SDL_AudioDeviceID input_device_ = 0;
137137
bool input_queue_mode_ = false;
138-
InputCaptureMode input_capture_mode_ = InputCaptureMode::AUTO;
138+
InputCaptureMode input_capture_mode_ = InputCaptureMode::Auto;
139139

140140
// TX buffer (samples waiting to be played)
141141
std::queue<float> tx_queue_;

0 commit comments

Comments
 (0)