Wrap SRC_ERR_XXX valus to SRC_ERR enum

evpobr committed 6 years ago

Commit 09d00861 parent 00629284 files · +34 −33Browse files

Unified · Split

4 files

src/common.h +11 −10
src/src_linear.c +5 −5
src/src_sinc.c +13 −13
src/src_zoh.c +5 −5

@@ -74,8 +74,9 @@ enum SRC_MODE · 73 unmodified lines
74	74	SRC_MODE_CALLBACK = 1
75	75	} ;
76	76
77		−enum
78		−{ SRC_ERR_NO_ERROR = 0,
	77	+enum SRC_ERR
	78	+{
	79	+ SRC_ERR_NO_ERROR = 0,
79	80
80	81	SRC_ERR_MALLOC_FAILED,
81	82	SRC_ERR_BAD_STATE,
@@ -107,7 +108,7 @@ enum · 25 unmodified lines
107	108	struct SRC_STATE_tag
108	109	{ double last_ratio, last_position ;
109	110
110		− int error ;
	111	+ enum SRC_ERR error ;
111	112	int channels ;
112	113
113	114	/* SRC_MODE_PROCESS or SRC_MODE_CALLBACK */
@@ -117,16 +118,16 @@ struct SRC_STATE_tag · 3 unmodified lines
117	118	void *private_data ;
118	119
119	120	/* Varispeed process function. */
120		− int (vari_process) (SRC_STATE state, SRC_DATA *data) ;
	121	+ enum SRC_ERR (vari_process) (SRC_STATE state, SRC_DATA *data) ;
121	122
122	123	/* Constant speed process function. */
123		− int (const_process) (SRC_STATE state, SRC_DATA *data) ;
	124	+ enum SRC_ERR (const_process) (SRC_STATE state, SRC_DATA *data) ;
124	125
125	126	/* State reset. */
126		− void (reset) (SRC_STATE state) ;
	127	+ void (reset) (SRC_STATE state) ;
127	128
128	129	/* State clone. */
129		− int (copy) (SRC_STATE from, SRC_STATE *to) ;
	130	+ enum SRC_ERR (copy) (SRC_STATE from, SRC_STATE *to) ;
130	131
131	132	/* Data specific to SRC_MODE_CALLBACK. */
132	133	src_callback_t callback_func ;
@@ -139,19 +140,19 @@ struct SRC_STATE_tag · 6 unmodified lines
139	140	const char* sinc_get_name (int src_enum) ;
140	141	const char* sinc_get_description (int src_enum) ;
141	142
142		−int sinc_set_converter (SRC_STATE *state, int src_enum) ;
	143	+enum SRC_ERR sinc_set_converter (SRC_STATE *state, int src_enum) ;
143	144
144	145	/* In src_linear.c */
145	146	const char* linear_get_name (int src_enum) ;
146	147	const char* linear_get_description (int src_enum) ;
147	148
148		−int linear_set_converter (SRC_STATE *state, int src_enum) ;
	149	+enum SRC_ERR linear_set_converter (SRC_STATE *state, int src_enum) ;
149	150
150	151	/* In src_zoh.c */
151	152	const char* zoh_get_name (int src_enum) ;
152	153	const char* zoh_get_description (int src_enum) ;
153	154
154		−int zoh_set_converter (SRC_STATE *state, int src_enum) ;
	155	+enum SRC_ERR zoh_set_converter (SRC_STATE *state, int src_enum) ;
155	156
156	157	/*----------------------------------------------------------
157	158	** Common static inline functions.

src/src_linear.c+5−5

@@ -14,9 +14,9 @@ · 13 unmodified lines
14	14	#include "src_config.h"
15	15	#include "common.h"
16	16
17		−static int linear_vari_process (SRC_STATE state, SRC_DATA data) ;
	17	+static enum SRC_ERR linear_vari_process (SRC_STATE state, SRC_DATA data) ;
18	18	static void linear_reset (SRC_STATE *state) ;
19		−static int linear_copy (SRC_STATE from, SRC_STATE to) ;
	19	+static enum SRC_ERR linear_copy (SRC_STATE from, SRC_STATE to) ;
20	20
21	21	/*========================================================================================
22	22	*/
@@ -37,7 +37,7 @@ typedef struct · 14 unmodified lines
37	37	/*----------------------------------------------------------------------------------------
38	38	*/
39	39
40		−static int
	40	+static enum SRC_ERR
41	41	linear_vari_process (SRC_STATE state, SRC_DATA data)
42	42	{ LINEAR_DATA *priv ;
43	43	double src_ratio, input_index, rem ;
@@ -158,7 +158,7 @@ linear_get_description (int src_enum) · 114 unmodified lines
158	158	return NULL ;
159	159	} /* linear_get_descrition */
160	160
161		−int
	161	+enum SRC_ERR
162	162	linear_set_converter (SRC_STATE *state, int src_enum)
163	163	{ LINEAR_DATA *priv = NULL ;
164	164
@@ -209,7 +209,7 @@ linear_reset (SRC_STATE *state) · 44 unmodified lines
209	209	return ;
210	210	} /* linear_reset */
211	211
212		−static int
	212	+static enum SRC_ERR
213	213	linear_copy (SRC_STATE from, SRC_STATE to)
214	214	{
215	215	if (from->private_data == NULL)

src/src_sinc.c+13−13

@@ -58,16 +58,16 @@ typedef struct · 57 unmodified lines
58	58	float buffer [] ;
59	59	} SINC_FILTER ;
60	60
61		−static int sinc_multichan_vari_process (SRC_STATE state, SRC_DATA data) ;
62		−static int sinc_hex_vari_process (SRC_STATE state, SRC_DATA data) ;
63		−static int sinc_quad_vari_process (SRC_STATE state, SRC_DATA data) ;
64		−static int sinc_stereo_vari_process (SRC_STATE state, SRC_DATA data) ;
65		−static int sinc_mono_vari_process (SRC_STATE state, SRC_DATA data) ;
	61	+static enum SRC_ERR sinc_multichan_vari_process (SRC_STATE state, SRC_DATA data) ;
	62	+static enum SRC_ERR sinc_hex_vari_process (SRC_STATE state, SRC_DATA data) ;
	63	+static enum SRC_ERR sinc_quad_vari_process (SRC_STATE state, SRC_DATA data) ;
	64	+static enum SRC_ERR sinc_stereo_vari_process (SRC_STATE state, SRC_DATA data) ;
	65	+static enum SRC_ERR sinc_mono_vari_process (SRC_STATE state, SRC_DATA data) ;
66	66
67	67	static int prepare_data (SINC_FILTER filter, SRC_DATA data, int half_filter_chan_len) WARN_UNUSED ;
68	68
69	69	static void sinc_reset (SRC_STATE *state) ;
70		−static int sinc_copy (SRC_STATE from, SRC_STATE to) ;
	70	+static enum SRC_ERR sinc_copy (SRC_STATE from, SRC_STATE to) ;
71	71
72	72	static inline increment_t
73	73	double_to_fp (double x)
@@ -142,7 +142,7 @@ sinc_get_description (int src_enum) · 68 unmodified lines
142	142	return NULL ;
143	143	} /* sinc_get_descrition */
144	144
145		−int
	145	+enum SRC_ERR
146	146	sinc_set_converter (SRC_STATE *state, int src_enum)
147	147	{ SINC_FILTER *filter, temp_filter ;
148	148	increment_t count ;
@@ -262,7 +262,7 @@ sinc_reset (SRC_STATE *state) · 113 unmodified lines
262	262	memset (filter->buffer + filter->b_len, 0xAA, filter->channels * sizeof (filter->buffer [0])) ;
263	263	} /* sinc_reset */
264	264
265		−static int
	265	+static enum SRC_ERR
266	266	sinc_copy (SRC_STATE from, SRC_STATE to)
267	267	{
268	268	if (from->private_data == NULL)
@@ -345,7 +345,7 @@ calc_output_single (SINC_FILTER *filter, increment_t increment, increment_t star · 76 unmodified lines
345	345	return (left + right) ;
346	346	} /* calc_output_single */
347	347
348		−static int
	348	+static enum SRC_ERR
349	349	sinc_mono_vari_process (SRC_STATE state, SRC_DATA data)
350	350	{ SINC_FILTER *filter ;
351	351	double input_index, src_ratio, count, float_increment, terminate, rem ;
@@ -501,7 +501,7 @@ calc_output_stereo (SINC_FILTER *filter, increment_t increment, increment_t star · 149 unmodified lines
501	501	output [ch] = (float) (scale * (left [ch] + right [ch])) ;
502	502	} /* calc_output_stereo */
503	503
504		−static int
	504	+static enum SRC_ERR
505	505	sinc_stereo_vari_process (SRC_STATE state, SRC_DATA data)
506	506	{ SINC_FILTER *filter ;
507	507	double input_index, src_ratio, count, float_increment, terminate, rem ;
@@ -657,7 +657,7 @@ calc_output_quad (SINC_FILTER *filter, increment_t increment, increment_t start_ · 149 unmodified lines
657	657	output [ch] = (float) (scale * (left [ch] + right [ch])) ;
658	658	} /* calc_output_quad */
659	659
660		−static int
	660	+static enum SRC_ERR
661	661	sinc_quad_vari_process (SRC_STATE state, SRC_DATA data)
662	662	{ SINC_FILTER *filter ;
663	663	double input_index, src_ratio, count, float_increment, terminate, rem ;
@@ -812,7 +812,7 @@ calc_output_hex (SINC_FILTER *filter, increment_t increment, increment_t start_f · 148 unmodified lines
812	812	output [ch] = (float) (scale * (left [ch] + right [ch])) ;
813	813	} /* calc_output_hex */
814	814
815		−static int
	815	+static enum SRC_ERR
816	816	sinc_hex_vari_process (SRC_STATE state, SRC_DATA data)
817	817	{ SINC_FILTER *filter ;
818	818	double input_index, src_ratio, count, float_increment, terminate, rem ;
@@ -977,7 +977,7 @@ calc_output_multi (SINC_FILTER *filter, increment_t increment, increment_t start · 158 unmodified lines
977	977	return ;
978	978	} /* calc_output_multi */
979	979
980		−static int
	980	+static enum SRC_ERR
981	981	sinc_multichan_vari_process (SRC_STATE state, SRC_DATA data)
982	982	{ SINC_FILTER *filter ;
983	983	double input_index, src_ratio, count, float_increment, terminate, rem ;

src/src_zoh.c+5−5

@@ -14,9 +14,9 @@ · 13 unmodified lines
14	14	#include "src_config.h"
15	15	#include "common.h"
16	16
17		−static int zoh_vari_process (SRC_STATE state, SRC_DATA data) ;
	17	+static enum SRC_ERR zoh_vari_process (SRC_STATE state, SRC_DATA data) ;
18	18	static void zoh_reset (SRC_STATE *state) ;
19		−static int zoh_copy (SRC_STATE from, SRC_STATE to) ;
	19	+static enum SRC_ERR zoh_copy (SRC_STATE from, SRC_STATE to) ;
20	20
21	21	/*========================================================================================
22	22	*/
@@ -35,7 +35,7 @@ typedef struct · 12 unmodified lines
35	35	/*----------------------------------------------------------------------------------------
36	36	*/
37	37
38		−static int
	38	+static enum SRC_ERR
39	39	zoh_vari_process (SRC_STATE state, SRC_DATA data)
40	40	{ ZOH_DATA *priv ;
41	41	double src_ratio, input_index, rem ;
@@ -149,7 +149,7 @@ zoh_get_description (int src_enum) · 107 unmodified lines
149	149	return NULL ;
150	150	} /* zoh_get_descrition */
151	151
152		−int
	152	+enum SRC_ERR
153	153	zoh_set_converter (SRC_STATE *state, int src_enum)
154	154	{ ZOH_DATA *priv = NULL ;
155	155
@@ -200,7 +200,7 @@ zoh_reset (SRC_STATE *state) · 44 unmodified lines
200	200	return ;
201	201	} /* zoh_reset */
202	202
203		−static int
	203	+static enum SRC_ERR
204	204	zoh_copy (SRC_STATE from, SRC_STATE to)
205	205	{
206	206	if (from->private_data == NULL)

Wrap SRC_ERR_XXX valus to SRC_ERR enum

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code