aboutsummaryrefslogtreecommitdiffstats
path: root/src/pcm
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-10-16 20:54:51 +0200
committerMax Kellermann <max@duempel.org>2013-10-16 22:07:43 +0200
commitf32fbd9ed13bc6017f72928a49c43c6bf73fd615 (patch)
treef30407edb34b083800ac5945c7768aad8db40ddd /src/pcm
parente3511d0ee07ef5a8d0582c85e3ca27fa51d80570 (diff)
downloadmpd-f32fbd9ed13bc6017f72928a49c43c6bf73fd615.tar.gz
mpd-f32fbd9ed13bc6017f72928a49c43c6bf73fd615.tar.xz
mpd-f32fbd9ed13bc6017f72928a49c43c6bf73fd615.zip
pcm_pack: convert to C++
Diffstat (limited to 'src/pcm')
-rw-r--r--src/pcm/PcmConvert.cxx1
-rw-r--r--src/pcm/PcmExport.cxx2
-rw-r--r--src/pcm/PcmFormat.cxx1
-rw-r--r--src/pcm/PcmPack.cxx (renamed from src/pcm/pcm_pack.c)4
-rw-r--r--src/pcm/PcmPack.hxx (renamed from src/pcm/pcm_pack.h)7
5 files changed, 6 insertions, 9 deletions
diff --git a/src/pcm/PcmConvert.cxx b/src/pcm/PcmConvert.cxx
index 95361ee1b..6061aee88 100644
--- a/src/pcm/PcmConvert.cxx
+++ b/src/pcm/PcmConvert.cxx
@@ -21,7 +21,6 @@
#include "PcmConvert.hxx"
#include "PcmChannels.hxx"
#include "PcmFormat.hxx"
-#include "pcm_pack.h"
#include "AudioFormat.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
diff --git a/src/pcm/PcmExport.cxx b/src/pcm/PcmExport.cxx
index 762411f59..389670b6f 100644
--- a/src/pcm/PcmExport.cxx
+++ b/src/pcm/PcmExport.cxx
@@ -20,9 +20,9 @@
#include "config.h"
#include "PcmExport.hxx"
#include "PcmDsdUsb.hxx"
+#include "PcmPack.hxx"
extern "C" {
-#include "pcm_pack.h"
#include "util/byte_reverse.h"
}
diff --git a/src/pcm/PcmFormat.cxx b/src/pcm/PcmFormat.cxx
index b4307ca1f..a0de163ba 100644
--- a/src/pcm/PcmFormat.cxx
+++ b/src/pcm/PcmFormat.cxx
@@ -21,7 +21,6 @@
#include "PcmFormat.hxx"
#include "PcmDither.hxx"
#include "PcmBuffer.hxx"
-#include "pcm_pack.h"
#include "PcmUtils.hxx"
#include <type_traits>
diff --git a/src/pcm/pcm_pack.c b/src/pcm/PcmPack.cxx
index 921d880c0..fa020bf63 100644
--- a/src/pcm/pcm_pack.c
+++ b/src/pcm/PcmPack.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
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "pcm_pack.h"
+#include "PcmPack.hxx"
#include <glib.h>
diff --git a/src/pcm/pcm_pack.h b/src/pcm/PcmPack.hxx
index f3184b403..aed011767 100644
--- a/src/pcm/pcm_pack.h
+++ b/src/pcm/PcmPack.hxx
@@ -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
@@ -22,10 +22,9 @@
* Library for working with packed 24 bit samples.
*/
-#ifndef PCM_PACK_H
-#define PCM_PACK_H
+#ifndef PCM_PACK_HXX
+#define PCM_PACK_HXX
-#include <stdbool.h>
#include <stdint.h>
/**