From 9ea25ebaea5d9e4f97ffe9fccca4e0dbe92b5b0d Mon Sep 17 00:00:00 2001 From: Seungbae Shin Date: Fri, 1 Jun 2018 16:55:18 +0900 Subject: [PATCH] Fix source crash due to header item mismatch [Version] 11.1-38 [Issue Type] Build Change-Id: I26e5af0a5569e48efe8eaa30391852bb0e6ecd73 --- libpulse.pc.in | 2 +- packaging/pulseaudio.spec | 2 +- pulsecore.pc.in | 2 +- src/daemon/daemon-conf.h | 2 +- src/pulse/context.h | 2 +- src/pulse/def.h | 2 +- src/pulse/introspect.h | 2 +- src/pulse/proplist.h | 2 -- src/pulse/volume.h | 2 +- src/pulsecore/core.h | 6 ++---- src/pulsecore/log.h | 2 +- src/pulsecore/mix.h | 2 +- src/pulsecore/native-common.h | 4 +--- src/pulsecore/sink-input.h | 19 +++++++++---------- src/pulsecore/sink.h | 4 +--- src/pulsecore/source-output.h | 2 +- src/pulsecore/source.h | 4 +--- 17 files changed, 25 insertions(+), 36 deletions(-) diff --git a/libpulse.pc.in b/libpulse.pc.in index ee8f4ae..bb36fb2 100644 --- a/libpulse.pc.in +++ b/libpulse.pc.in @@ -9,4 +9,4 @@ Description: PulseAudio Client Interface Version: @PACKAGE_VERSION@ Libs: -L${libdir} -lpulse @PTHREAD_LIBS@ Libs.private: -L${libdir}/pulseaudio -lpulsecommon-@PA_MAJORMINOR@ -Cflags: -I${includedir} -D_REENTRANT -D__TIZEN__ -D__TIZEN_BT__ -DTIZEN_SECURITY -DTIZEN_EMPTY_POP -DTIZEN_VOLUME_RAMP +Cflags: -I${includedir} -D_REENTRANT -D__TIZEN__ -D__TIZEN_BT__ diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec index 53bbfcc..6b88dca 100644 --- a/packaging/pulseaudio.spec +++ b/packaging/pulseaudio.spec @@ -3,7 +3,7 @@ Name: pulseaudio Summary: Improved Linux sound server Version: 11.1 -Release: 37 +Release: 38 Group: Multimedia/Audio License: LGPL-2.1 URL: http://pulseaudio.org diff --git a/pulsecore.pc.in b/pulsecore.pc.in index da1f474..039f79f 100644 --- a/pulsecore.pc.in +++ b/pulsecore.pc.in @@ -7,4 +7,4 @@ Name: pulsecore Description: Module building interface for pulseaudio Version: @PACKAGE_VERSION@ Libs: -L${libdir} -lpulsecore-@PA_MAJORMINOR@ -lpulse -L${libdir}/pulse-@PA_MAJORMINOR@/modules -lprotocol-native -L${libdir}/pulseaudio -lpulsecommon-@PA_MAJORMINOR@ @PTHREAD_LIBS@ -Cflags: -D_REENTRANT -DTIZEN_BUFFER_ATTR -DTIZEN_PCM_DUMP -DTIZEN_SECURITY -DTIZEN_EMPTY_POP -DTIZEN_VOLUME_RAMP -D__INCLUDED_FROM_PULSE_AUDIO -DPA_DEFAULT_CONFIG_DIR=\"@PA_DEFAULT_CONFIG_DIR@\" -I${includedir} +Cflags: -D_REENTRANT -D__TIZEN__ -D__INCLUDED_FROM_PULSE_AUDIO -DPA_DEFAULT_CONFIG_DIR=\"@PA_DEFAULT_CONFIG_DIR@\" -I${includedir} diff --git a/src/daemon/daemon-conf.h b/src/daemon/daemon-conf.h index d1add90..2f45092 100644 --- a/src/daemon/daemon-conf.h +++ b/src/daemon/daemon-conf.h @@ -89,7 +89,7 @@ typedef struct pa_daemon_conf { pa_log_level_t log_level; unsigned log_backtrace; char *config_file; -#ifdef TIZEN_EMPTY_POP +#ifdef __TIZEN__ unsigned empty_pop_threshold; #endif diff --git a/src/pulse/context.h b/src/pulse/context.h index 4ad3810..6f3afd2 100644 --- a/src/pulse/context.h +++ b/src/pulse/context.h @@ -286,7 +286,7 @@ size_t pa_context_get_tile_size(pa_context *c, const pa_sample_spec *ss); * location, feel free to use this function. \since 5.0 */ int pa_context_load_cookie_from_file(pa_context *c, const char *cookie_file_path); -#ifdef TIZEN_SECURITY +#ifdef __TIZEN__ pa_operation* pa_context_check_privilege(pa_context *c, const char *privilege, pa_context_success_cb_t cb, void *userdata); #endif diff --git a/src/pulse/def.h b/src/pulse/def.h index 93a2469..c0305af 100644 --- a/src/pulse/def.h +++ b/src/pulse/def.h @@ -1030,7 +1030,7 @@ typedef void (*pa_free_cb_t)(void *p); * playback. \since 1.0 */ #define PA_STREAM_EVENT_FORMAT_LOST "format-lost" -#ifdef TIZEN_EMPTY_POP +#ifdef __TIZEN__ #define PA_STREAM_EVENT_POP_TIMEOUT "pop-timeout" #endif diff --git a/src/pulse/introspect.h b/src/pulse/introspect.h index 4f4684e..7d3b8d9 100644 --- a/src/pulse/introspect.h +++ b/src/pulse/introspect.h @@ -550,7 +550,7 @@ pa_operation* pa_context_set_card_profile_by_name(pa_context *c, const char*name /** Set the latency offset of a port. \since 3.0 */ pa_operation* pa_context_set_port_latency_offset(pa_context *c, const char *card_name, const char *port_name, int64_t offset, pa_context_success_cb_t cb, void *userdata); -#ifdef TIZEN_PCM_DUMP +#ifdef __TIZEN__ pa_operation* pa_context_set_pcm_dump(pa_context *c, uint32_t dump_type, int dump_type_enable, pa_context_success_cb_t cb, void *userdata); pa_operation* pa_context_set_pcm_dump_option(pa_context *c, uint32_t dump_option, int dump_option_enable, pa_context_success_cb_t cb, void *userdata); #endif diff --git a/src/pulse/proplist.h b/src/pulse/proplist.h index 8a36684..99850cf 100644 --- a/src/pulse/proplist.h +++ b/src/pulse/proplist.h @@ -41,8 +41,6 @@ PA_C_DECL_BEGIN #define PA_PROP_MEDIA_TIZEN_AUDIO_LATENCY "media.tizen_audio_latency" #define PA_PROP_MEDIA_FOCUS_STATUS "media.focus_status" #define PA_PROP_MEDIA_FOCUS_ID "media.focus_id" /* It is used only for session backward compatibilty and will be deprecated. */ -#endif -#ifdef TIZEN_BUFFER_ATTR #define PA_PROP_BUFFER_ATTR_MAXLENGTH "buffer.attr.maxlength" #define PA_PROP_BUFFER_ATTR_TLENGTH "buffer.attr.tlength" #define PA_PROP_BUFFER_ATTR_MINREQ "buffer.attr.minreq" diff --git a/src/pulse/volume.h b/src/pulse/volume.h index 5bdf26a..4ea1e95 100644 --- a/src/pulse/volume.h +++ b/src/pulse/volume.h @@ -431,7 +431,7 @@ pa_cvolume* pa_cvolume_inc(pa_cvolume *v, pa_volume_t inc); * the channels are kept. \since 0.9.16 */ pa_cvolume* pa_cvolume_dec(pa_cvolume *v, pa_volume_t dec); -#ifdef TIZEN_VOLUME_RAMP +#ifdef __TIZEN__ /** Volume ramp type */ typedef enum pa_volume_ramp_type { diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h index bf1d166..e33df95 100644 --- a/src/pulsecore/core.h +++ b/src/pulsecore/core.h @@ -145,7 +145,7 @@ typedef enum pa_core_hook { PA_CORE_HOOK_MAX } pa_core_hook_t; -#ifdef TIZEN_PCM_DUMP +#ifdef __TIZEN__ #define PA_PCM_DUMP_PATH_PREFIX "/tmp/pcm" #define PA_PCM_DUMP_VCONF_KEY "memory/private/sound/pcm_dump" @@ -256,11 +256,9 @@ struct pa_core { /* hooks */ pa_hook hooks[PA_CORE_HOOK_MAX]; -#ifdef TIZEN_PCM_DUMP +#ifdef __TIZEN__ uint32_t pcm_dump; uint32_t pcm_dump_option; -#endif -#ifdef TIZEN_EMPTY_POP unsigned empty_pop_threshold; #endif }; diff --git a/src/pulsecore/log.h b/src/pulsecore/log.h index 8faf04d..0ad4262 100644 --- a/src/pulsecore/log.h +++ b/src/pulsecore/log.h @@ -39,7 +39,7 @@ typedef enum pa_log_target_type { PA_LOG_NULL, /* to /dev/null */ PA_LOG_FILE, /* to a user specified file */ PA_LOG_NEWFILE, /* with an automatic suffix to avoid overwriting anything */ -#ifdef TIZEN_DLOG +#ifdef __TIZEN__ PA_LOG_DLOG, PA_LOG_DLOG_COLOR, #endif diff --git a/src/pulsecore/mix.h b/src/pulsecore/mix.h index b35d00f..e36541d 100644 --- a/src/pulsecore/mix.h +++ b/src/pulsecore/mix.h @@ -59,7 +59,7 @@ void pa_volume_memchunk( const pa_sample_spec *spec, const pa_cvolume *volume); -#ifdef TIZEN_VOLUME_RAMP +#ifdef __TIZEN__ typedef struct pa_volume_ramp_int_t { pa_volume_ramp_type_t type; long length; diff --git a/src/pulsecore/native-common.h b/src/pulsecore/native-common.h index 8af2bfe..26cfffd 100644 --- a/src/pulsecore/native-common.h +++ b/src/pulsecore/native-common.h @@ -187,11 +187,9 @@ enum { * BOTH DIRECTIONS */ PA_COMMAND_REGISTER_MEMFD_SHMID, -#ifdef TIZEN_PCM_DUMP +#ifdef __TIZEN__ PA_COMMAND_SET_PCM_DUMP, PA_COMMAND_SET_PCM_DUMP_OPTION, -#endif -#ifdef TIZEN_SECURITY PA_COMMAND_CHECK_PRIVILEGE, #endif diff --git a/src/pulsecore/sink-input.h b/src/pulsecore/sink-input.h index fc5282f..aec8aeb 100644 --- a/src/pulsecore/sink-input.h +++ b/src/pulsecore/sink-input.h @@ -32,7 +32,7 @@ #include #include #include -#ifdef TIZEN_VOLUME_RAMP +#ifdef __TIZEN__ #include #endif @@ -61,7 +61,7 @@ typedef enum pa_sink_input_flags { PA_SINK_INPUT_DONT_INHIBIT_AUTO_SUSPEND = 256, PA_SINK_INPUT_NO_CREATE_ON_SUSPEND = 512, PA_SINK_INPUT_KILL_ON_SUSPEND = 1024, -#ifdef TIZEN_VOLUME_RAMP +#ifdef __TIZEN__ PA_SINK_INPUT_PASSTHROUGH = 2048, PA_SINK_INPUT_START_RAMP_MUTED = 4096, #else @@ -118,7 +118,7 @@ struct pa_sink_input { pa_cvolume volume_factor_sink; /* A second volume factor in format of the sink this stream is connected to. */ pa_hashmap *volume_factor_sink_items; -#ifdef TIZEN_VOLUME_RAMP +#ifdef __TIZEN__ pa_cvolume_ramp ramp_factor; pa_hashmap *ramp_factor_items; #endif @@ -133,7 +133,7 @@ struct pa_sink_input { * this.*/ bool save_sink:1, save_volume:1, save_muted:1; -#ifdef TIZEN_VOLUME_RAMP +#ifdef __TIZEN__ /* for volume ramps */ pa_cvolume_ramp_int ramp; #endif @@ -265,16 +265,15 @@ struct pa_sink_input { pa_usec_t requested_sink_latency; pa_hashmap *direct_outputs; -#ifdef TIZEN_VOLUME_RAMP +#ifdef __TIZEN__ pa_cvolume_ramp_int ramp; #endif } thread_info; -#ifdef TIZEN_PCM_DUMP + +#ifdef __TIZEN__ FILE *pcm_dump_fp; char *dump_path; uint32_t dump_length; -#endif -#ifdef TIZEN_EMPTY_POP pa_usec_t empty_pop_initial_timestamp; uint32_t empty_pop_previous_duration; bool is_virtual; @@ -294,7 +293,7 @@ enum { PA_SINK_INPUT_MESSAGE_SET_STATE, PA_SINK_INPUT_MESSAGE_SET_REQUESTED_LATENCY, PA_SINK_INPUT_MESSAGE_GET_REQUESTED_LATENCY, -#ifdef TIZEN_VOLUME_RAMP +#ifdef __TIZEN__ PA_SINK_INPUT_MESSAGE_SET_VOLUME_RAMP, #endif PA_SINK_INPUT_MESSAGE_MAX @@ -403,7 +402,7 @@ pa_cvolume *pa_sink_input_get_volume(pa_sink_input *i, pa_cvolume *volume, bool void pa_sink_input_set_mute(pa_sink_input *i, bool mute, bool save); -#ifdef TIZEN_VOLUME_RAMP +#ifdef __TIZEN__ void pa_sink_input_add_volume_ramp_factor(pa_sink_input *i, const char *key, const pa_cvolume_ramp *ramp_factor, bool send_msg); int pa_sink_input_remove_volume_ramp_factor(pa_sink_input *i, const char *key, bool send_msg); #endif diff --git a/src/pulsecore/sink.h b/src/pulsecore/sink.h index 07de5be..0bd9a2c 100644 --- a/src/pulsecore/sink.h +++ b/src/pulsecore/sink.h @@ -311,11 +311,9 @@ struct pa_sink { int32_t volume_change_extra_delay; } thread_info; -#ifdef TIZEN_PCM_DUMP +#ifdef __TIZEN__ FILE *pcm_dump_fp; char *dump_path; -#endif -#ifdef __TIZEN__ void *device_item; bool use_internal_codec; #endif diff --git a/src/pulsecore/source-output.h b/src/pulsecore/source-output.h index 2388fbe..001a72d 100644 --- a/src/pulsecore/source-output.h +++ b/src/pulsecore/source-output.h @@ -208,7 +208,7 @@ struct pa_source_output { pa_sink_input *direct_on_input; /* may be NULL */ } thread_info; -#ifdef TIZEN_PCM_DUMP +#ifdef __TIZEN__ FILE *pcm_dump_fp; char *dump_path; #endif diff --git a/src/pulsecore/source.h b/src/pulsecore/source.h index ef76d17..f182ec0 100644 --- a/src/pulsecore/source.h +++ b/src/pulsecore/source.h @@ -251,11 +251,9 @@ struct pa_source { int32_t volume_change_extra_delay; } thread_info; -#ifdef TIZEN_PCM_DUMP +#ifdef __TIZEN__ FILE *pcm_dump_fp; char *dump_path; -#endif -#ifdef __TIZEN__ void *device_item; bool use_internal_codec; #endif -- 2.7.4