style: run clang-format-18

padenot · padenot · commit cdb54bbf405e · 2026-06-15T10:33:32.000+02:00
diff --git a/src/cubeb.c b/src/cubeb.c
@@ -214,55 +214,55 @@ cubeb_init(cubeb ** context, char const * context_name,
   }
 
   int (*default_init[])(cubeb **, char const *) = {
-    /*
-     * init_oneshot must be at the top to allow user
-     * to override all other choices
-     */
-    init_oneshot,
+      /*
+       * init_oneshot must be at the top to allow user
+       * to override all other choices
+       */
+      init_oneshot,
 #if defined(USE_PULSE_RUST)
-    pulse_rust_init,
+      pulse_rust_init,
 #endif
 #if defined(USE_PULSE)
-    pulse_init,
+      pulse_init,
 #endif
 #if defined(USE_JACK)
-    jack_init,
+      jack_init,
 #endif
 #if defined(USE_SNDIO)
-    sndio_init,
+      sndio_init,
 #endif
 #if defined(USE_ALSA)
-    alsa_init,
+      alsa_init,
 #endif
 #if defined(USE_OSS)
-    oss_init,
+      oss_init,
 #endif
 #if defined(USE_AUDIOUNIT_RUST)
-    audiounit_rust_init,
+      audiounit_rust_init,
 #endif
 #if defined(USE_AUDIOUNIT)
-    audiounit_init,
+      audiounit_init,
 #endif
 #if defined(USE_WASAPI)
-    wasapi_init,
+      wasapi_init,
 #endif
 #if defined(USE_WINMM)
-    winmm_init,
+      winmm_init,
 #endif
 #if defined(USE_SUN)
-    sun_init,
+      sun_init,
 #endif
 #if defined(USE_AAUDIO)
-    aaudio_init,
+      aaudio_init,
 #endif
 #if defined(USE_OPENSL)
-    opensl_init,
+      opensl_init,
 #endif
 #if defined(USE_AUDIOTRACK)
-    audiotrack_init,
+      audiotrack_init,
 #endif
 #if defined(USE_KAI)
-    kai_init,
+      kai_init,
 #endif
   };
   int i;
@@ -303,49 +303,49 @@ cubeb_get_backend_names()
 {
   static const char * const backend_names[] = {
 #if defined(USE_PULSE)
-    "pulse",
+      "pulse",
 #endif
 #if defined(USE_PULSE_RUST)
-    "pulse-rust",
+      "pulse-rust",
 #endif
 #if defined(USE_JACK)
-    "jack",
+      "jack",
 #endif
 #if defined(USE_ALSA)
-    "alsa",
+      "alsa",
 #endif
 #if defined(USE_AUDIOUNIT)
-    "audiounit",
+      "audiounit",
 #endif
 #if defined(USE_AUDIOUNIT_RUST)
-    "audiounit-rust",
+      "audiounit-rust",
 #endif
 #if defined(USE_WASAPI)
-    "wasapi",
+      "wasapi",
 #endif
 #if defined(USE_WINMM)
-    "winmm",
+      "winmm",
 #endif
 #if defined(USE_SNDIO)
-    "sndio",
+      "sndio",
 #endif
 #if defined(USE_SUN)
-    "sun",
+      "sun",
 #endif
 #if defined(USE_OPENSL)
-    "opensl",
+      "opensl",
 #endif
 #if defined(USE_OSS)
-    "oss",
+      "oss",
 #endif
 #if defined(USE_AAUDIO)
-    "aaudio",
+      "aaudio",
 #endif
 #if defined(USE_AUDIOTRACK)
-    "audiotrack",
+      "audiotrack",
 #endif
 #if defined(USE_KAI)
-    "kai",
+      "kai",
 #endif
   };
 
diff --git a/src/cubeb_mixer.cpp b/src/cubeb_mixer.cpp
@@ -591,7 +591,7 @@ struct cubeb_mixer {
   // Return false if any of the input or ouput layout were invalid.
   bool valid() const { return _context._valid; }
 
-  virtual ~cubeb_mixer(){};
+  virtual ~cubeb_mixer() = default;
 
   MixerContext _context;
 };
diff --git a/src/cubeb_resampler_internal.h b/src/cubeb_resampler_internal.h
@@ -59,7 +59,10 @@ struct cubeb_resampler {
                     void * output_buffer, long frames_needed) = 0;
   virtual long latency() = 0;
   virtual long input_latency() { return 0; }
-  virtual long input_needed_for_output(long output_frames) { return output_frames; }
+  virtual long input_needed_for_output(long output_frames)
+  {
+    return output_frames;
+  }
   virtual cubeb_resampler_stats stats() = 0;
   virtual ~cubeb_resampler() {}
 };
@@ -98,7 +101,8 @@ class passthrough_resampler : public cubeb_resampler, public processor {
     if (channels == 0) {
       return 0;
     }
-    long queued = static_cast<long>(samples_to_frames(internal_input_buffer.length()));
+    long queued =
+        static_cast<long>(samples_to_frames(internal_input_buffer.length()));
     return std::max(0L, output_frames - queued);
   }
 
