From 69bbf84e2efa15a2c5bcc9dc15ccd2a803b708ff Mon Sep 17 00:00:00 2001 From: paul Date: Wed, 28 Sep 2011 13:09:46 +0000 Subject: [PATCH] fix the types of a few function parameters git-svn-id: svn+ssh://jackaudio.org/trunk/jack@4544 0c269be4-1314-0410-8aa9-9f06e86f4224 --- jack/midiport.h | 4 ++-- jack/transport.h | 2 +- libjack/midiport.c | 12 ++++++------ libjack/transclient.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jack/midiport.h b/jack/midiport.h index a02a242..b388254 100644 --- a/jack/midiport.h +++ b/jack/midiport.h @@ -71,7 +71,7 @@ jack_midi_get_event_count(void* port_buffer) JACK_OPTIONAL_WEAK_EXPORT; int jack_midi_event_get(jack_midi_event_t *event, void *port_buffer, - jack_nframes_t event_index) JACK_OPTIONAL_WEAK_EXPORT; + uint32_t event_index) JACK_OPTIONAL_WEAK_EXPORT; /** Clear an event buffer. @@ -158,7 +158,7 @@ jack_midi_event_write(void *port_buffer, * @param port_buffer Port to receive count for. * @returns Number of events that could not be written to @a port_buffer. */ -jack_nframes_t +uint32_t jack_midi_get_lost_event_count(void *port_buffer) JACK_OPTIONAL_WEAK_EXPORT; /*@}*/ diff --git a/jack/transport.h b/jack/transport.h index db700ff..0f57a8c 100644 --- a/jack/transport.h +++ b/jack/transport.h @@ -431,7 +431,7 @@ jack_nframes_t jack_get_current_transport_frame (const jack_client_t *client) JA * @return 0 if valid request, EINVAL if position structure rejected. */ int jack_transport_reposition (jack_client_t *client, - jack_position_t *pos) JACK_OPTIONAL_WEAK_EXPORT; + const jack_position_t *pos) JACK_OPTIONAL_WEAK_EXPORT; /** * Start the JACK transport rolling. diff --git a/libjack/midiport.c b/libjack/midiport.c index 3a1d402..cca5fd4 100644 --- a/libjack/midiport.c +++ b/libjack/midiport.c @@ -30,10 +30,10 @@ enum { MIDI_INLINE_MAX = 4 }; /* 4 bytes for default event size */ typedef struct _jack_midi_port_info_private { jack_nframes_t nframes; /**< Number of frames in buffer */ - uint32_t buffer_size; /**< Size of buffer in bytes */ - jack_nframes_t event_count; /**< Number of events stored in this buffer */ + uint32_t buffer_size; /**< Size of buffer in bytes */ + uint32_t event_count; /**< Number of events stored in this buffer */ jack_nframes_t last_write_loc; /**< Used for both writing and mixdown */ - jack_nframes_t events_lost; /**< Number of events lost in this buffer */ + uint32_t events_lost; /**< Number of events lost in this buffer */ } POST_PACKED_STRUCTURE jack_midi_port_info_private_t; typedef struct _jack_midi_port_internal_event { @@ -79,7 +79,7 @@ jack_midi_buffer_init(void *port_buffer, } -jack_nframes_t +uint32_t jack_midi_get_event_count(void *port_buffer) { jack_midi_port_info_private_t *info = @@ -91,7 +91,7 @@ jack_midi_get_event_count(void *port_buffer) int jack_midi_event_get(jack_midi_event_t *event, void *port_buffer, - jack_nframes_t event_idx) + uint32_t event_idx) { jack_midi_port_internal_event_t *port_event; jack_midi_port_info_private_t *info = @@ -314,7 +314,7 @@ jack_midi_port_mixdown(jack_port_t *port, jack_nframes_t nframes) } -jack_nframes_t +uint32_t jack_midi_get_lost_event_count(void *port_buffer) { return ((jack_midi_port_info_private_t *) port_buffer)->events_lost; diff --git a/libjack/transclient.c b/libjack/transclient.c index beda127..c6b0866 100644 --- a/libjack/transclient.c +++ b/libjack/transclient.c @@ -429,7 +429,7 @@ jack_transport_query (const jack_client_t *client, jack_position_t *pos) } int -jack_transport_reposition (jack_client_t *client, jack_position_t *pos) +jack_transport_reposition (jack_client_t *client, const jack_position_t *pos) { /* copy the input, to avoid modifying its contents */ jack_position_t tmp = *pos;