Deal better with the user forgetting to set width/height on effects that require...

[nageru] / nageru / alsa_pool.cpp

diff --git a/nageru/alsa_pool.cpp b/nageru/alsa_pool.cpp
index 3092dc32335551deed1b2b7b2255c07b7e9a19db..bdff5af09917b0c13a79bc5453b3e255ffd02ff4 100644 (file)
--- a/nageru/alsa_pool.cpp
+++ b/nageru/alsa_pool.cpp
@@ -44,7 +44,7 @@ ALSAPool::~ALSAPool()
        const uint64_t one = 1;
        if (write(should_quit_fd, &one, sizeof(one)) != sizeof(one)) {
                perror("write(should_quit_fd)");
-               exit(1);
+               abort();
        }
        inotify_thread.join();
 
@@ -402,7 +402,7 @@ void ALSAPool::reset_device(unsigned index)
                inputs[index].reset();
        } else {
                // TODO: Put on a background thread instead of locking?
-               auto callback = bind(&AudioMixer::add_audio, global_audio_mixer, DeviceSpec{InputSourceType::ALSA_INPUT, index}, _1, _2, _3, _4, _5);
+               auto callback = bind(&AudioMixer::add_audio, global_audio_mixer, DeviceSpec{InputSourceType::ALSA_INPUT, index}, _1, _2, _3, _4);
                inputs[index].reset(new ALSAInput(device->address.c_str(), OUTPUT_FREQUENCY, device->num_channels, callback, this, index));
                inputs[index]->start_capture_thread();
        }