diff --git a/src/cubeb_wasapi.cpp b/src/cubeb_wasapi.cpp
@@ -1490,8 +1490,7 @@ refill_callback_output(cubeb_stream * stm)
 void
 wasapi_stream_destroy(cubeb_stream * stm);
 
-static unsigned int __stdcall
-wasapi_stream_render_loop(LPVOID stream)
+static unsigned int __stdcall wasapi_stream_render_loop(LPVOID stream)
 {
   AutoRegisterThread raii("cubeb rendering thread");
   cubeb_stream * stm = static_cast<cubeb_stream *>(stream);
diff --git a/test/test_resampler.cpp b/test/test_resampler.cpp
@@ -380,12 +380,12 @@ test_resampler_duplex(uint32_t input_channels, uint32_t output_channels,
   dump("input.raw", state.input.data(), state.input.length());
   dump("output.raw", state.output.data(), state.output.length());
 
-  ASSERT_TRUE(array_fuzzy_equal(state.input, expected_resampled_input,
-                               epsilon<T>(static_cast<float>(input_rate) /
-                                          target_rate)));
-  ASSERT_TRUE(array_fuzzy_equal(state.output, expected_resampled_output,
-                               epsilon<T>(static_cast<float>(output_rate) /
-                                          target_rate)));
+  ASSERT_TRUE(array_fuzzy_equal(
+      state.input, expected_resampled_input,
+      epsilon<T>(static_cast<float>(input_rate) / target_rate)));
+  ASSERT_TRUE(array_fuzzy_equal(
+      state.output, expected_resampled_output,
+      epsilon<T>(static_cast<float>(output_rate) / target_rate)));
 
   cubeb_resampler_destroy(resampler);
 }
@@ -762,7 +762,8 @@ TEST(cubeb, resampler_passthrough_duplex_callback_reordering)
 
   output_seq_idx += BUF_BASE_SIZE;
 
-  // prebuffer_frames holds all provided frames, even if some are in the internal buffer.
+  // prebuffer_frames holds all provided frames, even if some are in the
+  // internal buffer.
   ASSERT_EQ(prebuffer_frames, BUF_BASE_SIZE * 2);
   ASSERT_EQ(got, BUF_BASE_SIZE);
 
@@ -863,7 +864,8 @@ TEST(cubeb, resampler_drift_drop_data)
 
     output_seq_idx += BUF_BASE_SIZE;
 
-    // prebuffer_frames holds all provided frames, even if some are in the internal buffer.
+    // prebuffer_frames holds all provided frames, even if some are in the
+    // internal buffer.
     ASSERT_EQ(prebuffer_frames, BUF_BASE_SIZE * PREBUFFER_FACTOR);
     ASSERT_EQ(got, BUF_BASE_SIZE);
 
@@ -1098,8 +1100,7 @@ struct input_queue_state {
 };
 
 static long
-input_queue_cb(cubeb_stream *, void * ptr, const void * in, void * out,
-               long n)
+input_queue_cb(cubeb_stream *, void * ptr, const void * in, void * out, long n)
 {
   if (in) {
     static_cast<input_queue_state *>(ptr)->frames_seen += n;
@@ -1120,10 +1121,9 @@ TEST(cubeb, resampler_speex_input_queue)
   in_p.prefs = out_p.prefs = CUBEB_STREAM_PREF_NONE;
 
   input_queue_state state;
-  cubeb_resampler * r =
-      cubeb_resampler_create(nullptr, &in_p, &out_p, 44100, input_queue_cb,
-                             &state, CUBEB_RESAMPLER_QUALITY_VOIP,
-                             CUBEB_RESAMPLER_RECLOCK_NONE);
+  cubeb_resampler * r = cubeb_resampler_create(
+      nullptr, &in_p, &out_p, 44100, input_queue_cb, &state,
+      CUBEB_RESAMPLER_QUALITY_VOIP, CUBEB_RESAMPLER_RECLOCK_NONE);
   ASSERT_NE(r, nullptr);
 
   const long out_chunk = 480;
@@ -1139,8 +1139,8 @@ TEST(cubeb, resampler_speex_input_queue)
     }
     state.frames_provided += frames_to_provide;
     long in_count = frames_to_provide;
-    long got =
-        cubeb_resampler_fill(r, in_buf.data(), &in_count, out_buf.data(), out_chunk);
+    long got = cubeb_resampler_fill(r, in_buf.data(), &in_count, out_buf.data(),
+                                    out_chunk);
     ASSERT_EQ(got, out_chunk);
     ASSERT_EQ(in_count, frames_to_provide);
 
@@ -1150,8 +1150,7 @@ TEST(cubeb, resampler_speex_input_queue)
 
   EXPECT_LE(state.frames_seen, state.frames_provided);
   EXPECT_GE(state.frames_seen,
-            state.frames_provided -
-                (long)min_buffered_audio_frame(in_p.rate));
+            state.frames_provided - (long)min_buffered_audio_frame(in_p.rate));
 
   cubeb_resampler_destroy(r);
 }
