aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-01-07 22:12:09 +0100
committerMax Kellermann <max@duempel.org>2013-01-07 22:14:52 +0100
commitacb45caa4205d6e07c46b14079a7ffe0a2141d3d (patch)
tree9c056cfefccfed391ee033bb4322b49b14451b5e /src
parent39060b528aceee15a19842f2e9c830d4b35af99e (diff)
downloadmpd-acb45caa4205d6e07c46b14079a7ffe0a2141d3d.tar.gz
mpd-acb45caa4205d6e07c46b14079a7ffe0a2141d3d.tar.xz
mpd-acb45caa4205d6e07c46b14079a7ffe0a2141d3d.zip
decoder/ogg_codec: convert to C++
Diffstat (limited to 'src')
-rw-r--r--src/decoder/FLACDecoderPlugin.cxx5
-rw-r--r--src/decoder/OggCodec.cxx (renamed from src/decoder/ogg_codec.c)4
-rw-r--r--src/decoder/OggCodec.hxx (renamed from src/decoder/ogg_codec.h)6
-rw-r--r--src/decoder/OpusDecoderPlugin.cxx6
-rw-r--r--src/decoder/VorbisDecoderPlugin.cxx2
5 files changed, 8 insertions, 15 deletions
diff --git a/src/decoder/FLACDecoderPlugin.cxx b/src/decoder/FLACDecoderPlugin.cxx
index dbe7f207f..43b604097 100644
--- a/src/decoder/FLACDecoderPlugin.cxx
+++ b/src/decoder/FLACDecoderPlugin.cxx
@@ -21,10 +21,7 @@
#include "FLACDecoderPlugin.h"
#include "FLACCommon.hxx"
#include "FLACMetaData.hxx"
-
-extern "C" {
-#include "ogg_codec.h"
-}
+#include "OggCodec.hxx"
#include <glib.h>
diff --git a/src/decoder/ogg_codec.c b/src/decoder/OggCodec.cxx
index 7416f27da..5ad9c69d6 100644
--- a/src/decoder/ogg_codec.c
+++ b/src/decoder/OggCodec.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
@@ -22,7 +22,7 @@
*/
#include "config.h"
-#include "ogg_codec.h"
+#include "OggCodec.hxx"
enum ogg_codec
ogg_codec_detect(struct decoder *decoder, struct input_stream *is)
diff --git a/src/decoder/ogg_codec.h b/src/decoder/OggCodec.hxx
index fd1fecfbb..e241560fb 100644
--- a/src/decoder/ogg_codec.h
+++ b/src/decoder/OggCodec.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
@@ -21,8 +21,8 @@
* Common functions used for Ogg data streams (Ogg-Vorbis and OggFLAC)
*/
-#ifndef MPD_OGG_CODEC_H
-#define MPD_OGG_CODEC_H
+#ifndef MPD_OGG_CODEC_HXX
+#define MPD_OGG_CODEC_HXX
#include "decoder_api.h"
diff --git a/src/decoder/OpusDecoderPlugin.cxx b/src/decoder/OpusDecoderPlugin.cxx
index c87e60a16..c48b2afa5 100644
--- a/src/decoder/OpusDecoderPlugin.cxx
+++ b/src/decoder/OpusDecoderPlugin.cxx
@@ -23,11 +23,7 @@
#include "OpusTags.hxx"
#include "OggUtil.hxx"
#include "decoder_api.h"
-
-extern "C" {
-#include "ogg_codec.h"
-}
-
+#include "OggCodec.hxx"
#include "audio_check.h"
#include "tag_handler.h"
diff --git a/src/decoder/VorbisDecoderPlugin.cxx b/src/decoder/VorbisDecoderPlugin.cxx
index 3a05e74a9..910655361 100644
--- a/src/decoder/VorbisDecoderPlugin.cxx
+++ b/src/decoder/VorbisDecoderPlugin.cxx
@@ -21,9 +21,9 @@
#include "VorbisDecoderPlugin.h"
#include "VorbisComments.hxx"
#include "decoder_api.h"
+#include "OggCodec.hxx"
extern "C" {
-#include "ogg_codec.h"
#include "audio_check.h"
#include "uri.h"
}