Fix alignment issues introduced by the pa_bool -> bool conversion

diff --git a/src/modules/alsa/alsa-util.h b/src/modules/alsa/alsa-util.h
index 0520b6b79d266c56aee86d1d95680be3b6a5cf4c..0e3ae6985ea6c6399c746e4ff80a43fd8851b865 100644 (file)
--- a/src/modules/alsa/alsa-util.h
+++ b/src/modules/alsa/alsa-util.h
@@ -41,8 +41,8 @@ int pa_alsa_set_hw_params(
         snd_pcm_uframes_t *period_size,    /* modified at return */
         snd_pcm_uframes_t *buffer_size,    /* modified at return */
         snd_pcm_uframes_t tsched_size,
-        bool *use_mmap,               /* modified at return */
-        bool *use_tsched,             /* modified at return */
+        bool *use_mmap,                    /* modified at return */
+        bool *use_tsched,                  /* modified at return */
         bool require_exact_channel_number);
 
 int pa_alsa_set_sw_params(
@@ -60,8 +60,8 @@ snd_pcm_t *pa_alsa_open_by_device_id_auto(
         snd_pcm_uframes_t *period_size,   /* modified at return */
         snd_pcm_uframes_t *buffer_size,   /* modified at return */
         snd_pcm_uframes_t tsched_size,
-        bool *use_mmap,              /* modified at return */
-        bool *use_tsched,            /* modified at return */
+        bool *use_mmap,                   /* modified at return */
+        bool *use_tsched,                 /* modified at return */
         pa_alsa_profile_set *ps,
         pa_alsa_mapping **mapping);       /* modified at return */
 
@@ -75,8 +75,8 @@ snd_pcm_t *pa_alsa_open_by_device_id_mapping(
         snd_pcm_uframes_t *period_size,   /* modified at return */
         snd_pcm_uframes_t *buffer_size,   /* modified at return */
         snd_pcm_uframes_t tsched_size,
-        bool *use_mmap,              /* modified at return */
-        bool *use_tsched,            /* modified at return */
+        bool *use_mmap,                   /* modified at return */
+        bool *use_tsched,                 /* modified at return */
         pa_alsa_mapping *mapping);
 
 /* Opens the explicit ALSA device */
@@ -89,8 +89,8 @@ snd_pcm_t *pa_alsa_open_by_device_string(
         snd_pcm_uframes_t *period_size,   /* modified at return */
         snd_pcm_uframes_t *buffer_size,   /* modified at return */
         snd_pcm_uframes_t tsched_size,
-        bool *use_mmap,              /* modified at return */
-        bool *use_tsched,            /* modified at return */
+        bool *use_mmap,                   /* modified at return */
+        bool *use_tsched,                 /* modified at return */
         bool require_exact_channel_number);
 
 /* Opens the explicit ALSA device with a fallback list */
@@ -104,8 +104,8 @@ snd_pcm_t *pa_alsa_open_by_template(
         snd_pcm_uframes_t *period_size,   /* modified at return */
         snd_pcm_uframes_t *buffer_size,   /* modified at return */
         snd_pcm_uframes_t tsched_size,
-        bool *use_mmap,              /* modified at return */
-        bool *use_tsched,            /* modified at return */
+        bool *use_mmap,                   /* modified at return */
+        bool *use_tsched,                 /* modified at return */
         bool require_exact_channel_number);
 
 void pa_alsa_dump(pa_log_level_t level, snd_pcm_t *pcm);

diff --git a/src/modules/echo-cancel/adrian.c b/src/modules/echo-cancel/adrian.c
index c7f911f691c74d4cc9f7e269d8827746fb8159e8..7ca098f8d03bd3b5013ae335916af36a6cb6c23f 100644 (file)
--- a/src/modules/echo-cancel/adrian.c
+++ b/src/modules/echo-cancel/adrian.c
@@ -57,10 +57,10 @@ static void pa_adrian_ec_fixate_spec(pa_sample_spec *rec_ss, pa_channel_map *rec
 }
 
 bool pa_adrian_ec_init(pa_core *c, pa_echo_canceller *ec,
-                            pa_sample_spec *rec_ss, pa_channel_map *rec_map,
-                            pa_sample_spec *play_ss, pa_channel_map *play_map,
-                            pa_sample_spec *out_ss, pa_channel_map *out_map,
-                            uint32_t *nframes, const char *args) {
+                       pa_sample_spec *rec_ss, pa_channel_map *rec_map,
+                       pa_sample_spec *play_ss, pa_channel_map *play_map,
+                       pa_sample_spec *out_ss, pa_channel_map *out_map,
+                       uint32_t *nframes, const char *args) {
     int rate, have_vector = 0;
     uint32_t frame_size_ms;
     pa_modargs *ma;

diff --git a/src/modules/echo-cancel/echo-cancel.h b/src/modules/echo-cancel/echo-cancel.h
index ffa5840fa4dcc00acea19c4f878db930c1ffd29c..750e229cc92cc6b5c2149247c3bc8471403efd52 100644 (file)
--- a/src/modules/echo-cancel/echo-cancel.h
+++ b/src/modules/echo-cancel/echo-cancel.h
@@ -83,7 +83,7 @@ typedef struct pa_echo_canceller pa_echo_canceller;
 
 struct pa_echo_canceller {
     /* Initialise canceller engine. */
-    bool   (*init)                 (pa_core *c,
+    bool   (*init)                      (pa_core *c,
                                          pa_echo_canceller *ec,
                                          pa_sample_spec *rec_ss,
                                          pa_channel_map *rec_map,
@@ -139,20 +139,20 @@ uint32_t pa_echo_canceller_blocksize_power2(unsigned rate, unsigned ms);
 
 /* Null canceller functions */
 bool pa_null_ec_init(pa_core *c, pa_echo_canceller *ec,
-                          pa_sample_spec *rec_ss, pa_channel_map *rec_map,
-                          pa_sample_spec *play_ss, pa_channel_map *play_map,
-                          pa_sample_spec *out_ss, pa_channel_map *out_map,
-                          uint32_t *nframes, const char *args);
+                     pa_sample_spec *rec_ss, pa_channel_map *rec_map,
+                     pa_sample_spec *play_ss, pa_channel_map *play_map,
+                     pa_sample_spec *out_ss, pa_channel_map *out_map,
+                     uint32_t *nframes, const char *args);
 void pa_null_ec_run(pa_echo_canceller *ec, const uint8_t *rec, const uint8_t *play, uint8_t *out);
 void pa_null_ec_done(pa_echo_canceller *ec);
 
 #ifdef HAVE_SPEEX
 /* Speex canceller functions */
 bool pa_speex_ec_init(pa_core *c, pa_echo_canceller *ec,
-                           pa_sample_spec *rec_ss, pa_channel_map *rec_map,
-                           pa_sample_spec *play_ss, pa_channel_map *play_map,
-                           pa_sample_spec *out_ss, pa_channel_map *out_map,
-                           uint32_t *nframes, const char *args);
+                      pa_sample_spec *rec_ss, pa_channel_map *rec_map,
+                      pa_sample_spec *play_ss, pa_channel_map *play_map,
+                      pa_sample_spec *out_ss, pa_channel_map *out_map,
+                      uint32_t *nframes, const char *args);
 void pa_speex_ec_run(pa_echo_canceller *ec, const uint8_t *rec, const uint8_t *play, uint8_t *out);
 void pa_speex_ec_done(pa_echo_canceller *ec);
 #endif
@@ -160,10 +160,10 @@ void pa_speex_ec_done(pa_echo_canceller *ec);
 #ifdef HAVE_ADRIAN_EC
 /* Adrian Andre's echo canceller */
 bool pa_adrian_ec_init(pa_core *c, pa_echo_canceller *ec,
-                            pa_sample_spec *rec_ss, pa_channel_map *rec_map,
-                            pa_sample_spec *play_ss, pa_channel_map *play_map,
-                            pa_sample_spec *out_ss, pa_channel_map *out_map,
-                            uint32_t *nframes, const char *args);
+                       pa_sample_spec *rec_ss, pa_channel_map *rec_map,
+                       pa_sample_spec *play_ss, pa_channel_map *play_map,
+                       pa_sample_spec *out_ss, pa_channel_map *out_map,
+                       uint32_t *nframes, const char *args);
 void pa_adrian_ec_run(pa_echo_canceller *ec, const uint8_t *rec, const uint8_t *play, uint8_t *out);
 void pa_adrian_ec_done(pa_echo_canceller *ec);
 #endif
@@ -172,10 +172,10 @@ void pa_adrian_ec_done(pa_echo_canceller *ec);
 /* WebRTC canceller functions */
 PA_C_DECL_BEGIN
 bool pa_webrtc_ec_init(pa_core *c, pa_echo_canceller *ec,
-                            pa_sample_spec *rec_ss, pa_channel_map *rec_map,
-                            pa_sample_spec *play_ss, pa_channel_map *play_map,
-                            pa_sample_spec *out_ss, pa_channel_map *out_map,
-                            uint32_t *nframes, const char *args);
+                       pa_sample_spec *rec_ss, pa_channel_map *rec_map,
+                       pa_sample_spec *play_ss, pa_channel_map *play_map,
+                       pa_sample_spec *out_ss, pa_channel_map *out_map,
+                       uint32_t *nframes, const char *args);
 void pa_webrtc_ec_play(pa_echo_canceller *ec, const uint8_t *play);
 void pa_webrtc_ec_record(pa_echo_canceller *ec, const uint8_t *rec, uint8_t *out);
 void pa_webrtc_ec_set_drift(pa_echo_canceller *ec, float drift);

diff --git a/src/modules/echo-cancel/null.c b/src/modules/echo-cancel/null.c
index 642d5e86b8bd946774eb6634efc44562effe8c79..673b14f57d4492ae24e106a5c13b68eaf51a3a81 100644 (file)
--- a/src/modules/echo-cancel/null.c
+++ b/src/modules/echo-cancel/null.c
@@ -26,10 +26,10 @@ PA_C_DECL_BEGIN
 PA_C_DECL_END
 
 bool pa_null_ec_init(pa_core *c, pa_echo_canceller *ec,
-                          pa_sample_spec *rec_ss, pa_channel_map *rec_map,
-                          pa_sample_spec *play_ss, pa_channel_map *play_map,
-                          pa_sample_spec *out_ss, pa_channel_map *out_map,
-                          uint32_t *nframes, const char *args) {
+                     pa_sample_spec *rec_ss, pa_channel_map *rec_map,
+                     pa_sample_spec *play_ss, pa_channel_map *play_map,
+                     pa_sample_spec *out_ss, pa_channel_map *out_map,
+                     uint32_t *nframes, const char *args) {
     char strss_source[PA_SAMPLE_SPEC_SNPRINT_MAX];
     char strss_sink[PA_SAMPLE_SPEC_SNPRINT_MAX];
 

diff --git a/src/modules/echo-cancel/speex.c b/src/modules/echo-cancel/speex.c
index 41875e1506c675c493bf126af3062b706593fb06..10fdac82e054f9b6c6f75d893c6d4934382ca912 100644 (file)
--- a/src/modules/echo-cancel/speex.c
+++ b/src/modules/echo-cancel/speex.c
@@ -147,10 +147,10 @@ fail:
 }
 
 bool pa_speex_ec_init(pa_core *c, pa_echo_canceller *ec,
-                           pa_sample_spec *rec_ss, pa_channel_map *rec_map,
-                           pa_sample_spec *play_ss, pa_channel_map *play_map,
-                           pa_sample_spec *out_ss, pa_channel_map *out_map,
-                           uint32_t *nframes, const char *args) {
+                      pa_sample_spec *rec_ss, pa_channel_map *rec_map,
+                      pa_sample_spec *play_ss, pa_channel_map *play_map,
+                      pa_sample_spec *out_ss, pa_channel_map *out_map,
+                      uint32_t *nframes, const char *args) {
     int rate;
     uint32_t frame_size_ms, filter_size_ms;
     pa_modargs *ma;

diff --git a/src/modules/echo-cancel/webrtc.cc b/src/modules/echo-cancel/webrtc.cc
index 9de9fd2ea1fdd78ee5894e27170c0f51257d72cb..b1a789120441e0f1f37c649834398bb31e39bb85 100644 (file)
--- a/src/modules/echo-cancel/webrtc.cc
+++ b/src/modules/echo-cancel/webrtc.cc
@@ -77,10 +77,10 @@ static int routing_mode_from_string(const char *rmode) {
 }
 
 bool pa_webrtc_ec_init(pa_core *c, pa_echo_canceller *ec,
-                            pa_sample_spec *rec_ss, pa_channel_map *rec_map,
-                            pa_sample_spec *play_ss, pa_channel_map *play_map,
-                            pa_sample_spec *out_ss, pa_channel_map *out_map,
-                            uint32_t *nframes, const char *args) {
+                       pa_sample_spec *rec_ss, pa_channel_map *rec_map,
+                       pa_sample_spec *play_ss, pa_channel_map *play_map,
+                       pa_sample_spec *out_ss, pa_channel_map *out_map,
+                       uint32_t *nframes, const char *args) {
     webrtc::AudioProcessing *apm = NULL;
     bool hpf, ns, agc, dgc, mobile, cn;
     int rm = -1;

diff --git a/src/pulsecore/object.h b/src/pulsecore/object.h
index 65f5ee6966bc5b559649cd4118077fe705b6410b..a6da0fe06f789eb62e37f3eae4faca98e4bf0749 100644 (file)
--- a/src/pulsecore/object.h
+++ b/src/pulsecore/object.h
@@ -70,7 +70,7 @@ static inline pa_object* pa_object_cast(void *o) {
 #define PA_OBJECT(o) pa_object_cast(o)
 
 #define PA_DECLARE_CLASS_COMMON(c)                                      \
-    static inline bool c##_isinstance(void *o) {                   \
+    static inline bool c##_isinstance(void *o) {                        \
         pa_object *obj = (pa_object*) o;                                \
         return obj ? obj->check_type(c##_type_id) : true;               \
     }                                                                   \
@@ -99,7 +99,7 @@ static inline pa_object* pa_object_cast(void *o) {
 
 #define PA_DEFINE_PUBLIC_CLASS(c, parent)                               \
     const char c##_type_id[] = #c;                                      \
-    bool c##_check_type(const char *type_id) {                     \
+    bool c##_check_type(const char *type_id) {                          \
         if (type_id == c##_type_id)                                     \
             return true;                                                \
         return parent##_check_type(type_id);                            \
@@ -109,7 +109,7 @@ static inline pa_object* pa_object_cast(void *o) {
 #define PA_DEFINE_PRIVATE_CLASS(c, parent)                              \
     static const char c##_type_id[] = #c;                               \
     PA_DECLARE_CLASS_COMMON(c);                                         \
-    static bool c##_check_type(const char *type_id) {              \
+    static bool c##_check_type(const char *type_id) {                   \
         if (type_id == c##_type_id)                                     \
             return true;                                                \
         return parent##_check_type(type_id);                            \