diff options
| -rw-r--r-- | src/cubeb.c | 3 | ||||
| -rw-r--r-- | src/cubeb_alsa.c | 1 | ||||
| -rw-r--r-- | src/cubeb_jack.cpp | 3 | ||||
| -rw-r--r-- | src/cubeb_resampler.cpp | 2 | ||||
| -rw-r--r-- | src/cubeb_wasapi.cpp | 3 | ||||
| -rw-r--r-- | src/cubeb_winmm.c | 2 | ||||
| -rw-r--r-- | test/test_resampler.cpp | 2 | ||||
| -rw-r--r-- | test/test_sanity.cpp | 2 |
8 files changed, 0 insertions, 18 deletions
diff --git a/src/cubeb.c b/src/cubeb.c index 6a32029..e239b05 100644 --- a/src/cubeb.c +++ b/src/cubeb.c @@ -55,7 +55,6 @@ int audiotrack_init(cubeb ** context, char const * context_name); int kai_init(cubeb ** context, char const * context_name); #endif - static int validate_stream_params(cubeb_stream_params * input_stream_params, cubeb_stream_params * output_stream_params) @@ -96,8 +95,6 @@ validate_stream_params(cubeb_stream_params * input_stream_params, return CUBEB_ERROR_INVALID_FORMAT; } - - static int validate_latency(int latency) { diff --git a/src/cubeb_alsa.c b/src/cubeb_alsa.c index 1ea0961..bd34a07 100644 --- a/src/cubeb_alsa.c +++ b/src/cubeb_alsa.c @@ -790,7 +790,6 @@ alsa_stream_init(cubeb * ctx, cubeb_stream ** stream, char const * stream_name, snd_pcm_uframes_t period_size; int latency_us = 0; - assert(ctx && stream); if (input_stream_params) { diff --git a/src/cubeb_jack.cpp b/src/cubeb_jack.cpp index 5d1ae96..d29f857 100644 --- a/src/cubeb_jack.cpp +++ b/src/cubeb_jack.cpp @@ -420,7 +420,6 @@ cbjack_process(jack_nframes_t nframes, void * arg) return 0; } - static void cbjack_deinterleave_playback_refill_float(cubeb_stream * stream, float ** in, float ** bufs_out, jack_nframes_t nframes) { @@ -433,7 +432,6 @@ cbjack_deinterleave_playback_refill_float(cubeb_stream * stream, float ** in, fl long done_frames = 0; long input_frames_count = (in != NULL) ? nframes : 0; - done_frames = cubeb_resampler_fill(stream->resampler, inptr, &input_frames_count, @@ -934,7 +932,6 @@ cbjack_stream_set_volume(cubeb_stream * stm, float volume) return CUBEB_OK; } - static int cbjack_stream_get_current_device(cubeb_stream * stm, cubeb_device ** const device) { diff --git a/src/cubeb_resampler.cpp b/src/cubeb_resampler.cpp index f667694..91fa35f 100644 --- a/src/cubeb_resampler.cpp +++ b/src/cubeb_resampler.cpp @@ -124,7 +124,6 @@ cubeb_resampler_speex<T, InputProcessor, OutputProcessor> T * out_unprocessed = nullptr; long output_frames_before_processing = 0; - /* fill directly the input buffer of the output processor to save a copy */ output_frames_before_processing = output_processor->input_needed_for_output(output_frames_needed); @@ -174,7 +173,6 @@ cubeb_resampler_speex<T, InputProcessor, OutputProcessor> return (*input_frames_count) * (got / resampled_frame_count); } - template<typename T, typename InputProcessor, typename OutputProcessor> long cubeb_resampler_speex<T, InputProcessor, OutputProcessor> diff --git a/src/cubeb_wasapi.cpp b/src/cubeb_wasapi.cpp index af0a0ca..4aa2eae 100644 --- a/src/cubeb_wasapi.cpp +++ b/src/cubeb_wasapi.cpp @@ -407,7 +407,6 @@ double stream_to_mix_samplerate_ratio(cubeb_stream_params & stream, cubeb_stream return double(stream.rate) / mixer.rate; } - uint32_t get_rate(cubeb_stream * stm) { @@ -860,7 +859,6 @@ wasapi_stream_render_loop(LPVOID stream) LOG("Unable to use mmcss to bump the render thread priority: %lx", GetLastError()); } - /* WaitForMultipleObjects timeout can trigger in cases where we don't want to treat it as a timeout, such as across a system sleep/wake cycle. Trigger the timeout error handling only when the timeout_limit is reached, which is @@ -1921,7 +1919,6 @@ int wasapi_stream_stop(cubeb_stream * stm) } } - stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_STOPPED); } diff --git a/src/cubeb_winmm.c b/src/cubeb_winmm.c index d2bafae..e21a014 100644 --- a/src/cubeb_winmm.c +++ b/src/cubeb_winmm.c @@ -512,7 +512,6 @@ winmm_stream_init(cubeb * context, cubeb_stream ** stream, char const * stream_n return CUBEB_ERROR; } - for (i = 0; i < NBUFS; ++i) { WAVEHDR * hdr = &stm->buffers[i]; @@ -769,7 +768,6 @@ winmm_calculate_device_rate(cubeb_device_info * info, DWORD formats) } } - #define MM_S16_MASK (WAVE_FORMAT_1M16 | WAVE_FORMAT_1S16 | WAVE_FORMAT_2M16 | WAVE_FORMAT_2S16 | WAVE_FORMAT_4M16 | \ WAVE_FORMAT_4S16 | WAVE_FORMAT_48M16 | WAVE_FORMAT_48S16 | WAVE_FORMAT_96M16 | WAVE_FORMAT_96S16) static int diff --git a/test/test_resampler.cpp b/test/test_resampler.cpp index 48fc38a..c4e179a 100644 --- a/test/test_resampler.cpp +++ b/test/test_resampler.cpp @@ -286,7 +286,6 @@ long data_cb_resampler(cubeb_stream * /*stm*/, void * user_ptr, const float * in = reinterpret_cast<const float*>(input_buffer); float * out = reinterpret_cast<float*>(output_buffer); - state->input.push(in, frame_count * state->input_channels); /* Check how much output frames we need to write */ @@ -362,7 +361,6 @@ void test_resampler_duplex(uint32_t input_channels, uint32_t output_channels, fill_with_sine(expected_resampled_output.data() + latency, output_rate, output_channels, output_rate * duration_s - latency, 0); - while (state.output_phase_index != state.max_output_phase_index) { uint32_t leftover_samples = input_buffer.length() * input_channels; input_buffer.reserve(input_array_frame_count); diff --git a/test/test_sanity.cpp b/test/test_sanity.cpp index eb8a596..80c45b4 100644 --- a/test/test_sanity.cpp +++ b/test/test_sanity.cpp @@ -95,7 +95,6 @@ TEST(cubeb, init_destroy_context) ASSERT_EQ(r, CUBEB_OK); ASSERT_NE(ctx, nullptr); - backend_id = cubeb_get_backend_id(ctx); ASSERT_TRUE(backend_id); @@ -280,7 +279,6 @@ test_init_start_stop_destroy_multiple_streams(int early, int delay_ms) } } - if (!early) { for (i = 0; i < ARRAY_LENGTH(stream); ++i) { r = cubeb_stream_start(stream[i]); |