Commit f32fbd9e authored by Max Kellermann's avatar Max Kellermann

pcm_pack: convert to C++

parent e3511d0e
...@@ -311,7 +311,7 @@ libpcm_a_SOURCES = \ ...@@ -311,7 +311,7 @@ libpcm_a_SOURCES = \
src/pcm/PcmVolume.cxx src/pcm/PcmVolume.hxx \ src/pcm/PcmVolume.cxx src/pcm/PcmVolume.hxx \
src/pcm/PcmMix.cxx src/pcm/PcmMix.hxx \ src/pcm/PcmMix.cxx src/pcm/PcmMix.hxx \
src/pcm/PcmChannels.cxx src/pcm/PcmChannels.hxx \ src/pcm/PcmChannels.cxx src/pcm/PcmChannels.hxx \
src/pcm/pcm_pack.c src/pcm/pcm_pack.h \ src/pcm/PcmPack.cxx src/pcm/PcmPack.hxx \
src/pcm/PcmFormat.cxx src/pcm/PcmFormat.hxx \ src/pcm/PcmFormat.cxx src/pcm/PcmFormat.hxx \
src/pcm/PcmResample.cxx src/pcm/PcmResample.hxx \ src/pcm/PcmResample.cxx src/pcm/PcmResample.hxx \
src/pcm/PcmResampleFallback.cxx \ src/pcm/PcmResampleFallback.cxx \
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include "PcmConvert.hxx" #include "PcmConvert.hxx"
#include "PcmChannels.hxx" #include "PcmChannels.hxx"
#include "PcmFormat.hxx" #include "PcmFormat.hxx"
#include "pcm_pack.h"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
......
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
#include "config.h" #include "config.h"
#include "PcmExport.hxx" #include "PcmExport.hxx"
#include "PcmDsdUsb.hxx" #include "PcmDsdUsb.hxx"
#include "PcmPack.hxx"
extern "C" { extern "C" {
#include "pcm_pack.h"
#include "util/byte_reverse.h" #include "util/byte_reverse.h"
} }
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include "PcmFormat.hxx" #include "PcmFormat.hxx"
#include "PcmDither.hxx" #include "PcmDither.hxx"
#include "PcmBuffer.hxx" #include "PcmBuffer.hxx"
#include "pcm_pack.h"
#include "PcmUtils.hxx" #include "PcmUtils.hxx"
#include <type_traits> #include <type_traits>
......
/* /*
* Copyright (C) 2003-2011 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "pcm_pack.h" #include "PcmPack.hxx"
#include <glib.h> #include <glib.h>
......
/* /*
* Copyright (C) 2003-2011 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -22,10 +22,9 @@ ...@@ -22,10 +22,9 @@
* Library for working with packed 24 bit samples. * Library for working with packed 24 bit samples.
*/ */
#ifndef PCM_PACK_H #ifndef PCM_PACK_HXX
#define PCM_PACK_H #define PCM_PACK_HXX
#include <stdbool.h>
#include <stdint.h> #include <stdint.h>
/** /**
......
...@@ -19,10 +19,7 @@ ...@@ -19,10 +19,7 @@
#include "test_pcm_all.hxx" #include "test_pcm_all.hxx"
#include "test_pcm_util.hxx" #include "test_pcm_util.hxx"
#include "pcm/PcmPack.hxx"
extern "C" {
#include "pcm/pcm_pack.h"
}
#include <glib.h> #include <glib.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment