Make local functions really local

Rename the local functions to snd1_* so that they won't be exported
out of alsa-lib.

Some functions are still kept because aserver requires them.  Sigh.

diff --git a/include/local.h b/include/local.h
index da914ac66659120a156d987b6900125d7b8df4b7..b5a1c453f7009326d596ec3c9dd2d65f03ce9d2d 100644 (file)
--- a/include/local.h
+++ b/include/local.h
@@ -247,6 +247,20 @@ static inline int snd_open_device(const char *filename, int fmode)
 #define snd_open_device(filename, fmode) open(filename, fmode);
 #endif
 
+/* make local functions really local */
+#define snd_dlobj_cache_lookup \
+       snd1_dlobj_cache_lookup
+#define snd_dlobj_cache_add \
+       snd1_dlobj_cache_add
+#define snd_dlobj_cache_cleanup \
+       snd1_dlobj_cache_cleanup
+#define snd_config_set_hop \
+       snd1_config_set_hop
+#define snd_config_check_hop \
+       snd1_config_check_hop
+#define snd_config_search_alias_hooks \
+       snd1_config_search_alias_hooks
+
 /* dlobj cache */
 void *snd_dlobj_cache_lookup(const char *name);
 int snd_dlobj_cache_add(const char *name, void *dlobj, void *open_func);

diff --git a/src/control/control_local.h b/src/control/control_local.h
index 57c687c5cc8c90d055acd4c954b9c89b5daf1477..f72f20021e0c10a5ac08ac7c79346abe4dfddddd 100644 (file)
--- a/src/control/control_local.h
+++ b/src/control/control_local.h
@@ -89,6 +89,9 @@ struct _snd_hctl {
 };
 
 
+/* make local functions really local */
+#define snd_ctl_new    snd1_ctl_new
+
 int snd_ctl_new(snd_ctl_t **ctlp, snd_ctl_type_t type, const char *name);
 int _snd_ctl_poll_descriptor(snd_ctl_t *ctl);
 #define _snd_ctl_async_descriptor _snd_ctl_poll_descriptor

diff --git a/src/mixer/mixer_simple.h b/src/mixer/mixer_simple.h
index b3be121cc3bc1998735d782c1d76f29949025fa1..e88b00710cd2e2f065c8099e73acb9252b289307 100644 (file)
--- a/src/mixer/mixer_simple.h
+++ b/src/mixer/mixer_simple.h
@@ -21,5 +21,11 @@
 
 #include "mixer_abst.h"
 
+/* make local functions really local */
+#define snd_mixer_simple_none_register \
+       snd1_mixer_simple_none_register
+#define snd_mixer_simple_basic_register \
+       snd1_mixer_simple_basic_register
+
 int snd_mixer_simple_none_register(snd_mixer_t *mixer, struct snd_mixer_selem_regopt *options, snd_mixer_class_t **classp);
 int snd_mixer_simple_basic_register(snd_mixer_t *mixer, struct snd_mixer_selem_regopt *options, snd_mixer_class_t **classp);

diff --git a/src/pcm/interval.h b/src/pcm/interval.h
index 76a274aadfc03118b3a79dd4d15101fa5a32f8c1..330b056d6d950d94cc0f02052bae648eda1c181f 100644 (file)
--- a/src/pcm/interval.h
+++ b/src/pcm/interval.h
@@ -42,6 +42,22 @@ int snd_interval_always_eq(const snd_interval_t *i1, const snd_interval_t *i2);
 int snd_interval_never_eq(const snd_interval_t *i1, const snd_interval_t *i2);
 #endif
 
+/* make local functions really local */
+#define snd_interval_add       snd1_interval_add
+#define snd_interval_sub       snd1_interval_sub
+#define snd_interval_mul       snd1_interval_mul
+#define snd_interval_div       snd1_interval_div
+#define snd_interval_muldiv    snd1_interval_muldiv
+#define snd_interval_muldivk   snd1_interval_muldivk
+#define snd_interval_mulkdiv   snd1_interval_mulkdiv
+#define snd_interval_print     snd1_interval_print
+#define snd_interval_refine_min        snd1_interval_refine_min
+#define snd_interval_refine_max        snd1_interval_refine_max
+#define snd_interval_refine    snd1_interval_refine
+#define snd_interval_refine_first snd1_interval_refine_first
+#define snd_interval_refine_last snd1_interval_refine_last
+#define snd_interval_refine_set        snd1_interval_refine_set
+
 void snd_interval_add(const snd_interval_t *a, const snd_interval_t *b, snd_interval_t *c);
 void snd_interval_sub(const snd_interval_t *a, const snd_interval_t *b, snd_interval_t *c);
 void snd_interval_mul(const snd_interval_t *a, const snd_interval_t *b, snd_interval_t *c);

