Rename reset_device to reset_resampler.

[nageru] / audio_mixer.cpp

diff --git a/audio_mixer.cpp b/audio_mixer.cpp
index 30fe9cbb77b95bc123e52e017170372b199e72cf..c1f74107ff382403f9112e04f7d312a65185d3ac 100644 (file)
--- a/audio_mixer.cpp
+++ b/audio_mixer.cpp
@@ -106,15 +106,16 @@ AudioMixer::AudioMixer(unsigned num_cards)
        set_input_mapping(new_input_mapping);
 }
 
-void AudioMixer::reset_device(DeviceSpec device_spec)
+void AudioMixer::reset_resampler(DeviceSpec device_spec)
 {
        lock_guard<mutex> lock(audio_mutex);
-       reset_device_mutex_held(device_spec);
+       reset_resampler_mutex_held(device_spec);
 }
 
-void AudioMixer::reset_device_mutex_held(DeviceSpec device_spec)
+void AudioMixer::reset_resampler_mutex_held(DeviceSpec device_spec)
 {
        AudioDevice *device = find_audio_device(device_spec);
+
        if (device->interesting_channels.empty()) {
                device->resampling_queue.reset();
        } else {
@@ -450,7 +451,7 @@ void AudioMixer::set_input_mapping(const InputMapping &new_input_mapping)
                AudioDevice *device = find_audio_device(device_spec);
                if (device->interesting_channels != interesting_channels[device_spec]) {
                        device->interesting_channels = interesting_channels[device_spec];
-                       reset_device_mutex_held(device_spec);
+                       reset_resampler_mutex_held(device_spec);
                }
        }