diff options
| author | speidy <speidy@gmail.com> | 2014-04-21 16:57:54 +0300 |
|---|---|---|
| committer | speidy <speidy@gmail.com> | 2014-04-21 16:57:54 +0300 |
| commit | 0f3a9184595eba0a26ee63ba3c625a1cf7fa3b18 (patch) | |
| tree | 72662824c9a5895c963960a712f927d36c900ff2 /sesman/chansrv/pulse/module-xrdp-source.c | |
| parent | 702f76c078bc1fa9c071de8b836c0781a3470a2f (diff) | |
| parent | e65c2375031c017e027d8dce5c6a460ae9dfdce7 (diff) | |
| download | xrdp-proprietary-0f3a9184595eba0a26ee63ba3c625a1cf7fa3b18.tar.gz xrdp-proprietary-0f3a9184595eba0a26ee63ba3c625a1cf7fa3b18.zip | |
Merge branch 'devel' of https://github.com/neutrinolabs/xrdp into devel
Diffstat (limited to 'sesman/chansrv/pulse/module-xrdp-source.c')
| -rw-r--r-- | sesman/chansrv/pulse/module-xrdp-source.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sesman/chansrv/pulse/module-xrdp-source.c b/sesman/chansrv/pulse/module-xrdp-source.c index 2d7ec4fa..95465c65 100644 --- a/sesman/chansrv/pulse/module-xrdp-source.c +++ b/sesman/chansrv/pulse/module-xrdp-source.c @@ -45,6 +45,15 @@ #include <pulsecore/thread-mq.h> #include <pulsecore/thread.h> +/* defined in pulse/version.h */ +#if PA_PROTOCOL_VERSION > 28 +/* these used to be defined in pulsecore/macro.h */ +typedef bool pa_bool_t; +#define FALSE ((pa_bool_t) 0) +#define TRUE (!FALSE) +#else +#endif + #include "module-xrdp-source-symdef.h" PA_MODULE_AUTHOR("Laxmikant Rashinkar"); @@ -329,8 +338,7 @@ int pa__init(pa_module *m) { pa_source_new_data_set_name(&data, pa_modargs_get_value(ma, "source_name", DEFAULT_SOURCE_NAME)); pa_source_new_data_set_sample_spec(&data, &ss); pa_source_new_data_set_channel_map(&data, &map); - //pa_proplist_sets(data.proplist, PA_PROP_DEVICE_DESCRIPTION, pa_modargs_get_value(ma, "description", "Null Input")); - pa_proplist_sets(data.proplist, PA_PROP_DEVICE_DESCRIPTION, pa_modargs_get_value(ma, "description", "xrdp Input")); + pa_proplist_sets(data.proplist, PA_PROP_DEVICE_DESCRIPTION, pa_modargs_get_value(ma, "description", "xrdp source")); pa_proplist_sets(data.proplist, PA_PROP_DEVICE_CLASS, "abstract"); u->source = pa_source_new(m->core, &data, PA_SOURCE_LATENCY | PA_SOURCE_DYNAMIC_LATENCY); |