Obsolete obsoleted PCM API functions

3 files changed, 21 insertions, 2 deletions

diff --git a/src/pcm.c b/src/pcm.c
index 6d7406b..b31b7ba 100644
--- a/src/pcm.c
+++ b/src/pcm.c
@@ -475,7 +475,9 @@ int snd_pcm_dump_hw_setup(snd_pcm_t *pcm, snd_output_t *out)
 	snd_output_printf(out, "  buffer_size  : %lu\n", pcm->buffer_size);
 	snd_output_printf(out, "  period_size  : %lu\n", pcm->period_size);
 	snd_output_printf(out, "  period_time  : %u\n", pcm->period_time);
+#if 0 /* deprecated */
 	snd_output_printf(out, "  tick_time    : %u\n", pcm->tick_time);
+#endif
 	return 0;
 }
 
@@ -485,12 +487,16 @@ int snd_pcm_dump_sw_setup(snd_pcm_t *pcm, snd_output_t *out)
 			  snd_pcm_tstamp_mode_name(pcm->sw_params.tstamp_mode));
 	snd_output_printf(out, "  period_step  : %d\n",
 			  pcm->sw_params.period_step);
+#if 0 /* deprecated */
 	snd_output_printf(out, "  sleep_min    : %d\n",
 			  pcm->sw_params.sleep_min);
+#endif
 	snd_output_printf(out, "  avail_min    : %ld\n",
 			  pcm->sw_params.avail_min);
+#if 0 /* deprecated */
 	snd_output_printf(out, "  xfer_align   : %ld\n",
 			  pcm->sw_params.xfer_align);