diff --git a/src/pcm/pcm_direct.h b/src/pcm/pcm_direct.h
index b9efbe63a149f7e680fefb1ecf8130f441e6f78b..7fdf0a93c26352292d93433d751e6978e68f022d 100644 (file)
--- a/src/pcm/pcm_direct.h
+++ b/src/pcm/pcm_direct.h
@@ -161,6 +161,66 @@ struct snd_pcm_direct {
        void (*server_free)(snd_pcm_direct_t *direct);
 };
 
+/* make local functions really local */
+#define snd_pcm_direct_semaphore_create_or_connect \
+       snd1_pcm_direct_semaphore_create_or_connect
+#define snd_pcm_direct_shm_create_or_connect \
+       snd1_pcm_direct_shm_create_or_connect
+#define snd_pcm_direct_shm_discard \
+       snd1_pcm_direct_shm_discard
+#define snd_pcm_direct_server_create \
+       snd1_pcm_direct_server_create
+#define snd_pcm_direct_server_discard \
+       snd1_pcm_direct_server_discard
+#define snd_pcm_direct_client_connect \
+       snd1_pcm_direct_client_connect
+#define snd_pcm_direct_client_discard \
+       snd1_pcm_direct_client_discard
+#define snd_pcm_direct_initialize_slave \
+       snd1_pcm_direct_initialize_slave
+#define snd_pcm_direct_initialize_secondary_slave \
+       snd1_pcm_direct_initialize_secondary_slave
+#define snd_pcm_direct_initialize_poll_fd \
+       snd1_pcm_direct_initialize_poll_fd
+#define snd_pcm_direct_check_interleave \
+       snd1_pcm_direct_check_interleave
+#define snd_pcm_direct_parse_bindings \
+       snd1_pcm_direct_parse_bindings
+#define snd_pcm_direct_nonblock \
+       snd1_pcm_direct_nonblock
+#define snd_pcm_direct_async \
+       snd1_pcm_direct_async
+#define snd_pcm_direct_poll_revents \
+       snd1_pcm_direct_poll_revents
+#define snd_pcm_direct_info \
+       snd1_pcm_direct_info
+#define snd_pcm_direct_hw_refine \
+       snd1_pcm_direct_hw_refine
+#define snd_pcm_direct_hw_params \
+       snd1_pcm_direct_hw_params
+#define snd_pcm_direct_hw_free \
+       snd1_pcm_direct_hw_free
+#define snd_pcm_direct_sw_params \
+       snd1_pcm_direct_sw_params
+#define snd_pcm_direct_channel_info \
+       snd1_pcm_direct_channel_info
+#define snd_pcm_direct_mmap \
+       snd1_pcm_direct_mmap
+#define snd_pcm_direct_munmap \
+       snd1_pcm_direct_munmap
+#define snd_pcm_direct_resume \
+       snd1_pcm_direct_resume
+#define snd_pcm_direct_timer_stop \
+       snd1_pcm_direct_timer_stop
+#define snd_pcm_direct_clear_timer_queue \
+       snd1_pcm_direct_clear_timer_queue
+#define snd_pcm_direct_set_timer_params \
+       snd1_pcm_direct_set_timer_params
+#define snd_pcm_direct_open_secondary_client \
+       snd1_pcm_direct_open_secondary_client
+#define snd_pcm_direct_parse_open_conf \
+       snd1_pcm_direct_parse_open_conf
+
 int snd_pcm_direct_semaphore_create_or_connect(snd_pcm_direct_t *dmix);
 
 static inline int snd_pcm_direct_semaphore_discard(snd_pcm_direct_t *dmix)

diff --git a/src/pcm/pcm_ext_parm.h b/src/pcm/pcm_ext_parm.h
index b70749f2fdd0742d4f77e0802c6ed42ee81a2ef5..d25f2ab6810db0c50c0ae19b8899539415193915 100644 (file)
--- a/src/pcm/pcm_ext_parm.h
+++ b/src/pcm/pcm_ext_parm.h
@@ -19,6 +19,20 @@ static inline snd_interval_t *hw_param_interval(snd_pcm_hw_params_t *params,
        return &params->intervals[var - SND_PCM_HW_PARAM_FIRST_INTERVAL];
 }
 