@@ -1416,10 +1415,10 @@ const int rates[] = {16000, 32000, 44100, 48000, 96000, 192000, 384000};
 constexpr int WASAPI_MS_BLOCK = 10;
 const int block_sizes[] = {WASAPI_MS_BLOCK, 96, 128, 192, 256, 512, 1024, 2048};
 #ifdef THOROUGH_TESTING
-const int input_duplex_rates[] = {16000, 32000, 44100, 48000,
+const int input_duplex_rates[] = {16000, 32000,  44100, 48000,
                                   96000, 192000, 384000};
-const int input_duplex_block_sizes[] = {WASAPI_MS_BLOCK, 96,  128, 192,
-                                        256,             512, 1024, 2048};
+const int input_duplex_block_sizes[] = {
+    WASAPI_MS_BLOCK, 96, 128, 192, 256, 512, 1024, 2048};
 #else
 const int input_duplex_rates[] = {16000, 44100, 48000, 96000, 384000};
 const int input_duplex_block_sizes[] = {WASAPI_MS_BLOCK, 96, 128, 192, 512};
@@ -1604,7 +1603,8 @@ data_cb_ignore_input(cubeb_stream *, void * user_ptr, const void *,
 }
 
 static void
-run_test_duplex(int input_rate, int output_rate, int target_rate, int block_size)
+run_test_duplex(int input_rate, int output_rate, int target_rate,
+                int block_size)
 {
   int effective_block_size = block_size;
   if (effective_block_size == WASAPI_MS_BLOCK) {
@@ -1623,11 +1623,9 @@ run_test_duplex(int input_rate, int output_rate, int target_rate, int block_size
   out_params.rate = output_rate;
   out_params.format = CUBEB_SAMPLE_FLOAT32NE;
 
-  cubeb_resampler * resampler =
-      cubeb_resampler_create(nullptr, &in_params, &out_params, target_rate,
-                             data_cb_ignore_input, &state,
-                             CUBEB_RESAMPLER_QUALITY_DEFAULT,
-                             CUBEB_RESAMPLER_RECLOCK_NONE);
+  cubeb_resampler * resampler = cubeb_resampler_create(
+      nullptr, &in_params, &out_params, target_rate, data_cb_ignore_input,
+      &state, CUBEB_RESAMPLER_QUALITY_DEFAULT, CUBEB_RESAMPLER_RECLOCK_NONE);
   ASSERT_NE(resampler, nullptr);
 
   std::vector<float> in_data;
@@ -1643,8 +1641,8 @@ run_test_duplex(int input_rate, int output_rate, int target_rate, int block_size
                               effective_block_size);
 
   for (int i = 0; i < ITERATION_COUNT; i++) {
-    long frames_needed =
-        cubeb_resampler_input_needed_for_output(resampler, effective_block_size);
+    long frames_needed = cubeb_resampler_input_needed_for_output(
+        resampler, effective_block_size);
     ASSERT_GE(frames_needed, 0);
     if ((long)in_data.size() < frames_needed) {
       in_data.resize(frames_needed);
@@ -1684,11 +1682,9 @@ run_test_input(int input_rate, int target_rate, int block_size)
   in_params.rate = input_rate;
   in_params.format = CUBEB_SAMPLE_FLOAT32NE;
 
-  cubeb_resampler * resampler =
-      cubeb_resampler_create(nullptr, &in_params, nullptr, target_rate,
-                             data_cb_input_only, nullptr,
-                             CUBEB_RESAMPLER_QUALITY_DEFAULT,
-                             CUBEB_RESAMPLER_RECLOCK_NONE);
+  cubeb_resampler * resampler = cubeb_resampler_create(
+      nullptr, &in_params, nullptr, target_rate, data_cb_input_only, nullptr,
+      CUBEB_RESAMPLER_QUALITY_DEFAULT, CUBEB_RESAMPLER_RECLOCK_NONE);
   ASSERT_NE(resampler, nullptr);
 
   std::vector<float> in_data(effective_block_size);

Original file line number	Diff line number	Diff line change
`@@ -1490,8 +1490,7 @@ refill_callback_output(cubeb_stream * stm)`
`1490`	`1490`	`void`
`1491`	`1491`	`wasapi_stream_destroy(cubeb_stream * stm);`
`1492`	`1492`
`1493`		`-static unsigned int __stdcall`
`1494`		`-wasapi_stream_render_loop(LPVOID stream)`
	`1493`	`+static unsigned int __stdcall wasapi_stream_render_loop(LPVOID stream)`
`1495`	`1494`	`{`
`1496`	`1495`	`AutoRegisterThread raii("cubeb rendering thread");`
`1497`	`1496`	`cubeb_stream * stm = static_cast<cubeb_stream *>(stream);`