+#endif
 	snd_output_printf(out, "  start_threshold  : %ld\n",
 			  pcm->sw_params.start_threshold);
 	snd_output_printf(out, "  stop_threshold   : %ld\n",
diff --git a/src/pcm_macros.h b/src/pcm_macros.h
index 6892de5..c8d9a42 100644
--- a/src/pcm_macros.h
+++ b/src/pcm_macros.h
@@ -44,7 +44,6 @@ struct _snd_pcm {
 	snd_pcm_uframes_t period_size;
 	unsigned int period_time;	/* period duration */
 	snd_interval_t periods;
-	unsigned int tick_time;
 	snd_pcm_uframes_t boundary;	/* pointers wrap point */
 	unsigned int info;		/* Info for returned setup */
 	unsigned int msbits;		/* used most significant bits */
@@ -1569,6 +1568,7 @@ int snd_pcm_hw_params_set_buffer_size_last(snd_pcm_t *pcm,
 
 
 static inline
+__attribute__ ((deprecated))
 int snd_pcm_hw_params_get_tick_time(const snd_pcm_hw_params_t *params,
 				    unsigned int *val, int *dir)
 {
@@ -1576,6 +1576,7 @@ int snd_pcm_hw_params_get_tick_time(const snd_pcm_hw_params_t *params,
 }
 
 static inline
+__attribute__ ((deprecated))
 int snd_pcm_hw_params_get_tick_time_min(const snd_pcm_hw_params_t *params,
 					unsigned int *val, int *dir)
 {
@@ -1583,6 +1584,7 @@ int snd_pcm_hw_params_get_tick_time_min(const snd_pcm_hw_params_t *params,
 }
 
 static inline
+__attribute__ ((deprecated))
 int snd_pcm_hw_params_get_tick_time_max(const snd_pcm_hw_params_t *params,
 					unsigned int *val, int *dir)
 {
@@ -1590,6 +1592,7 @@ int snd_pcm_hw_params_get_tick_time_max(const snd_pcm_hw_params_t *params,
 }
 
 static inline
+__attribute__ ((deprecated))
 int snd_pcm_hw_params_test_tick_time(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
 				     unsigned int val, int dir)
 {
@@ -1598,6 +1601,7 @@ int snd_pcm_hw_params_test_tick_time(snd_pcm_t *pcm, snd_pcm_hw_params_t *params
 }
 
 static inline
+__attribute__ ((deprecated))
 int snd_pcm_hw_params_set_tick_time(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
 				    unsigned int val, int dir)
 {
@@ -1606,6 +1610,7 @@ int snd_pcm_hw_params_set_tick_time(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
 }
 
 static inline
+__attribute__ ((deprecated))
 int snd_pcm_hw_params_set_tick_time_min(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
 					unsigned int *val, int *dir)
 {
@@ -1614,6 +1619,7 @@ int snd_pcm_hw_params_set_tick_time_min(snd_pcm_t *pcm, snd_pcm_hw_params_t *par
 }
 
 static inline
+__attribute__ ((deprecated))
 int snd_pcm_hw_params_set_tick_time_max(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
 					unsigned int *val, int *dir)
 {
@@ -1622,6 +1628,7 @@ int snd_pcm_hw_params_set_tick_time_max(snd_pcm_t *pcm, snd_pcm_hw_params_t *par
 }
 
 static inline
+__attribute__ ((deprecated))
 int snd_pcm_hw_params_set_tick_time_minmax(snd_pcm_t *pcm,
 					   snd_pcm_hw_params_t *params,
 					   unsigned int *min, int *mindir,
@@ -1632,6 +1639,7 @@ int snd_pcm_hw_params_set_tick_time_minmax(snd_pcm_t *pcm,
 }
 
 static inline
+__attribute__ ((deprecated))
 int snd_pcm_hw_params_set_tick_time_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
 					 unsigned int *val, int *dir)
 {
@@ -1640,6 +1648,7 @@ int snd_pcm_hw_params_set_tick_time_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *pa
 }
 
 static inline
+__attribute__ ((deprecated))
 int snd_pcm_hw_params_set_tick_time_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
 					  unsigned int *val, int *dir)
 {
@@ -1648,6 +1657,7 @@ int snd_pcm_hw_params_set_tick_time_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *p
 }
 
 static inline
+__attribute__ ((deprecated))
 int snd_pcm_hw_params_set_tick_time_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
 					 unsigned int *val, int *dir)
 {
@@ -1690,6 +1700,7 @@ int snd_pcm_sw_params_get_tstamp_mode(const snd_pcm_sw_params_t *params,
 }
 
 static inline
+__attribute__ ((deprecated))
 int snd_pcm_sw_params_set_sleep_min(snd_pcm_t *pcm, snd_pcm_sw_params_t *params,
 				    unsigned int val)
 {
@@ -1698,6 +1709,7 @@ int snd_pcm_sw_params_set_sleep_min(snd_pcm_t *pcm, snd_pcm_sw_params_t *params,
 }
 
 static inline
+__attribute__ ((deprecated))
 int snd_pcm_sw_params_get_sleep_min(const snd_pcm_sw_params_t *params,
 				    unsigned int *val)
 {
@@ -1723,6 +1735,7 @@ int snd_pcm_sw_params_get_avail_min(const snd_pcm_sw_params_t *params,
 
 
 static inline
+__attribute__ ((deprecated))
 int snd_pcm_sw_params_set_xfer_align(snd_pcm_t *pcm, snd_pcm_sw_params_t *params,
 				     snd_pcm_uframes_t val)
 {
@@ -1731,6 +1744,7 @@ int snd_pcm_sw_params_set_xfer_align(snd_pcm_t *pcm, snd_pcm_sw_params_t *params
 }
 
 static inline
+__attribute__ ((deprecated))
 int snd_pcm_sw_params_get_xfer_align(const snd_pcm_sw_params_t *params,
 				     snd_pcm_uframes_t *val)
 {
diff --git a/src/pcm_params.c b/src/pcm_params.c
index 6869fd5..beb0e21 100644
--- a/src/pcm_params.c
+++ b/src/pcm_params.c
@@ -977,7 +977,6 @@ static int _snd_pcm_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
 	snd_pcm_hw_params_get_period_time(params, &pcm->period_time, 0);
 	snd_pcm_hw_params_get_period_size(params, &pcm->period_size, 0);
 	snd_pcm_hw_params_get_buffer_size(params, &pcm->buffer_size);
-	snd_pcm_hw_params_get_tick_time(params, &pcm->tick_time, 0);
 	pcm->sample_bits = snd_pcm_format_physical_width(pcm->format);
 	pcm->frame_bits = pcm->sample_bits * pcm->channels;