+/* make local functions really local */
+#define snd_ext_parm_set_minmax \
+       snd1_ext_parm_set_minmax
+#define snd_ext_parm_set_list \
+       snd1_ext_parm_set_list
+#define snd_ext_parm_clear \
+       snd1_ext_parm_clear
+#define snd_interval_list \
+       snd1_interval_list
+#define snd_ext_parm_interval_refine \
+       snd1_ext_parm_interval_refine
+#define snd_ext_parm_mask_refine \
+       snd1_ext_parm_mask_refine
+
 int snd_ext_parm_set_minmax(struct snd_ext_parm *parm, unsigned int min, unsigned int max);
 int snd_ext_parm_set_list(struct snd_ext_parm *parm, unsigned int num_list, const unsigned int *list);
 void snd_ext_parm_clear(struct snd_ext_parm *parm);

diff --git a/src/pcm/pcm_generic.h b/src/pcm/pcm_generic.h
index 5bd82a029390de3dcc3178a3258ef85e9c093532..47376c519df6fa9feccef5d235c1af1a902f0f04 100644 (file)
--- a/src/pcm/pcm_generic.h
+++ b/src/pcm/pcm_generic.h
@@ -24,6 +24,82 @@ typedef struct {
        int close_slave;
 } snd_pcm_generic_t;   
 
+/* make local functions really local */
+#define snd_pcm_generic_close \
+       snd1_pcm_generic_close
+#define snd_pcm_generic_nonblock \
+       snd1_pcm_generic_nonblock
+#define snd_pcm_generic_async \
+       snd1_pcm_generic_async
+#define snd_pcm_generic_poll_descriptors_count \
+       snd1_pcm_generic_poll_descriptors_count
+#define snd_pcm_generic_poll_descriptors \
+       snd1_pcm_generic_poll_descriptors
+#define snd_pcm_generic_poll_revents \
+       snd1_pcm_generic_poll_revents
+#define snd_pcm_generic_info \
+       snd1_pcm_generic_info
+#define snd_pcm_generic_hw_free \
+       snd1_pcm_generic_hw_free
+#define snd_pcm_generic_sw_params \
+       snd1_pcm_generic_sw_params
+#define snd_pcm_generic_hw_refine \
+       snd1_pcm_generic_hw_refine
+#define snd_pcm_generic_hw_params \
+       snd1_pcm_generic_hw_params
+#define snd_pcm_generic_channel_info \
+       snd1_pcm_generic_channel_info
+#define snd_pcm_generic_channel_info_no_buffer \
+       snd1_pcm_generic_channel_info_no_buffer
+#define snd_pcm_generic_status \
+       snd1_pcm_generic_status
+#define snd_pcm_generic_state \
+       snd1_pcm_generic_state
+#define snd_pcm_generic_prepare \
+       snd1_pcm_generic_prepare
+#define snd_pcm_generic_hwsync \
+       snd1_pcm_generic_hwsync
+#define snd_pcm_generic_reset \
+       snd1_pcm_generic_reset
+#define snd_pcm_generic_start \
+       snd1_pcm_generic_start
+#define snd_pcm_generic_drop \
+       snd1_pcm_generic_drop
+#define snd_pcm_generic_drain \
+       snd1_pcm_generic_drain
+#define snd_pcm_generic_pause \
+       snd1_pcm_generic_pause
+#define snd_pcm_generic_resume \
+       snd1_pcm_generic_resume
+#define snd_pcm_generic_delay \
+       snd1_pcm_generic_delay
+#define snd_pcm_generic_forward \
+       snd1_pcm_generic_forward
+#define snd_pcm_generic_rewind \
+       snd1_pcm_generic_rewind
+#define snd_pcm_generic_link \
+       snd1_pcm_generic_link
+#define snd_pcm_generic_link_slaves \
+       snd1_pcm_generic_link_slaves
+#define snd_pcm_generic_unlink \
+       snd1_pcm_generic_unlink
+#define snd_pcm_generic_writei \
+       snd1_pcm_generic_writei
+#define snd_pcm_generic_writen \
+       snd1_pcm_generic_writen
+#define snd_pcm_generic_readi \
+       snd1_pcm_generic_readi
+#define snd_pcm_generic_readn \
+       snd1_pcm_generic_readn
+#define snd_pcm_generic_mmap_commit \
+       snd1_pcm_generic_mmap_commit
+#define snd_pcm_generic_avail_update   \
+       snd1_pcm_generic_avail_update
+#define snd_pcm_generic_mmap \
+       snd1_pcm_generic_mmap
+#define snd_pcm_generic_munmap \
+       snd1_pcm_generic_munmap
+
 int snd_pcm_generic_close(snd_pcm_t *pcm);
 int snd_pcm_generic_nonblock(snd_pcm_t *pcm, int nonblock);
 int snd_pcm_generic_async(snd_pcm_t *pcm, int sig, pid_t pid);

diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h
index f2816c6aad0700950eea22138a6d4dd809c08d00..b5877cd0df8537825d5dbd2efd104ab7e5586e5c 100644 (file)
--- a/src/pcm/pcm_local.h
+++ b/src/pcm/pcm_local.h
@@ -227,6 +227,116 @@ struct _snd_pcm {
        struct list_head async_handlers;
 };
 
+/* make local functions really local */
+/* Grrr, these cannot be local - a bad aserver uses them!
+#define snd_pcm_async \
+       snd1_pcm_async
+#define snd_pcm_mmap \
+       snd1_pcm_mmap
+#define snd_pcm_munmap \
+       snd1_pcm_munmap
+#define snd_pcm_hw_refine \
+       snd1_pcm_hw_refine
+*/
+#define snd_pcm_new \
+       snd1_pcm_new
+#define snd_pcm_free \
+       snd1_pcm_free
+#define snd_pcm_areas_from_buf \
+       snd1_pcm_areas_from_buf
+#define snd_pcm_areas_from_bufs \
+       snd1_pcm_areas_from_bufs
+#define snd_pcm_open_named_slave \
+       snd1_pcm_open_named_slave
+#define snd_pcm_conf_generic_id \
+       snd1_pcm_conf_generic_id
+#define snd_pcm_hw_open_fd \
+       snd1_pcm_hw_open_fd
+#define snd_pcm_wait_nocheck \
+       snd1_pcm_wait_nocheck
+#define snd_pcm_rate_get_default_converter \
+       snd1_pcm_rate_get_default_converter
+#define snd_pcm_set_hw_ptr \
+       snd1_pcm_set_hw_ptr
+#define snd_pcm_set_appl_ptr \
+       snd1_pcm_set_appl_ptr
+#define snd_pcm_link_hw_ptr \
+       snd1_pcm_link_hw_ptr
+#define snd_pcm_link_appl_ptr \
+       snd1_pcm_link_appl_ptr
+#define snd_pcm_unlink_hw_ptr \
+       snd1_pcm_unlink_hw_ptr
+#define snd_pcm_unlink_appl_ptr \
+       snd1_pcm_unlink_appl_ptr
+#define snd_pcm_mmap_appl_ptr \
+       snd1_pcm_mmap_appl_ptr
+#define snd_pcm_mmap_appl_backward \
+       snd1_pcm_mmap_appl_backward
+#define snd_pcm_mmap_appl_forward \
+       snd1_pcm_mmap_appl_forward
+#define snd_pcm_mmap_hw_backward \
+       snd1_pcm_mmap_hw_backward
+#define snd_pcm_mmap_hw_forward \
+       snd1_pcm_mmap_hw_forward
+#define snd_pcm_read_areas \
+       snd1_pcm_read_areas
+#define snd_pcm_write_areas \
+       snd1_pcm_write_areas
+#define snd_pcm_read_mmap \
+       snd1_pcm_read_mmap
+#define snd_pcm_write_mmap \
+       snd1_pcm_write_mmap
+#define snd_pcm_channel_info_shm \
+       snd1_pcm_channel_info_shm
+#define snd_pcm_hw_refine_soft \
+       snd1_pcm_hw_refine_soft
+#define snd_pcm_hw_refine_slave \
+       snd1_pcm_hw_refine_slave
+#define snd_pcm_hw_params_slave \
+       snd1_pcm_hw_params_slave
+#define snd_pcm_hw_param_refine_near \
+       snd1_pcm_hw_param_refine_near
+#define snd_pcm_hw_param_refine_multiple \
+       snd1_pcm_hw_param_refine_multiple
+#define snd_pcm_hw_param_empty \
+       snd1_pcm_hw_param_empty
+#define snd_pcm_hw_param_always_eq \
+       snd1_pcm_hw_param_always_eq
+#define snd_pcm_hw_param_never_eq \
+       snd1_pcm_hw_param_never_eq
+#define snd_pcm_hw_param_get_mask \
+       snd1_pcm_hw_param_get_mask
+#define snd_pcm_hw_param_get_interval \
+       snd1_pcm_hw_param_get_interval
+#define snd_pcm_hw_param_any \
+       snd1_pcm_hw_param_any
+#define snd_pcm_hw_param_set_integer \
+       snd1_pcm_hw_param_set_integer
+#define snd_pcm_hw_param_set_first \
+       snd1_pcm_hw_param_set_first
+#define snd_pcm_hw_param_set_last \
+       snd1_pcm_hw_param_set_last
+#define snd_pcm_hw_param_set_near \
+       snd1_pcm_hw_param_set_near
+#define snd_pcm_hw_param_set_min \
+       snd1_pcm_hw_param_set_min
+#define snd_pcm_hw_param_set_max \
+       snd1_pcm_hw_param_set_max
+#define snd_pcm_hw_param_set_minmax \
+       snd1_pcm_hw_param_set_minmax
+#define snd_pcm_hw_param_set \
+       snd1_pcm_hw_param_set
+#define snd_pcm_hw_param_set_mask \
+       snd1_pcm_hw_param_set_mask
+#define snd_pcm_hw_param_get \
+       snd1_pcm_hw_param_get
+#define snd_pcm_hw_param_get_min \
+       snd1_pcm_hw_param_get_min
+#define snd_pcm_hw_param_get_max \
+       snd1_pcm_hw_param_get_max
+#define snd_pcm_hw_param_name          \
+       snd1_pcm_hw_param_name
+
 int snd_pcm_new(snd_pcm_t **pcmp, snd_pcm_type_t type, const char *name,
                snd_pcm_stream_t stream, int mode);
 int snd_pcm_free(snd_pcm_t *pcm);

diff --git a/src/pcm/pcm_plugin.h b/src/pcm/pcm_plugin.h
index b587c571c8487059fb9239981c410bd4d0e3ab9b..b427e1341641d8e8474d71c68fcd9a1be3e4fb73 100644 (file)
--- a/src/pcm/pcm_plugin.h
+++ b/src/pcm/pcm_plugin.h
@@ -51,6 +51,16 @@ typedef struct {
        snd_atomic_write_t watom;
 } snd_pcm_plugin_t;    
 
+/* make local functions really local */
+#define snd_pcm_plugin_init \
+       snd1_pcm_plugin_init
+#define snd_pcm_plugin_fast_ops \
+       snd1_pcm_plugin_fast_ops
+#define snd_pcm_plugin_undo_read_generic \
+       snd1_pcm_plugin_undo_read_generic
+#define snd_pcm_plugin_undo_write_generic \
+       snd1_pcm_plugin_undo_write_generic
+
 void snd_pcm_plugin_init(snd_pcm_plugin_t *plugin);
 
 extern snd_pcm_fast_ops_t snd_pcm_plugin_fast_ops;
@@ -69,6 +79,21 @@ snd_pcm_sframes_t snd_pcm_plugin_undo_write_generic
       snd_pcm_uframes_t res_size,              /* size of result areas */
       snd_pcm_uframes_t slave_undo_size);
 
+/* make local functions really local */
+#define snd_pcm_linear_get_index       snd1_pcm_linear_get_index
+#define snd_pcm_linear_put_index       snd1_pcm_linear_put_index
+#define snd_pcm_linear_get32_index     snd1_pcm_linear_get32_index
+#define snd_pcm_linear_put32_index     snd1_pcm_linear_put32_index
+#define snd_pcm_linear_convert_index   snd1_pcm_linear_convert_index
+#define snd_pcm_linear_convert snd1_pcm_linear_convert
+#define snd_pcm_linear_getput  snd1_pcm_linear_getput
+#define snd_pcm_alaw_decode    snd1_pcm_alaw_decode
+#define snd_pcm_alaw_encode    snd1_pcm_alaw_encode
+#define snd_pcm_mulaw_decode   snd1_pcm_mulaw_decode
+#define snd_pcm_mulaw_encode   snd1_pcm_mulaw_encode
+#define snd_pcm_adpcm_decode   snd1_pcm_adpcm_decode
+#define snd_pcm_adpcm_encode   snd1_pcm_adpcm_encode
+
 int snd_pcm_linear_get_index(snd_pcm_format_t src_format, snd_pcm_format_t dst_format);
 int snd_pcm_linear_put_index(snd_pcm_format_t src_format, snd_pcm_format_t dst_format);
 int snd_pcm_linear_get32_index(snd_pcm_format_t src_format, snd_pcm_format_t dst_format);