diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-31 20:33:26 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-31 21:11:06 +0100 |
| commit | 1b175025fecb1c10e6719d4ab79c188d473fccc4 (patch) | |
| tree | a1d04e92416e72c78f474de25c0aeee3374d47a1 /src/PcmChannels.cxx | |
| parent | ccdf7184bea4bcc38ae468095ec400e2a2a4db3b (diff) | |
| download | mpd-1b175025fecb1c10e6719d4ab79c188d473fccc4.tar.gz mpd-1b175025fecb1c10e6719d4ab79c188d473fccc4.tar.xz mpd-1b175025fecb1c10e6719d4ab79c188d473fccc4.zip | |
pcm_*: convert to C++
Diffstat (limited to '')
| -rw-r--r-- | src/PcmChannels.cxx (renamed from src/pcm_channels.c) | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/pcm_channels.c b/src/PcmChannels.cxx index 9d166a437..3b100e46f 100644 --- a/src/pcm_channels.c +++ b/src/PcmChannels.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2011 The Music Player Daemon Project + * Copyright (C) 2003-2013 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -18,9 +18,9 @@ */ #include "config.h" -#include "pcm_channels.h" +#include "PcmChannels.hxx" #include "pcm_buffer.h" -#include "pcm_utils.h" +#include "PcmUtils.hxx" #include <assert.h> @@ -84,7 +84,7 @@ pcm_convert_channels_16(struct pcm_buffer *buffer, size_t dest_size = src_size / src_channels * dest_channels; *dest_size_r = dest_size; - int16_t *dest = pcm_buffer_get(buffer, dest_size); + int16_t *dest = (int16_t *)pcm_buffer_get(buffer, dest_size); const int16_t *src_end = pcm_end_pointer(src, src_size); if (src_channels == 1 && dest_channels == 2) @@ -160,8 +160,9 @@ pcm_convert_channels_24(struct pcm_buffer *buffer, size_t dest_size = src_size / src_channels * dest_channels; *dest_size_r = dest_size; - int32_t *dest = pcm_buffer_get(buffer, dest_size); - const int32_t *src_end = pcm_end_pointer(src, src_size); + int32_t *dest = (int32_t *)pcm_buffer_get(buffer, dest_size); + const int32_t *src_end = (const int32_t *) + pcm_end_pointer(src, src_size); if (src_channels == 1 && dest_channels == 2) pcm_convert_channels_24_1_to_2(dest, src, src_end); @@ -229,8 +230,9 @@ pcm_convert_channels_32(struct pcm_buffer *buffer, size_t dest_size = src_size / src_channels * dest_channels; *dest_size_r = dest_size; - int32_t *dest = pcm_buffer_get(buffer, dest_size); - const int32_t *src_end = pcm_end_pointer(src, src_size); + int32_t *dest = (int32_t *)pcm_buffer_get(buffer, dest_size); + const int32_t *src_end = (const int32_t *) + pcm_end_pointer(src, src_size); if (src_channels == 1 && dest_channels == 2) pcm_convert_channels_32_1_to_2(dest, src, src_end); @@ -300,8 +302,8 @@ pcm_convert_channels_float(struct pcm_buffer *buffer, size_t dest_size = src_size / src_channels * dest_channels; *dest_size_r = dest_size; - float *dest = pcm_buffer_get(buffer, dest_size); - const float *src_end = pcm_end_pointer(src, src_size); + float *dest = (float *)pcm_buffer_get(buffer, dest_size); + const float *src_end = (const float *)pcm_end_pointer(src, src_size); if (src_channels == 1 && dest_channels == 2) pcm_convert_channels_float_1_to_2(dest, src, src_end); |