mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix alignment issues introduced by the pa_bool -> bool conversion

Browse source
This commit is contained in:
poljar (Damir Jelić) 2013-06-28 01:03:47 +02:00 • committed by Tanu Kaskinen
parent d806b19714
commit 408f0ba783
7 changed files with 46 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/modules/alsa/alsa-util.h
View file

@ -41,8 +41,8 @@ int pa_alsa_set_hw_params(
snd_pcm_uframes_t *period_size, /* modified at return */ snd_pcm_uframes_t *period_size, /* modified at return */
snd_pcm_uframes_t *buffer_size, /* modified at return */ snd_pcm_uframes_t *buffer_size, /* modified at return */
snd_pcm_uframes_t tsched_size, snd_pcm_uframes_t tsched_size,
bool *use_mmap, /* modified at return */ bool *use_mmap, /* modified at return */
bool *use_tsched, /* modified at return */ bool *use_tsched, /* modified at return */
bool require_exact_channel_number); bool require_exact_channel_number);
int pa_alsa_set_sw_params( 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 *period_size, /* modified at return */
snd_pcm_uframes_t *buffer_size, /* modified at return */ snd_pcm_uframes_t *buffer_size, /* modified at return */
snd_pcm_uframes_t tsched_size, snd_pcm_uframes_t tsched_size,
bool *use_mmap, /* modified at return */ bool *use_mmap, /* modified at return */
bool *use_tsched, /* modified at return */ bool *use_tsched, /* modified at return */
pa_alsa_profile_set *ps, pa_alsa_profile_set *ps,
pa_alsa_mapping **mapping); /* modified at return */ 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 *period_size, /* modified at return */
snd_pcm_uframes_t *buffer_size, /* modified at return */ snd_pcm_uframes_t *buffer_size, /* modified at return */
snd_pcm_uframes_t tsched_size, snd_pcm_uframes_t tsched_size,
bool *use_mmap, /* modified at return */ bool *use_mmap, /* modified at return */
bool *use_tsched, /* modified at return */ bool *use_tsched, /* modified at return */
pa_alsa_mapping *mapping); pa_alsa_mapping *mapping);
/* Opens the explicit ALSA device */ /* 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 *period_size, /* modified at return */
snd_pcm_uframes_t *buffer_size, /* modified at return */ snd_pcm_uframes_t *buffer_size, /* modified at return */
snd_pcm_uframes_t tsched_size, snd_pcm_uframes_t tsched_size,
bool *use_mmap, /* modified at return */ bool *use_mmap, /* modified at return */
bool *use_tsched, /* modified at return */ bool *use_tsched, /* modified at return */
bool require_exact_channel_number); bool require_exact_channel_number);
/* Opens the explicit ALSA device with a fallback list */ /* 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 *period_size, /* modified at return */
snd_pcm_uframes_t *buffer_size, /* modified at return */ snd_pcm_uframes_t *buffer_size, /* modified at return */
snd_pcm_uframes_t tsched_size, snd_pcm_uframes_t tsched_size,
bool *use_mmap, /* modified at return */ bool *use_mmap, /* modified at return */
bool *use_tsched, /* modified at return */ bool *use_tsched, /* modified at return */
bool require_exact_channel_number); bool require_exact_channel_number);
void pa_alsa_dump(pa_log_level_t level, snd_pcm_t *pcm); void pa_alsa_dump(pa_log_level_t level, snd_pcm_t *pcm);

8
src/modules/echo-cancel/adrian.c
View file

