diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 08:03:40 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 08:03:40 -0500 |
| commit | 0a75c23a009ff65f651532cecc16675d05f4de37 (patch) | |
| tree | bdcd6158758fe1810f0ddddb80d2816779518688 /sound/core/seq/seq_queue.h | |
| parent | 34b8c399dc04c8e51f014b73458e654570698597 (diff) | |
| parent | db9edfd7e339ca4113153d887e782dd05be5a9eb (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'sound/core/seq/seq_queue.h')
| -rw-r--r-- | sound/core/seq/seq_queue.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sound/core/seq/seq_queue.h b/sound/core/seq/seq_queue.h index ea3c54216ea..88843859938 100644 --- a/sound/core/seq/seq_queue.h +++ b/sound/core/seq/seq_queue.h @@ -30,15 +30,15 @@ #define SEQ_QUEUE_NO_OWNER (-1) -struct _snd_seq_queue { +struct snd_seq_queue { int queue; /* queue number */ char name[64]; /* name of this queue */ - prioq_t *tickq; /* midi tick event queue */ - prioq_t *timeq; /* real-time event queue */ + struct snd_seq_prioq *tickq; /* midi tick event queue */ + struct snd_seq_prioq *timeq; /* real-time event queue */ - seq_timer_t *timer; /* time keeper for this queue */ + struct snd_seq_timer *timer; /* time keeper for this queue */ int owner; /* client that 'owns' the timer */ unsigned int locked:1, /* timer is only accesibble by owner if set */ klocked:1, /* kernel lock (after START) */ @@ -83,26 +83,26 @@ void snd_seq_queue_client_termination(int client); void snd_seq_queue_client_leave(int client); /* enqueue a event received from one the clients */ -int snd_seq_enqueue_event(snd_seq_event_cell_t *cell, int atomic, int hop); +int snd_seq_enqueue_event(struct snd_seq_event_cell *cell, int atomic, int hop); /* Remove events */ void snd_seq_queue_client_leave_cells(int client); -void snd_seq_queue_remove_cells(int client, snd_seq_remove_events_t *info); +void snd_seq_queue_remove_cells(int client, struct snd_seq_remove_events *info); /* return pointer to queue structure for specified id */ -queue_t *queueptr(int queueid); +struct snd_seq_queue *queueptr(int queueid); /* unlock */ #define queuefree(q) snd_use_lock_free(&(q)->use_lock) /* return the (first) queue matching with the specified name */ -queue_t *snd_seq_queue_find_name(char *name); +struct snd_seq_queue *snd_seq_queue_find_name(char *name); /* check single queue and dispatch events */ -void snd_seq_check_queue(queue_t *q, int atomic, int hop); +void snd_seq_check_queue(struct snd_seq_queue *q, int atomic, int hop); /* access to queue's parameters */ int snd_seq_queue_check_access(int queueid, int client); -int snd_seq_queue_timer_set_tempo(int queueid, int client, snd_seq_queue_tempo_t *info); +int snd_seq_queue_timer_set_tempo(int queueid, int client, struct snd_seq_queue_tempo *info); int snd_seq_queue_set_owner(int queueid, int client, int locked); int snd_seq_queue_set_locked(int queueid, int client, int locked); int snd_seq_queue_timer_open(int queueid); @@ -110,7 +110,7 @@ int snd_seq_queue_timer_close(int queueid); int snd_seq_queue_use(int queueid, int client, int use); int snd_seq_queue_is_used(int queueid, int client); -int snd_seq_control_queue(snd_seq_event_t *ev, int atomic, int hop); +int snd_seq_control_queue(struct snd_seq_event *ev, int atomic, int hop); /* * 64bit division - for sync stuff.. |