X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Faudio_mixer.cpp;h=d62f1e180ff7f8a2f14fef69c44b9145763bfa44;hb=cc295d633756a6e43a36fc3b0b8f38021b4bfe49;hp=7bb1ddd8e4cb9b1a3d02deeca9c401e115660373;hpb=131a051c4cd3719a9be415386fdf0f4e15da7c66;p=nageru diff --git a/nageru/audio_mixer.cpp b/nageru/audio_mixer.cpp index 7bb1ddd..d62f1e1 100644 --- a/nageru/audio_mixer.cpp +++ b/nageru/audio_mixer.cpp @@ -18,7 +18,7 @@ #include #include -#include "db.h" +#include "decibel.h" #include "flags.h" #include "shared/metrics.h" #include "state.pb.h" @@ -244,7 +244,7 @@ void AudioMixer::reset_resampler_mutex_held(DeviceSpec device_spec) } } -bool AudioMixer::add_audio(DeviceSpec device_spec, const uint8_t *data, unsigned num_samples, AudioFormat audio_format, int64_t frame_length, steady_clock::time_point frame_time) +bool AudioMixer::add_audio(DeviceSpec device_spec, const uint8_t *data, unsigned num_samples, AudioFormat audio_format, steady_clock::time_point frame_time) { AudioDevice *device = find_audio_device(device_spec); @@ -294,7 +294,7 @@ bool AudioMixer::add_audio(DeviceSpec device_spec, const uint8_t *data, unsigned return true; } -bool AudioMixer::add_silence(DeviceSpec device_spec, unsigned samples_per_frame, unsigned num_frames, int64_t frame_length) +bool AudioMixer::add_silence(DeviceSpec device_spec, unsigned samples_per_frame, unsigned num_frames) { AudioDevice *device = find_audio_device(device_spec);