Fix CopyAndConvertIn for Solaris backends.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3627 0c269be4-1314-0410-8aa9-9f06e86f4224

ChangeLog

@@ -25,11 +25,15 @@ Paul Davis
   Jackdmp changes log
 ---------------------------
 
+2009-07-28 Stephane Letz  <letz@grame.fr>
+
+	* Fix CopyAndConvertIn for Solaris backends.
+
 2009-07-22 Stephane Letz  <letz@grame.fr>
 
 	* Version 1.9.4 started.
-        * Solaris boomer backend now working in capture or playback only mode.
-        * Fix control.h for proper compilation on Solaris.
+    * Solaris boomer backend now working in capture or playback only mode.
+    * Fix control.h for proper compilation on Solaris.
 
 2009-07-17 Stephane Letz  <letz@grame.fr>
 

solaris/oss/JackBoomerDriver.cpp

@@ -79,13 +79,13 @@ static inline void CopyAndConvertIn(jack_sample_t *dst, void *src, size_t nframe
 			break;
         }
 		case 24: {
-			signed short *s32src = (signed short*)src;
+			signed int *s32src = (signed int*)src;
             s32src += channel;
             sample_move_dS_s24(dst, (char*)s32src, nframes, chcount<<2);
 			break;
         }
 		case 32: {
-			signed short *s32src = (signed short*)src;
+			signed int *s32src = (signed int*)src;
             s32src += channel;
             sample_move_dS_s32u24(dst, (char*)s32src, nframes, chcount<<2);
 			break;

solaris/oss/JackOSSAdapter.cpp

@@ -44,13 +44,13 @@ static inline void CopyAndConvertIn(jack_sample_t *dst, void *src, size_t nframe
 			break;
         }
 		case 24: {
-			signed short *s32src = (signed short*)src;
+			signed int *s32src = (signed int*)src;
             s32src += channel;
             sample_move_dS_s24(dst, (char*)s32src, nframes, chcount<<2);
 			break;
         }
 		case 32: {
-			signed short *s32src = (signed short*)src;
+			signed int *s32src = (signed int*)src;
             s32src += channel;
             sample_move_dS_s32u24(dst, (char*)s32src, nframes, chcount<<2);
 			break;

solaris/oss/JackOSSDriver.cpp

@@ -78,13 +78,13 @@ static inline void CopyAndConvertIn(jack_sample_t *dst, void *src, size_t nframe
 			break;
         }
 		case 24: {
-			signed short *s32src = (signed short*)src;
+			signed int *s32src = (signed int*)src;
             s32src += channel;
             sample_move_dS_s24(dst, (char*)s32src, nframes, chcount<<2);
 			break;
         }
 		case 32: {
-			signed short *s32src = (signed short*)src;
+			signed int *s32src = (signed int*)src;
             s32src += channel;
             sample_move_dS_s32u24(dst, (char*)s32src, nframes, chcount<<2);
 			break;