summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortorben <torben@0c269be4-1314-0410-8aa9-9f06e86f4224>2010-01-28 15:34:45 +0000
committertorben <torben@0c269be4-1314-0410-8aa9-9f06e86f4224>2010-01-28 15:34:45 +0000
commit439e1fca82b8f9a622b6293d12f0ddcf8f549ba9 (patch)
treed58db81b1f40aa5c673f4be39777f848f2a42f72
parentaa9bd705367840a206aeaf8321b7e5a4a2093210 (diff)
downloadjack1-439e1fca82b8f9a622b6293d12f0ddcf8f549ba9.tar.gz
take care of buffer_scale_factor < 0 in jack_port_get_buffer()
git-svn-id: svn+ssh://jackaudio.org/trunk/jack@3887 0c269be4-1314-0410-8aa9-9f06e86f4224
-rw-r--r--libjack/port.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libjack/port.c b/libjack/port.c
index bb92b7c..7865c91 100644
--- a/libjack/port.c
+++ b/libjack/port.c
@@ -559,10 +559,15 @@ jack_port_get_buffer (jack_port_t *port, jack_nframes_t nframes)
connection process.
*/
if (port->mix_buffer == NULL) {
- size_t buffer_size =
+ size_t buffer_size;
+ if( port->type_info->buffer_scale_factor < 0 ) {
+ buffer_size = port->type_info->buffer_size;
+ } else {
+ buffer_size =
port->type_info->buffer_scale_factor
* sizeof (jack_default_audio_sample_t)
* nframes;
+ }
port->mix_buffer = jack_pool_alloc (buffer_size);
port->fptr.buffer_init (port->mix_buffer, buffer_size, nframes);
}