diff options
author | poljar (Damir Jelić) <poljarinho@gmail.com> | 2013-06-27 19:28:09 +0200 |
---|---|---|
committer | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2013-07-04 12:25:30 +0300 |
commit | d806b197144733607b0ecb8678c6ee5d99ccc9ea (patch) | |
tree | 67b37aaa47303713295c43e535892822a9e11322 /src/modules/x11 | |
parent | e9822bfcb071a1b0e8f4eb67c6d471c466aeaf98 (diff) |
Remove pa_bool_t and replace it with bool.
commands used for this (executed from the pulseaudio/src directory):
find . -regex '\(.*\.[hc]\|.*\.cc\|.*\.m4\)' -not -name 'macro.h' \
-a -not -name 'reserve.[ch]' -a -not -name 'reserve-monitor.[ch]' \
-a -not -name 'glib-mainloop.c' -a -not -name 'gkt-test.c' \
-a -not -name 'glib-mainloop.c' -a -not -name 'gkt-test.c' \
-a -not -name 'poll-win32.c' -a -not -name 'thread-win32.c' \
-a -not -name 'dllmain.c' -a -not -name 'gconf-helper.c' \
-exec sed -i -e 's/\bpa_bool_t\b/bool/g' \
-e 's/\bTRUE\b/true/g' -e 's/\bFALSE\b/false/g' {} \;
and:
sed -i -e '181,194!s/\bpa_bool_t\b/bool/' \
-e '181,194!s/\bTRUE\b/true/' -e \
'181,194!s/\bFALSE\b/false/' pulsecore/macro.h
Diffstat (limited to 'src/modules/x11')
-rw-r--r-- | src/modules/x11/module-x11-bell.c | 4 | ||||
-rw-r--r-- | src/modules/x11/module-x11-cork-request.c | 4 | ||||
-rw-r--r-- | src/modules/x11/module-x11-publish.c | 6 | ||||
-rw-r--r-- | src/modules/x11/module-x11-xsmp.c | 10 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/modules/x11/module-x11-bell.c b/src/modules/x11/module-x11-bell.c index 37ab2e78b..001732bad 100644 --- a/src/modules/x11/module-x11-bell.c +++ b/src/modules/x11/module-x11-bell.c @@ -41,7 +41,7 @@ PA_MODULE_AUTHOR("Lennart Poettering"); PA_MODULE_DESCRIPTION("X11 bell interceptor"); PA_MODULE_VERSION(PACKAGE_VERSION); -PA_MODULE_LOAD_ONCE(FALSE); +PA_MODULE_LOAD_ONCE(false); PA_MODULE_USAGE("sink=<sink to connect to> sample=<sample name> display=<X11 display>"); static const char* const valid_modargs[] = { @@ -102,7 +102,7 @@ static void x11_kill_cb(pa_x11_wrapper *w, void *userdata) { u->x11_client = NULL; u->x11_wrapper = NULL; - pa_module_unload_request(u->module, TRUE); + pa_module_unload_request(u->module, true); } int pa__init(pa_module*m) { diff --git a/src/modules/x11/module-x11-cork-request.c b/src/modules/x11/module-x11-cork-request.c index 0e67db00c..5bd3c6c3f 100644 --- a/src/modules/x11/module-x11-cork-request.c +++ b/src/modules/x11/module-x11-cork-request.c @@ -45,7 +45,7 @@ PA_MODULE_AUTHOR("Lennart Poettering"); PA_MODULE_DESCRIPTION("Synthesize X11 media key events when cork/uncork is requested"); PA_MODULE_VERSION(PACKAGE_VERSION); -PA_MODULE_LOAD_ONCE(FALSE); +PA_MODULE_LOAD_ONCE(false); PA_MODULE_USAGE("display=<X11 display>"); static const char* const valid_modargs[] = { @@ -79,7 +79,7 @@ static void x11_kill_cb(pa_x11_wrapper *w, void *userdata) { u->x11_wrapper = NULL; } - pa_module_unload_request(u->module, TRUE); + pa_module_unload_request(u->module, true); } static pa_hook_result_t sink_input_send_event_hook_cb( diff --git a/src/modules/x11/module-x11-publish.c b/src/modules/x11/module-x11-publish.c index 16ea977ed..cae8e3a50 100644 --- a/src/modules/x11/module-x11-publish.c +++ b/src/modules/x11/module-x11-publish.c @@ -48,7 +48,7 @@ PA_MODULE_AUTHOR("Lennart Poettering"); PA_MODULE_DESCRIPTION("X11 credential publisher"); PA_MODULE_VERSION(PACKAGE_VERSION); -PA_MODULE_LOAD_ONCE(FALSE); +PA_MODULE_LOAD_ONCE(false); PA_MODULE_USAGE( "display=<X11 display> " "sink=<Sink to publish> " @@ -128,7 +128,7 @@ static void x11_kill_cb(pa_x11_wrapper *w, void *userdata) { u->x11_client = NULL; u->x11_wrapper = NULL; - pa_module_unload_request(u->module, TRUE); + pa_module_unload_request(u->module, true); } int pa__init(pa_module*m) { @@ -157,7 +157,7 @@ int pa__init(pa_module*m) { u->hook_slot = pa_hook_connect(&pa_native_protocol_hooks(u->protocol)[PA_NATIVE_HOOK_SERVERS_CHANGED], PA_HOOK_NORMAL, servers_changed_cb, u); - if (!(u->auth_cookie = pa_auth_cookie_get(m->core, pa_modargs_get_value(ma, "cookie", PA_NATIVE_COOKIE_FILE), TRUE, PA_NATIVE_COOKIE_LENGTH))) + if (!(u->auth_cookie = pa_auth_cookie_get(m->core, pa_modargs_get_value(ma, "cookie", PA_NATIVE_COOKIE_FILE), true, PA_NATIVE_COOKIE_LENGTH))) goto fail; if (!(u->x11_wrapper = pa_x11_wrapper_get(m->core, pa_modargs_get_value(ma, "display", NULL)))) diff --git a/src/modules/x11/module-x11-xsmp.c b/src/modules/x11/module-x11-xsmp.c index 5cce47d84..63401e5b3 100644 --- a/src/modules/x11/module-x11-xsmp.c +++ b/src/modules/x11/module-x11-xsmp.c @@ -42,10 +42,10 @@ PA_MODULE_AUTHOR("Lennart Poettering"); PA_MODULE_DESCRIPTION("X11 session management"); PA_MODULE_VERSION(PACKAGE_VERSION); -PA_MODULE_LOAD_ONCE(FALSE); +PA_MODULE_LOAD_ONCE(false); PA_MODULE_USAGE("session_manager=<session manager string> display=<X11 display>"); -static pa_bool_t ice_in_use = FALSE; +static bool ice_in_use = false; static const char* const valid_modargs[] = { "session_manager", @@ -72,7 +72,7 @@ static void die_cb(SmcConn connection, SmPointer client_data) { pa_x11_wrapper_unref(u->x11); u->x11 = NULL; - pa_module_unload_request(u->module, TRUE); + pa_module_unload_request(u->module, true); } static void save_complete_cb(SmcConn connection, SmPointer client_data) { @@ -129,7 +129,7 @@ int pa__init(pa_module*m) { } IceAddConnectionWatch(new_ice_connection, m->core); - ice_in_use = TRUE; + ice_in_use = true; m->userdata = u = pa_xnew(struct userdata, 1); u->core = m->core; @@ -244,6 +244,6 @@ void pa__done(pa_module*m) { if (ice_in_use) { IceRemoveConnectionWatch(new_ice_connection, m->core); - ice_in_use = FALSE; + ice_in_use = false; } } |