From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 28 Aug 2001 13:41:03 +0000 (+0000)
Subject: Fixed some typos for timer interface.
X-Git-Tag: v1.0.3~691
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=4e92e7a28c16d0a38fc11dd18ed063a7c1a23daa;p=alsa-lib.git

Fixed some typos for timer interface.
---

diff --git a/include/timer.h b/include/timer.h
index ba28d44b..258deeb2 100644
--- a/include/timer.h
+++ b/include/timer.h
@@ -25,7 +25,10 @@ typedef struct _snd_timer_params snd_timer_params_t;
 /** timer status structure */
 typedef struct _snd_timer_status snd_timer_status_t;
 /** timer read structure */
-typedef struct sndrv_timer_read snd_timer_read_t;
+typedef struct _snd_timer_read {
+	unsigned int resolution;	/**< tick resolution in nanoseconds */
+        unsigned int ticks;		/**< count of happened ticks */
+} snd_timer_read_t;
 
 /** timer master class */
 typedef enum _snd_timer_class {
@@ -69,6 +72,7 @@ typedef struct _snd_timer_query snd_timer_query_t;
 /** timer handle */
 typedef struct _snd_timer snd_timer_t;
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -130,7 +134,7 @@ void snd_timer_params_copy(snd_timer_params_t *dst, const snd_timer_params_t *sr
 
 void snd_timer_params_set_auto_start(snd_timer_params_t * params, int auto_start);
 void snd_timer_params_set_ticks(snd_timer_params_t * params, long ticks);
-int snd_timer_params_get_ticks(snd_timer_params_t * params);
+long snd_timer_params_get_ticks(snd_timer_params_t * params);
 void snd_timer_params_set_queue_size(snd_timer_params_t * params, long queue_size);
 long snd_timer_params_get_queue_size(snd_timer_params_t * params);
 
diff --git a/src/timer/timer.c b/src/timer/timer.c
index cdf41a08..4ebf8131 100644
--- a/src/timer/timer.c
+++ b/src/timer/timer.c
@@ -486,7 +486,7 @@ void snd_timer_params_set_ticks(snd_timer_params_t * params, long ticks)
  * \param params pointer to #snd_timer_params_t structure
  * \return timer ticks
  */
-int snd_timer_params_get_ticks(snd_timer_params_t * params)
+long snd_timer_params_get_ticks(snd_timer_params_t * params)
 {
 	assert(params);
 	return params->ticks;
diff --git a/src/timer/timer_query.c b/src/timer/timer_query.c
index ebdd65c3..17731764 100644
--- a/src/timer/timer_query.c
+++ b/src/timer/timer_query.c
@@ -42,7 +42,7 @@ static int snd_timer_query_open_conf(snd_timer_query_t **timer,
 	const char *str;
 	char buf[256];
 	int err;
-	snd_config_t *conf, *type_conf;
+	snd_config_t *conf, *type_conf = NULL;
 	snd_config_iterator_t i, next;
 	const char *lib = NULL, *open_name = NULL;
 	int (*open_func)(snd_timer_query_t **, const char *, snd_config_t *, snd_config_t *, int) = NULL;
@@ -130,7 +130,7 @@ static int snd_timer_query_open_noupdate(snd_timer_query_t **timer, snd_config_t
 {
 	int err;
 	snd_config_t *timer_conf;
-	err = snd_config_search_definition(root, "timer", name, &timer_conf);
+	err = snd_config_search_definition(root, "timer_query", name, &timer_conf);
 	if (err < 0) {
 		SNDERR("Unknown timer %s", name);
 		return err;