pcm_utils: moved code to pcm_mix.c

Moved the software mixing code (used by crossfading) to a separate
library.

1 files changed, 0 insertions, 89 deletions

diff --git a/src/pcm_utils.c b/src/pcm_utils.c
index d619c9dd7..fd2786e3a 100644
--- a/src/pcm_utils.c
+++ b/src/pcm_utils.c
@@ -18,8 +18,6 @@
 
 #include "pcm_utils.h"
 #include "pcm_channels.h"
-#include "pcm_prng.h"
-#include "pcm_volume.h"
 #include "conf.h"
 #include "audio_format.h"
 
@@ -31,93 +29,6 @@
 #undef G_LOG_DOMAIN
 #define G_LOG_DOMAIN "pcm"
 
-static void
-pcm_add_8(int8_t *buffer1, const int8_t *buffer2,
-	  unsigned num_samples, int volume1, int volume2)
-{
-	while (num_samples > 0) {
-		int32_t sample1 = *buffer1;
-		int32_t sample2 = *buffer2++;
-
-		sample1 = ((sample1 * volume1 + sample2 * volume2) +
-			   pcm_dither() + PCM_VOLUME_1 / 2) / PCM_VOLUME_1;
-
-		*buffer1++ = pcm_range(sample1, 8);
-		--num_samples;
-	}
-}
-
-static void
-pcm_add_16(int16_t *buffer1, const int16_t *buffer2,
-	   unsigned num_samples, int volume1, int volume2)
-{
-	while (num_samples > 0) {
-		int32_t sample1 = *buffer1;
-		int32_t sample2 = *buffer2++;
-
-		sample1 = ((sample1 * volume1 + sample2 * volume2) +
-			   pcm_dither() + PCM_VOLUME_1 / 2) / PCM_VOLUME_1;
-
-		*buffer1++ = pcm_range(sample1, 16);
-		--num_samples;
-	}
-}
-
-static void
-pcm_add_24(int32_t *buffer1, const int32_t *buffer2,
-	   unsigned num_samples, unsigned volume1, unsigned volume2)
-{
-	while (num_samples > 0) {
-		int64_t sample1 = *buffer1;
-		int64_t sample2 = *buffer2++;
-
-		sample1 = ((sample1 * volume1 + sample2 * volume2) +
-			   pcm_dither() + PCM_VOLUME_1 / 2) / PCM_VOLUME_1;
-
-		*buffer1++ = pcm_range(sample1, 24);
-		--num_samples;
-	}
-}
-
-static void pcm_add(char *buffer1, const char *buffer2, size_t size,
-                    int vol1, int vol2,
-                    const struct audio_format *format)
-{
-	switch (format->bits) {
-	case 8:
-		pcm_add_8((int8_t *)buffer1, (const int8_t *)buffer2,
-			  size, vol1, vol2);
-		break;
-
-	case 16:
-		pcm_add_16((int16_t *)buffer1, (const int16_t *)buffer2,
-			   size / 2, vol1, vol2);
-		break;
-
-	case 24:
-		pcm_add_24((int32_t*)buffer1,
-			   (const int32_t*)buffer2,
-			   size / 4, vol1, vol2);
-		break;
-
-	default:
-		g_error("%u bits not supported by pcm_add!\n", format->bits);
-	}
-}
-
-void pcm_mix(char *buffer1, const char *buffer2, size_t size,
-             const struct audio_format *format, float portion1)
-{
-	int vol1;
-	float s = sin(M_PI_2 * portion1);
-	s *= s;
-
-	vol1 = s * PCM_VOLUME_1 + 0.5;
-	vol1 = vol1 > PCM_VOLUME_1 ? PCM_VOLUME_1 : (vol1 < 0 ? 0 : vol1);
-
-	pcm_add(buffer1, buffer2, size, vol1, PCM_VOLUME_1 - vol1, format);
-}
-
 void pcm_convert_init(struct pcm_convert_state *state)
 {
 	memset(state, 0, sizeof(*state));