Merged MIDI branch into the trunk.

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@1035 0c269be4-1314-0410-8aa9-9f06e86f4224

2 files changed, 8 insertions, 21 deletions

diff --git a/jack/midiport.h b/jack/midiport.h
index 3ff415e..da574f8 100644
--- a/jack/midiport.h
+++ b/jack/midiport.h
@@ -45,12 +45,10 @@ typedef struct _jack_midi_event
 /* Get number of events in a port buffer.
  *
  * @param port_buffer Port buffer from which to retrieve event.
- * @param nframes Number of valid frames this cycle.
  * @return number of events inside @a port_buffer
  */
 jack_nframes_t
-jack_midi_get_event_count(void*          port_buffer,
-                        jack_nframes_t nframes);
+jack_midi_get_event_count(void*          port_buffer);
 
 
 /** Get a MIDI event from an event port buffer.
@@ -62,14 +60,12 @@ jack_midi_get_event_count(void*          port_buffer,
  * @param event Event structure to store retrieved event in.
  * @param port_buffer Port buffer from which to retrieve event.
  * @param event_index Index of event to retrieve.
- * @param nframes Number of valid frames this cycle.
  * @return 0 on success, ENODATA if buffer is empty.
  */
 int
 jack_midi_event_get(jack_midi_event_t *event,
                     void              *port_buffer,
-                    jack_nframes_t     event_index,
-                    jack_nframes_t     nframes);
+                    jack_nframes_t     event_index);
 
 
 /** Clear an event buffer.
@@ -79,11 +75,9 @@ jack_midi_event_get(jack_midi_event_t *event,
  * function may not be called on an input port's buffer.
  *
  * @param port_buffer Port buffer to clear (must be an output port buffer).
- * @param nframes Number of valid frames this cycle.
  */
 void
-jack_midi_clear_buffer(void           *port_buffer,
-                       jack_nframes_t  nframes);
+jack_midi_clear_buffer(void           *port_buffer);
 
 
 /** Get the size of the largest event that can be stored by the port.
@@ -92,10 +86,9 @@ jack_midi_clear_buffer(void           *port_buffer,
  * events already stored in the port.
  *
  * @param port_buffer Port buffer to check size of.
- * @param nframes Number of valid frames this cycle.
  */
 size_t
-jack_midi_max_event_size(void* port_buffer, jack_nframes_t nframes);
+jack_midi_max_event_size(void* port_buffer);
 
 
 /** Allocate space for an event to be written to an event port buffer.
@@ -110,15 +103,13 @@ jack_midi_max_event_size(void* port_buffer, jack_nframes_t nframes);
  * @param port_buffer Buffer to write event to.
  * @param time Sample offset of event.
  * @param data_size Length of event's raw data in bytes.
- * @param nframes Number of valid frames this event.
  * @return Pointer to the beginning of the reserved event's data buffer, or
  * NULL on error (ie not enough space).
  */
 jack_midi_data_t*
 jack_midi_event_reserve(void           *port_buffer,
                         jack_nframes_t  time, 
-                        size_t          data_size,
-                        jack_nframes_t  nframes);
+                        size_t          data_size);
 
 
 /** Write an event into an event port buffer.
@@ -131,15 +122,13 @@ jack_midi_event_reserve(void           *port_buffer,
  * @param time Sample offset of event.
  * @param data Message data to be written.
  * @param data_size Length of @a data in bytes.
- * @param nframes Number of valid frames this event.
  * @return 0 on success, ENOBUFS if there's not enough space in buffer for event.
  */
 int
 jack_midi_event_write(void                   *port_buffer,
                       jack_nframes_t          time,
                       const jack_midi_data_t *data,
-                      size_t                  data_size,
-                      jack_nframes_t          nframes);
+                      size_t                  data_size);
 
 
 /** Get the number of events that could not be written to @a port_buffer.
@@ -148,12 +137,10 @@ jack_midi_event_write(void                   *port_buffer,
  * Currently the only way this can happen is if events are lost on port mixdown.
  *
  * @param port_buffer Port to receive count for.
- * @param nframes Number of valid frames this cycle.
  * @returns Number of events that could not be written to @a port_buffer.
  */
 jack_nframes_t
-jack_midi_get_lost_event_count(void           *port_buffer,
-                               jack_nframes_t  nframes);
+jack_midi_get_lost_event_count(void           *port_buffer);
 
 
 #ifdef __cplusplus
diff --git a/jack/port.h b/jack/port.h
index e73d1c1..a8b5b44 100644
--- a/jack/port.h
+++ b/jack/port.h
@@ -120,7 +120,7 @@ typedef struct _jack_port_functions {
      * A better solution is to make jack_engine_place_buffers to be type-specific,
      * but this works.
      */
-    void (*buffer_init)(void *buffer, size_t size);
+    void (*buffer_init)(void *buffer, size_t size, jack_nframes_t);
 
     /* Function to mixdown multiple inputs to a buffer.  Can be NULL,
      * indicating that multiple input connections are not legal for