Hi list, According to Tanu's suggestion, I've changed pa_bool_t to bool. Now, when we do "git grep pa_bool_t", here's nothing. :) Please help to review. Thanks!
2012/7/1 Deng Zhengrong <[email protected]>: > --- > src/utils/pacat.c | 10 +++++----- > src/utils/pacmd.c | 2 +- > src/utils/pactl.c | 10 +++++----- > src/utils/padsp.c | 2 +- > 4 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/src/utils/pacat.c b/src/utils/pacat.c > index ec360f7..0f564c8 100644 > --- a/src/utils/pacat.c > +++ b/src/utils/pacat.c > @@ -66,19 +66,19 @@ static char *device = NULL; > > static SNDFILE* sndfile = NULL; > > -static pa_bool_t verbose = FALSE; > +static bool verbose = FALSE; > static pa_volume_t volume = PA_VOLUME_NORM; > -static pa_bool_t volume_is_set = FALSE; > +static bool volume_is_set = FALSE; > > static pa_sample_spec sample_spec = { > .format = PA_SAMPLE_S16LE, > .rate = 44100, > .channels = 2 > }; > -static pa_bool_t sample_spec_set = FALSE; > +static bool sample_spec_set = FALSE; > > static pa_channel_map channel_map; > -static pa_bool_t channel_map_set = FALSE; > +static bool channel_map_set = FALSE; > > static sf_count_t (*readf_function)(SNDFILE *_sndfile, void *ptr, sf_count_t > frames) = NULL; > static sf_count_t (*writef_function)(SNDFILE *_sndfile, const void *ptr, > sf_count_t frames) = NULL; > @@ -88,7 +88,7 @@ static pa_stream_flags_t flags = 0; > static size_t latency = 0, process_time = 0; > static int32_t latency_msec = 0, process_time_msec = 0; > > -static pa_bool_t raw = TRUE; > +static bool raw = TRUE; > static int file_format = -1; > > static uint32_t cork_requests = 0; > diff --git a/src/utils/pacmd.c b/src/utils/pacmd.c > index a2492fd..421de08 100644 > --- a/src/utils/pacmd.c > +++ b/src/utils/pacmd.c > @@ -99,7 +99,7 @@ int main(int argc, char*argv[]) { > char *obuf = NULL; > size_t buf_size, ibuf_size, ibuf_index, ibuf_length, obuf_size, > obuf_index, obuf_length; > char *cli; > - pa_bool_t ibuf_eof, obuf_eof, ibuf_closed, obuf_closed; > + bool ibuf_eof, obuf_eof, ibuf_closed, obuf_closed; > struct pollfd pollfd[3]; > struct pollfd *watch_socket, *watch_stdin, *watch_stdout; > > diff --git a/src/utils/pactl.c b/src/utils/pactl.c > index 3a5066c..93b16ef 100644 > --- a/src/utils/pactl.c > +++ b/src/utils/pactl.c > @@ -65,10 +65,10 @@ static uint32_t > source_output_idx = PA_INVALID_INDEX, > sink_idx = PA_INVALID_INDEX; > > -static pa_bool_t short_list_format = FALSE; > +static bool short_list_format = FALSE; > static uint32_t module_index; > -static pa_bool_t suspend; > -static pa_bool_t mute; > +static bool suspend; > +static bool mute; > static pa_volume_t volume; > static enum volume_flags { > VOL_UINT = 0, > @@ -88,7 +88,7 @@ static pa_channel_map channel_map; > static size_t sample_length = 0; > static int actions = 1; > > -static pa_bool_t nl = FALSE; > +static bool nl = FALSE; > > static enum { > NONE, > @@ -850,7 +850,7 @@ static void volume_relative_adjust(pa_cvolume *cv) { > } > > static void unload_module_by_name_callback(pa_context *c, const > pa_module_info *i, int is_last, void *userdata) { > - static pa_bool_t unloaded = FALSE; > + static bool unloaded = FALSE; > > if (is_last < 0) { > pa_log(_("Failed to get module information: %s"), > pa_strerror(pa_context_errno(c))); > diff --git a/src/utils/padsp.c b/src/utils/padsp.c > index f6a3520..0be5ede 100644 > --- a/src/utils/padsp.c > +++ b/src/utils/padsp.c > @@ -1513,7 +1513,7 @@ int open(const char *filename, int flags, ...) { > return real_open(filename, flags, mode); > } > > -static pa_bool_t is_audio_device_node(const char *path) { > +static bool is_audio_device_node(const char *path) { > return > pa_streq(path, "/dev/dsp") || > pa_streq(path, "/dev/adsp") || > -- > 1.7.7.6 > _______________________________________________ pulseaudio-discuss mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/pulseaudio-discuss
