Changeset 112 for fm_server/trunk/src/fm_output_alsa.c

Timestamp:

09/04/06 20:29:59 (6 years ago)

Author:

ath

Message:

Use some decent float-integer converstion routines, and make FmPipeline more useful.

Files:

• fm_server/trunk/src/fm_output_alsa.c (modified) (3 diffs)

fm_server/trunk/src/fm_output_alsa.c

@@ -7 +7 @@
 #include <alsa/asoundlib.h>
 
+#include "src_type_conv.h"
 #include "fm_buffer.h"
 #include "fm_element.h"
@@ -14 +15 @@
 
 #define ALSA_DEFAULT_DEVICE "default"
+#define ALSA_DEFAULT_SAMPLE_RATE 44100
 #define ALSA_DEFAULT_BUFFER_TIME 22000
 #define ALSA_DEFAULT_PERIOD_TIME 10000
@@ -407 +409 @@
                 fm_element_get_buffer_from_src(element, output_alsa->main_buffer);
         
-                guint i;
-                gint16 *ptr = output_alsa->buffer_int;
-                for (i = 0; i < output_alsa->buffer_size_samples; i++) {
-                        *(ptr++) = FLOAT_TO_INT (output_alsa->main_buffer->channel_data[0][i]);
-                        *(ptr++) = FLOAT_TO_INT (output_alsa->main_buffer->channel_data[1][i]);
-                }
-        
+                src_float_to_short_array_stereo (output_alsa->main_buffer->channel_data[0],
+                                                 output_alsa->main_buffer->channel_data[1],
+                                                 output_alsa->buffer_int, output_alsa->buffer_size_samples);
+
                 gint err = 0;