Fix calloc() parameter ordering

[mlt] / src / modules / rtaudio / RtAudio.cpp

diff --git a/src/modules/rtaudio/RtAudio.cpp b/src/modules/rtaudio/RtAudio.cpp
index 2bdd89b9884bbc22d590d35fea9ab9e3f3eb17f2..249fa2567fb7a28ca9aae48871115d4485e14f27 100644 (file)
--- a/src/modules/rtaudio/RtAudio.cpp
+++ b/src/modules/rtaudio/RtAudio.cpp
@@ -1193,7 +1193,7 @@ bool RtApiCore :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
   // Allocate necessary internal buffers.\r
   unsigned long bufferBytes;\r
   bufferBytes = stream_.nUserChannels[mode] * *bufferSize * formatBytes( stream_.userFormat );\r
-  //  stream_.userBuffer[mode] = (char *) calloc( bufferBytes, 1 );\r
+  //  stream_.userBuffer[mode] = (char *) calloc( 1, bufferBytes );\r
   stream_.userBuffer[mode] = (char *) malloc( bufferBytes * sizeof(char) );\r
   memset( stream_.userBuffer[mode], 0, bufferBytes * sizeof(char) );\r
   if ( stream_.userBuffer[mode] == NULL ) {\r
@@ -1218,7 +1218,7 @@ bool RtApiCore :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
     if ( makeBuffer ) {\r
       bufferBytes *= *bufferSize;\r
       if ( stream_.deviceBuffer ) free( stream_.deviceBuffer );\r
-      stream_.deviceBuffer = (char *) calloc( bufferBytes, 1 );\r
+      stream_.deviceBuffer = (char *) calloc( 1, bufferBytes );\r
       if ( stream_.deviceBuffer == NULL ) {\r
         errorText_ = "RtApiCore::probeDeviceOpen: error allocating device buffer memory.";\r
         goto error;\r
@@ -2124,7 +2124,7 @@ bool RtApiJack :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
   // Allocate necessary internal buffers.\r
   unsigned long bufferBytes;\r
   bufferBytes = stream_.nUserChannels[mode] * *bufferSize * formatBytes( stream_.userFormat );\r
-  stream_.userBuffer[mode] = (char *) calloc( bufferBytes, 1 );\r
+  stream_.userBuffer[mode] = (char *) calloc( 1, bufferBytes );\r
   if ( stream_.userBuffer[mode] == NULL ) {\r
     errorText_ = "RtApiJack::probeDeviceOpen: error allocating user buffer memory.";\r
     goto error;\r
@@ -2146,7 +2146,7 @@ bool RtApiJack :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
     if ( makeBuffer ) {\r
       bufferBytes *= *bufferSize;\r
       if ( stream_.deviceBuffer ) free( stream_.deviceBuffer );\r
-      stream_.deviceBuffer = (char *) calloc( bufferBytes, 1 );\r
+      stream_.deviceBuffer = (char *) calloc( 1, bufferBytes );\r
       if ( stream_.deviceBuffer == NULL ) {\r
         errorText_ = "RtApiJack::probeDeviceOpen: error allocating device buffer memory.";\r
         goto error;\r
@@ -2999,7 +2999,7 @@ bool RtApiAsio :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
   // Allocate necessary internal buffers\r
   unsigned long bufferBytes;\r
   bufferBytes = stream_.nUserChannels[mode] * *bufferSize * formatBytes( stream_.userFormat );\r
-  stream_.userBuffer[mode] = (char *) calloc( bufferBytes, 1 );\r
+  stream_.userBuffer[mode] = (char *) calloc( 1, bufferBytes );\r
   if ( stream_.userBuffer[mode] == NULL ) {\r
     errorText_ = "RtApiAsio::probeDeviceOpen: error allocating user buffer memory.";\r
     goto error;\r
@@ -3019,7 +3019,7 @@ bool RtApiAsio :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
     if ( makeBuffer ) {\r
       bufferBytes *= *bufferSize;\r
       if ( stream_.deviceBuffer ) free( stream_.deviceBuffer );\r
-      stream_.deviceBuffer = (char *) calloc( bufferBytes, 1 );\r
+      stream_.deviceBuffer = (char *) calloc( 1, bufferBytes );\r
       if ( stream_.deviceBuffer == NULL ) {\r
         errorText_ = "RtApiAsio::probeDeviceOpen: error allocating device buffer memory.";\r
         goto error;\r
@@ -4216,7 +4216,7 @@ bool RtApiDs :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
 \r
   // Allocate necessary internal buffers\r
   long bufferBytes = stream_.nUserChannels[mode] * *bufferSize * formatBytes( stream_.userFormat );\r
-  stream_.userBuffer[mode] = (char *) calloc( bufferBytes, 1 );\r
+  stream_.userBuffer[mode] = (char *) calloc( 1, bufferBytes );\r
   if ( stream_.userBuffer[mode] == NULL ) {\r
     errorText_ = "RtApiDs::probeDeviceOpen: error allocating user buffer memory.";\r
     goto error;\r
@@ -4236,7 +4236,7 @@ bool RtApiDs :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
     if ( makeBuffer ) {\r
       bufferBytes *= *bufferSize;\r
       if ( stream_.deviceBuffer ) free( stream_.deviceBuffer );\r
-      stream_.deviceBuffer = (char *) calloc( bufferBytes, 1 );\r
+      stream_.deviceBuffer = (char *) calloc( 1, bufferBytes );\r
       if ( stream_.deviceBuffer == NULL ) {\r
         errorText_ = "RtApiDs::probeDeviceOpen: error allocating device buffer memory.";\r
         goto error;\r
@@ -5848,7 +5848,7 @@ bool RtApiAlsa :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
   // Allocate necessary internal buffers.\r
   unsigned long bufferBytes;\r
   bufferBytes = stream_.nUserChannels[mode] * *bufferSize * formatBytes( stream_.userFormat );\r
-  stream_.userBuffer[mode] = (char *) calloc( bufferBytes, 1 );\r
+  stream_.userBuffer[mode] = (char *) calloc( 1, bufferBytes );\r
   if ( stream_.userBuffer[mode] == NULL ) {\r
     errorText_ = "RtApiAlsa::probeDeviceOpen: error allocating user buffer memory.";\r
     goto error;\r
@@ -5868,7 +5868,7 @@ bool RtApiAlsa :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
     if ( makeBuffer ) {\r
       bufferBytes *= *bufferSize;\r
       if ( stream_.deviceBuffer ) free( stream_.deviceBuffer );\r
-      stream_.deviceBuffer = (char *) calloc( bufferBytes, 1 );\r
+      stream_.deviceBuffer = (char *) calloc( 1, bufferBytes );\r
       if ( stream_.deviceBuffer == NULL ) {\r
         errorText_ = "RtApiAlsa::probeDeviceOpen: error allocating device buffer memory.";\r
         goto error;\r
@@ -6858,7 +6858,7 @@ bool RtApiOss :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
   // Allocate necessary internal buffers.\r
   unsigned long bufferBytes;\r
   bufferBytes = stream_.nUserChannels[mode] * *bufferSize * formatBytes( stream_.userFormat );\r
-  stream_.userBuffer[mode] = (char *) calloc( bufferBytes, 1 );\r
+  stream_.userBuffer[mode] = (char *) calloc( 1, bufferBytes );\r
   if ( stream_.userBuffer[mode] == NULL ) {\r
     errorText_ = "RtApiOss::probeDeviceOpen: error allocating user buffer memory.";\r
     goto error;\r
@@ -6878,7 +6878,7 @@ bool RtApiOss :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
     if ( makeBuffer ) {\r
       bufferBytes *= *bufferSize;\r
       if ( stream_.deviceBuffer ) free( stream_.deviceBuffer );\r
-      stream_.deviceBuffer = (char *) calloc( bufferBytes, 1 );\r
+      stream_.deviceBuffer = (char *) calloc( 1, bufferBytes );\r
       if ( stream_.deviceBuffer == NULL ) {\r
         errorText_ = "RtApiOss::probeDeviceOpen: error allocating device buffer memory.";\r
         goto error;\r