Rewrite the ALSA sequencer input loop.

[nageru] / mixer.cpp

diff --git a/mixer.cpp b/mixer.cpp
index d7f86558e16a98d4ada1be0632f9489c3eb9294f..aabc67e543fdfade00bc018f86d2cdd837b5d266 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -280,7 +280,7 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, bool
 
        DeviceSpec device{InputSourceType::CAPTURE_CARD, card_index};
        audio_mixer.reset_resampler(device);
-       audio_mixer.set_name(device, card->capture->get_description());
+       audio_mixer.set_display_name(device, card->capture->get_description());
        audio_mixer.trigger_state_changed_callback();
 }
 
@@ -857,7 +857,10 @@ void Mixer::audio_thread_func()
 
                ResamplingQueue::RateAdjustmentPolicy rate_adjustment_policy =
                        task.adjust_rate ? ResamplingQueue::ADJUST_RATE : ResamplingQueue::DO_NOT_ADJUST_RATE;
-               vector<float> samples_out = audio_mixer.get_output(double(task.pts_int) / TIMEBASE, task.num_samples, rate_adjustment_policy);
+               vector<float> samples_out = audio_mixer.get_output(
+                       double(task.pts_int) / TIMEBASE,
+                       task.num_samples,
+                       rate_adjustment_policy);
 
                // Send the samples to the sound card, then add them to the output.
                if (alsa) {