@ -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, 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 *rec_ss, pa_channel_map *rec_map,
pa_sample_spec *play_ss, pa_channel_map *play_map, pa_sample_spec *play_ss, pa_channel_map *play_map,
pa_sample_spec *out_ss, pa_channel_map *out_map, pa_sample_spec *out_ss, pa_channel_map *out_map,
uint32_t *nframes, const char *args) { uint32_t *nframes, const char *args) {
int rate, have_vector = 0; int rate, have_vector = 0;
uint32_t frame_size_ms; uint32_t frame_size_ms;
pa_modargs *ma; pa_modargs *ma;

34
src/modules/echo-cancel/echo-cancel.h
View file

@ -83,7 +83,7 @@ typedef struct pa_echo_canceller pa_echo_canceller;
struct pa_echo_canceller { struct pa_echo_canceller {
/* Initialise canceller engine. */ /* Initialise canceller engine. */
bool (*init) (pa_core *c, bool (*init) (pa_core *c,
pa_echo_canceller *ec, pa_echo_canceller *ec,
pa_sample_spec *rec_ss, pa_sample_spec *rec_ss,
pa_channel_map *rec_map, pa_channel_map *rec_map,
@ -139,20 +139,20 @@ uint32_t pa_echo_canceller_blocksize_power2(unsigned rate, unsigned ms);
/* Null canceller functions */ /* Null canceller functions */
bool pa_null_ec_init(pa_core *c, pa_echo_canceller *ec, 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 *rec_ss, pa_channel_map *rec_map,
pa_sample_spec *play_ss, pa_channel_map *play_map, pa_sample_spec *play_ss, pa_channel_map *play_map,
pa_sample_spec *out_ss, pa_channel_map *out_map, pa_sample_spec *out_ss, pa_channel_map *out_map,
uint32_t *nframes, const char *args); 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_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); void pa_null_ec_done(pa_echo_canceller *ec);
#ifdef HAVE_SPEEX #ifdef HAVE_SPEEX
/* Speex canceller functions */ /* Speex canceller functions */
bool pa_speex_ec_init(pa_core *c, pa_echo_canceller *ec, 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 *rec_ss, pa_channel_map *rec_map,
pa_sample_spec *play_ss, pa_channel_map *play_map, pa_sample_spec *play_ss, pa_channel_map *play_map,
pa_sample_spec *out_ss, pa_channel_map *out_map, pa_sample_spec *out_ss, pa_channel_map *out_map,
uint32_t *nframes, const char *args); 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_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); void pa_speex_ec_done(pa_echo_canceller *ec);
#endif #endif
@ -160,10 +160,10 @@ void pa_speex_ec_done(pa_echo_canceller *ec);
#ifdef HAVE_ADRIAN_EC #ifdef HAVE_ADRIAN_EC
/* Adrian Andre's echo canceller */ /* Adrian Andre's echo canceller */
bool pa_adrian_ec_init(pa_core *c, pa_echo_canceller *ec, 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 *rec_ss, pa_channel_map *rec_map,
pa_sample_spec *play_ss, pa_channel_map *play_map, pa_sample_spec *play_ss, pa_channel_map *play_map,
pa_sample_spec *out_ss, pa_channel_map *out_map, pa_sample_spec *out_ss, pa_channel_map *out_map,
uint32_t *nframes, const char *args); 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_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); void pa_adrian_ec_done(pa_echo_canceller *ec);
#endif #endif
@ -172,10 +172,10 @@ void pa_adrian_ec_done(pa_echo_canceller *ec);
/* WebRTC canceller functions */ /* WebRTC canceller functions */
PA_C_DECL_BEGIN PA_C_DECL_BEGIN
bool pa_webrtc_ec_init(pa_core *c, pa_echo_canceller *ec, 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 *rec_ss, pa_channel_map *rec_map,
pa_sample_spec *play_ss, pa_channel_map *play_map, pa_sample_spec *play_ss, pa_channel_map *play_map,
pa_sample_spec *out_ss, pa_channel_map *out_map, pa_sample_spec *out_ss, pa_channel_map *out_map,
uint32_t *nframes, const char *args); uint32_t *nframes, const char *args);
void pa_webrtc_ec_play(pa_echo_canceller *ec, const uint8_t *play); 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_record(pa_echo_canceller *ec, const uint8_t *rec, uint8_t *out);
void pa_webrtc_ec_set_drift(pa_echo_canceller *ec, float drift); void pa_webrtc_ec_set_drift(pa_echo_canceller *ec, float drift);

8
src/modules/echo-cancel/null.c
View file

@ -26,10 +26,10 @@ PA_C_DECL_BEGIN
PA_C_DECL_END PA_C_DECL_END
bool pa_null_ec_init(pa_core *c, pa_echo_canceller *ec, 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 *rec_ss, pa_channel_map *rec_map,
pa_sample_spec *play_ss, pa_channel_map *play_map, pa_sample_spec *play_ss, pa_channel_map *play_map,
pa_sample_spec *out_ss, pa_channel_map *out_map, pa_sample_spec *out_ss, pa_channel_map *out_map,
uint32_t *nframes, const char *args) { uint32_t *nframes, const char *args) {
char strss_source[PA_SAMPLE_SPEC_SNPRINT_MAX]; char strss_source[PA_SAMPLE_SPEC_SNPRINT_MAX];
char strss_sink[PA_SAMPLE_SPEC_SNPRINT_MAX]; char strss_sink[PA_SAMPLE_SPEC_SNPRINT_MAX];

8
src/modules/echo-cancel/speex.c
View file

@ -147,10 +147,10 @@ fail:
} }
bool pa_speex_ec_init(pa_core *c, pa_echo_canceller *ec, 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 *rec_ss, pa_channel_map *rec_map,
pa_sample_spec *play_ss, pa_channel_map *play_map, pa_sample_spec *play_ss, pa_channel_map *play_map,
pa_sample_spec *out_ss, pa_channel_map *out_map, pa_sample_spec *out_ss, pa_channel_map *out_map,
uint32_t *nframes, const char *args) { uint32_t *nframes, const char *args) {
int rate; int rate;
uint32_t frame_size_ms, filter_size_ms; uint32_t frame_size_ms, filter_size_ms;
pa_modargs *ma; pa_modargs *ma;

8
src/modules/echo-cancel/webrtc.cc
View file

@ -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, 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 *rec_ss, pa_channel_map *rec_map,
pa_sample_spec *play_ss, pa_channel_map *play_map, pa_sample_spec *play_ss, pa_channel_map *play_map,
pa_sample_spec *out_ss, pa_channel_map *out_map, pa_sample_spec *out_ss, pa_channel_map *out_map,
uint32_t *nframes, const char *args) { uint32_t *nframes, const char *args) {
webrtc::AudioProcessing *apm = NULL; webrtc::AudioProcessing *apm = NULL;
bool hpf, ns, agc, dgc, mobile, cn; bool hpf, ns, agc, dgc, mobile, cn;
int rm = -1; int rm = -1;

6
src/pulsecore/object.h
View file

@ -70,7 +70,7 @@ static inline pa_object* pa_object_cast(void *o) {
#define PA_OBJECT(o) pa_object_cast(o) #define PA_OBJECT(o) pa_object_cast(o)
#define PA_DECLARE_CLASS_COMMON(c) \ #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; \ pa_object *obj = (pa_object*) o; \
return obj ? obj->check_type(c##_type_id) : true; \ 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) \ #define PA_DEFINE_PUBLIC_CLASS(c, parent) \
const char c##_type_id[] = #c; \ 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) \ if (type_id == c##_type_id) \
return true; \ return true; \
return parent##_check_type(type_id); \ 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) \ #define PA_DEFINE_PRIVATE_CLASS(c, parent) \
static const char c##_type_id[] = #c; \ static const char c##_type_id[] = #c; \
PA_DECLARE_CLASS_COMMON(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) \ if (type_id == c##_type_id) \
return true; \ return true; \
return parent##_check_type(type_id); \ return parent##_check_type(type_id); \