Index: /branches/libfreebob-2.0/src/libstreaming/MotuStreamProcessor.cpp
===================================================================
--- /branches/libfreebob-2.0/src/libstreaming/MotuStreamProcessor.cpp (revision 284)
+++ /branches/libfreebob-2.0/src/libstreaming/MotuStreamProcessor.cpp (revision 285)
@@ -665,4 +665,5 @@
                        unsigned int offset, unsigned int nevents) {
 	unsigned int j=0;
+#if 0
 	unsigned char *target = (unsigned char *)data + p->getPosition();
 
@@ -689,4 +690,61 @@
 		break;
 	}
+
+#endif
+
+	// Use char here since the target address won't necessarily be 
+	// aligned; use of an unaligned quadlet_t may cause issues on certain
+	// architectures.
+	unsigned char *target;
+	target = (unsigned char *)data + p->getPosition();
+
+	switch(p->getDataType()) {
+		default:
+		case Port::E_Int24:
+			{
+				quadlet_t *buffer=(quadlet_t *)(p->getBufferAddress());
+
+				assert(nevents + offset <= p->getBufferSize());
+
+				// Offset is in frames, but each port is only a single
+				// channel, so the number of frames is the same as the
+				// number of quadlets to offset (assuming the port buffer
+				// uses one quadlet per sample, which is the case currently).
+				buffer+=offset;
+
+				for(j = 0; j < nevents; j += 1) { // Decode nsamples
+					*target = (*buffer >> 16) & 0xff;
+					*(target+1) = (*buffer >> 8) & 0xff;
+					*(target+2) = (*buffer) & 0xff;
+
+					buffer++;
+					target+=m_event_size;
+				}
+			}
+			break;
+		case Port::E_Float:
+			{
+				const float multiplier = (float)(0x7FFFFF);
+				float *buffer=(float *)(p->getBufferAddress());
+
+				assert(nevents + offset <= p->getBufferSize());
+
+				buffer+=offset;
+
+				for(j = 0; j < nevents; j += 1) { // decode max nsamples		
+					unsigned int v = *buffer * multiplier;
+					*target = (v >> 16) & 0xff;
+					*(target+1) = (v >> 8) & 0xff;
+					*(target+2) = v & 0xff;
+
+					buffer++;
+					target+=m_event_size;
+				}
+			}
+			break;
+	}
+
+	return 0;
+
 
 
Index: /branches/libfreebob-2.0/tests/streaming/teststreaming2.c
===================================================================
--- /branches/libfreebob-2.0/tests/streaming/teststreaming2.c (revision 274)
+++ /branches/libfreebob-2.0/tests/streaming/teststreaming2.c (revision 285)
@@ -110,21 +110,24 @@
 	
 	nullbuffer=calloc(PERIOD_SIZE+1,sizeof(freebob_sample_t));
-	
-// 	for (i=0;i<nb_out_channels;i++) {
-// 		switch (freebob_streaming_get_capture_stream_type(dev,i)) {
-// 			case freebob_stream_type_audio:
-// 				if (i<nb_in_channels) {
-// 					/* assign the audiobuffer to the stream */
-// 					freebob_streaming_set_playback_stream_buffer(dev, i, (char *)audiobuffer[i], freebob_buffer_type_uint24);
-// 				} else {
-// 					freebob_streaming_set_playback_stream_buffer(dev, i, (char *)nullbuffer, freebob_buffer_type_uint24);	
-// 				}
-// 				break;
-// 				// this is done with read/write routines because the nb of bytes can differ.
-// 			case freebob_stream_type_midi:
-// 			default:
-// 				break;
-// 		}
-// 	}
+
+#if 1
+ 	for (i=0;i<nb_out_channels;i++) {
+ 		switch (freebob_streaming_get_capture_stream_type(dev,i)) {
+ 			case freebob_stream_type_audio:
+ 				if (i<nb_in_channels) {
+ 					/* assign the audiobuffer to the stream */
+ 					freebob_streaming_set_playback_stream_buffer(dev, i, (char *)audiobuffer[i]);
+ 				} else {
+ 					freebob_streaming_set_playback_stream_buffer(dev, i, (char *)nullbuffer);
+ 				}
+				freebob_streaming_set_playback_buffer_type(dev, i, freebob_buffer_type_int24);
+ 				break;
+ 				// this is done with read/write routines because the nb of bytes can differ.
+ 			case freebob_stream_type_midi:
+ 			default:
+ 				break;
+ 		}
+ 	}
+#endif
 	
 	/* open the files to write to*/