diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | src/decoder/PcmDecoderPlugin.cxx | 5 | ||||
| -rw-r--r-- | src/pcm/PcmExport.cxx | 5 | ||||
| -rw-r--r-- | src/util/ByteReverse.cxx (renamed from src/util/byte_reverse.c) | 24 | ||||
| -rw-r--r-- | src/util/ByteReverse.hxx (renamed from src/util/byte_reverse.h) | 6 | ||||
| -rw-r--r-- | test/test_byte_reverse.cxx (renamed from test/test_byte_reverse.c) | 4 |
6 files changed, 21 insertions, 27 deletions
diff --git a/Makefile.am b/Makefile.am index fe24dd2cd..7490c5633 100644 --- a/Makefile.am +++ b/Makefile.am @@ -266,7 +266,7 @@ libutil_a_SOURCES = \ src/util/PeakBuffer.cxx src/util/PeakBuffer.hxx \ src/util/list.h \ src/util/list_sort.c src/util/list_sort.h \ - src/util/byte_reverse.c src/util/byte_reverse.h \ + src/util/ByteReverse.cxx src/util/ByteReverse.hxx \ src/util/bit_reverse.c src/util/bit_reverse.h # System library @@ -1408,7 +1408,7 @@ test_run_inotify_LDADD = \ endif test_test_byte_reverse_SOURCES = \ - test/test_byte_reverse.c + test/test_byte_reverse.cxx test_test_byte_reverse_LDADD = \ libutil.a \ $(GLIB_LIBS) diff --git a/src/decoder/PcmDecoderPlugin.cxx b/src/decoder/PcmDecoderPlugin.cxx index 6996b583a..61062f7f9 100644 --- a/src/decoder/PcmDecoderPlugin.cxx +++ b/src/decoder/PcmDecoderPlugin.cxx @@ -22,12 +22,9 @@ #include "DecoderAPI.hxx" #include "InputStream.hxx" #include "util/Error.hxx" +#include "util/ByteReverse.hxx" #include "Log.hxx" -extern "C" { -#include "util/byte_reverse.h" -} - #include <glib.h> #include <unistd.h> #include <string.h> diff --git a/src/pcm/PcmExport.cxx b/src/pcm/PcmExport.cxx index 389670b6f..74b642569 100644 --- a/src/pcm/PcmExport.cxx +++ b/src/pcm/PcmExport.cxx @@ -21,10 +21,7 @@ #include "PcmExport.hxx" #include "PcmDsdUsb.hxx" #include "PcmPack.hxx" - -extern "C" { -#include "util/byte_reverse.h" -} +#include "util/ByteReverse.hxx" void PcmExport::Open(SampleFormat sample_format, unsigned _channels, diff --git a/src/util/byte_reverse.c b/src/util/ByteReverse.cxx index e96af14b9..e5367b34c 100644 --- a/src/util/byte_reverse.c +++ b/src/util/ByteReverse.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2012 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 @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "byte_reverse.h" +#include "ByteReverse.hxx" #include <glib.h> #include <assert.h> @@ -25,8 +25,8 @@ void reverse_bytes_16(uint16_t *dest, const uint16_t *src, const uint16_t *src_end) { - assert(dest != NULL); - assert(src != NULL); + assert(dest != nullptr); + assert(src != nullptr); assert(src_end >= src); while (src < src_end) { @@ -38,8 +38,8 @@ reverse_bytes_16(uint16_t *dest, const uint16_t *src, const uint16_t *src_end) void reverse_bytes_32(uint32_t *dest, const uint32_t *src, const uint32_t *src_end) { - assert(dest != NULL); - assert(src != NULL); + assert(dest != nullptr); + assert(src != nullptr); assert(src_end >= src); while (src < src_end) { @@ -51,8 +51,8 @@ reverse_bytes_32(uint32_t *dest, const uint32_t *src, const uint32_t *src_end) void reverse_bytes_64(uint64_t *dest, const uint64_t *src, const uint64_t *src_end) { - assert(dest != NULL); - assert(src != NULL); + assert(dest != nullptr); + assert(src != nullptr); assert(src_end >= src); while (src < src_end) { @@ -75,8 +75,8 @@ reverse_bytes_generic(uint8_t *dest, const uint8_t *src, const uint8_t *src_end, size_t frame_size) { - assert(dest != NULL); - assert(src != NULL); + assert(dest != nullptr); + assert(src != nullptr); assert(src_end >= src); assert(frame_size > 0); assert((src_end - src) % frame_size == 0); @@ -92,8 +92,8 @@ void reverse_bytes(uint8_t *dest, const uint8_t *src, const uint8_t *src_end, size_t frame_size) { - assert(dest != NULL); - assert(src != NULL); + assert(dest != nullptr); + assert(src != nullptr); assert(src_end >= src); assert(frame_size > 0); assert((src_end - src) % frame_size == 0); diff --git a/src/util/byte_reverse.h b/src/util/ByteReverse.hxx index 63213d6c2..d6380213a 100644 --- a/src/util/byte_reverse.h +++ b/src/util/ByteReverse.hxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2012 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 @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MPD_BYTE_REVERSE_H -#define MPD_BYTE_REVERSE_H +#ifndef MPD_BYTE_REVERSE_HXX +#define MPD_BYTE_REVERSE_HXX #include <stdint.h> #include <stddef.h> diff --git a/test/test_byte_reverse.c b/test/test_byte_reverse.cxx index 1ab787772..67e394454 100644 --- a/test/test_byte_reverse.c +++ b/test/test_byte_reverse.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2012 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 @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "util/byte_reverse.h" +#include "util/ByteReverse.hxx" #include "util/Macros.hxx" #include <glib.h> |