diff --git a/src/modules/mixer/Pulse.h b/src/modules/mixer/Pulse.h index bbfabde3a..c4ac584ed 100644 --- a/src/modules/mixer/Pulse.h +++ b/src/modules/mixer/Pulse.h @@ -32,51 +32,51 @@ typedef struct Pulse_Server_Info const char *default_source; } Pulse_Server_Info; -int pulse_init(void); -void pulse_shutdown(void); +EINTERN int pulse_init(void); +EINTERN void pulse_shutdown(void); -Pulse *pulse_new(void); -Eina_Bool pulse_connect(Pulse *conn); -void pulse_disconnect(Pulse *conn); -void pulse_free(Pulse *conn); -void pulse_cb_set(Pulse *conn, uint32_t tagnum, Pulse_Cb cb); -void pulse_server_info_free(Pulse_Server_Info *ev); +EINTERN Pulse *pulse_new(void); +EINTERN Eina_Bool pulse_connect(Pulse *conn); +EINTERN void pulse_disconnect(Pulse *conn); +EINTERN void pulse_free(Pulse *conn); +EINTERN void pulse_cb_set(Pulse *conn, uint32_t tagnum, Pulse_Cb cb); +EINTERN void pulse_server_info_free(Pulse_Server_Info *ev); -uint32_t pulse_server_info_get(Pulse *conn); -uint32_t pulse_cards_get(Pulse *conn); +EINTERN uint32_t pulse_server_info_get(Pulse *conn); +EINTERN uint32_t pulse_cards_get(Pulse *conn); #define pulse_sinks_get(conn) pulse_types_get((conn), EINA_FALSE) #define pulse_sources_get(conn) pulse_types_get((conn), EINA_TRUE) -uint32_t pulse_types_get(Pulse *conn, Eina_Bool source); +EINTERN uint32_t pulse_types_get(Pulse *conn, Eina_Bool source); #define pulse_sink_get(conn, idx) pulse_type_get((conn), (idx), EINA_FALSE) #define pulse_source_get(conn, idx) pulse_type_get((conn), (idx), EINA_FALSE) -uint32_t pulse_type_get(Pulse *conn, uint32_t idx, Eina_Bool source); +EINTERN uint32_t pulse_type_get(Pulse *conn, uint32_t idx, Eina_Bool source); #define pulse_sink_mute_set(conn, idx, mute) pulse_type_mute_set((conn), (idx), (mute), EINA_FALSE) #define pulse_source_mute_set(conn, idx, mute) pulse_type_mute_set((conn), (idx), (mute), EINA_TRUE) -uint32_t pulse_type_mute_set(Pulse *conn, uint32_t idx, Eina_Bool mute, Eina_Bool source); +EINTERN uint32_t pulse_type_mute_set(Pulse *conn, uint32_t idx, Eina_Bool mute, Eina_Bool source); #define pulse_sink_volume_set(conn, idx, channels, vol) pulse_type_volume_set((conn), (idx), (channels), (vol), EINA_FALSE) #define pulse_source_volume_set(conn, idx, channels, vol) pulse_type_volume_set((conn), (idx), (channels), (vol), EINA_TRUE) -uint32_t pulse_type_volume_set(Pulse *conn, uint32_t sink_num, uint8_t channels, double vol, Eina_Bool source); +EINTERN uint32_t pulse_type_volume_set(Pulse *conn, uint32_t sink_num, uint8_t channels, double vol, Eina_Bool source); -void pulse_sink_free(Pulse_Sink *sink); -const char *pulse_sink_name_get(Pulse_Sink *sink); -const char *pulse_sink_desc_get(Pulse_Sink *sink); -uint32_t pulse_sink_idx_get(Pulse_Sink *sink); -Eina_Bool pulse_sink_muted_get(Pulse_Sink *sink); -double pulse_sink_avg_get_pct(Pulse_Sink *sink); -float pulse_sink_balance_get(Pulse_Sink *sink); -uint8_t pulse_sink_channels_count(Pulse_Sink *sink); -Eina_List *pulse_sink_channel_names_get(Pulse_Sink *sink); -Eina_Bool pulse_sinks_watch(Pulse *conn); +EINTERN void pulse_sink_free(Pulse_Sink *sink); +EINTERN const char *pulse_sink_name_get(Pulse_Sink *sink); +EINTERN const char *pulse_sink_desc_get(Pulse_Sink *sink); +EINTERN uint32_t pulse_sink_idx_get(Pulse_Sink *sink); +EINTERN Eina_Bool pulse_sink_muted_get(Pulse_Sink *sink); +EINTERN double pulse_sink_avg_get_pct(Pulse_Sink *sink); +EINTERN float pulse_sink_balance_get(Pulse_Sink *sink); +EINTERN uint8_t pulse_sink_channels_count(Pulse_Sink *sink); +EINTERN Eina_List *pulse_sink_channel_names_get(Pulse_Sink *sink); +EINTERN Eina_Bool pulse_sinks_watch(Pulse *conn); -const Eina_List *pulse_sink_ports_get(Pulse_Sink *sink); -const char *pulse_sink_port_active_get(Pulse_Sink *sink); +EINTERN const Eina_List *pulse_sink_ports_get(Pulse_Sink *sink); +EINTERN const char *pulse_sink_port_active_get(Pulse_Sink *sink); #define pulse_source_channel_volume_set pulse_sink_channel_volume_set -uint32_t pulse_sink_channel_volume_set(Pulse *conn, Pulse_Sink *sink, uint32_t id, double vol); -uint32_t pulse_sink_port_set(Pulse *conn, Pulse_Sink *sink, const char *port); -double pulse_sink_channel_volume_get(Pulse_Sink *sink, unsigned int id); -float pulse_sink_channel_balance_get(Pulse_Sink *sink, unsigned int id); -float pulse_sink_channel_depth_get(Pulse_Sink *sink, unsigned int id); -unsigned int pulse_sink_channel_name_get_id(Pulse_Sink *sink, const char *name); -const char *pulse_sink_channel_id_get_name(Pulse_Sink *sink, unsigned int id); +EINTERN uint32_t pulse_sink_channel_volume_set(Pulse *conn, Pulse_Sink *sink, uint32_t id, double vol); +EINTERN uint32_t pulse_sink_port_set(Pulse *conn, Pulse_Sink *sink, const char *port); +EINTERN double pulse_sink_channel_volume_get(Pulse_Sink *sink, unsigned int id); +EINTERN float pulse_sink_channel_balance_get(Pulse_Sink *sink, unsigned int id); +EINTERN float pulse_sink_channel_depth_get(Pulse_Sink *sink, unsigned int id); +EINTERN unsigned int pulse_sink_channel_name_get_id(Pulse_Sink *sink, const char *name); +EINTERN const char *pulse_sink_channel_id_get_name(Pulse_Sink *sink, unsigned int id); #endif diff --git a/src/modules/mixer/pa.c b/src/modules/mixer/pa.c index 924a9e998..aaab026a6 100644 --- a/src/modules/mixer/pa.c +++ b/src/modules/mixer/pa.c @@ -1,3 +1,4 @@ +#include "e.h" #include #include #include @@ -746,7 +747,7 @@ pulse_connect(Pulse *conn) return !!conn->svr; } -void +EINTERN void pulse_disconnect(Pulse *conn) { EINA_SAFETY_ON_NULL_RETURN(conn); diff --git a/src/modules/mixer/pa.h b/src/modules/mixer/pa.h index c656b0a82..3411567b3 100644 --- a/src/modules/mixer/pa.h +++ b/src/modules/mixer/pa.h @@ -1,9 +1,7 @@ #ifndef PA_HACKS_H #define PA_HACKS_H -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "e.h" #include #include @@ -29,6 +27,12 @@ # define _(X) (X) #endif +#undef DBG +#undef INF +#undef WRN +#undef ERR +#undef CRI + #define DBG(...) EINA_LOG_DOM_DBG(pa_log_dom, __VA_ARGS__) #define INF(...) EINA_LOG_DOM_INFO(pa_log_dom, __VA_ARGS__) #define WRN(...) EINA_LOG_DOM_WARN(pa_log_dom, __VA_ARGS__)