Commit acb45caa authored by Max Kellermann's avatar Max Kellermann

decoder/ogg_codec: convert to C++

parent 39060b52
...@@ -561,7 +561,7 @@ endif ...@@ -561,7 +561,7 @@ endif
if HAVE_XIPH if HAVE_XIPH
libdecoder_plugins_a_SOURCES += \ libdecoder_plugins_a_SOURCES += \
src/decoder/XiphTags.c src/decoder/XiphTags.h \ src/decoder/XiphTags.c src/decoder/XiphTags.h \
src/decoder/ogg_codec.c src/decoder/ogg_codec.h src/decoder/OggCodec.cxx src/decoder/OggCodec.hxx
endif endif
if ENABLE_VORBIS_DECODER if ENABLE_VORBIS_DECODER
......
...@@ -21,10 +21,7 @@ ...@@ -21,10 +21,7 @@
#include "FLACDecoderPlugin.h" #include "FLACDecoderPlugin.h"
#include "FLACCommon.hxx" #include "FLACCommon.hxx"
#include "FLACMetaData.hxx" #include "FLACMetaData.hxx"
#include "OggCodec.hxx"
extern "C" {
#include "ogg_codec.h"
}
#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,7 +22,7 @@ ...@@ -22,7 +22,7 @@
*/ */
#include "config.h" #include "config.h"
#include "ogg_codec.h" #include "OggCodec.hxx"
enum ogg_codec enum ogg_codec
ogg_codec_detect(struct decoder *decoder, struct input_stream *is) ogg_codec_detect(struct decoder *decoder, struct input_stream *is)
......
/* /*
* 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
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
* Common functions used for Ogg data streams (Ogg-Vorbis and OggFLAC) * Common functions used for Ogg data streams (Ogg-Vorbis and OggFLAC)
*/ */
#ifndef MPD_OGG_CODEC_H #ifndef MPD_OGG_CODEC_HXX
#define MPD_OGG_CODEC_H #define MPD_OGG_CODEC_HXX
#include "decoder_api.h" #include "decoder_api.h"
......
...@@ -23,11 +23,7 @@ ...@@ -23,11 +23,7 @@
#include "OpusTags.hxx" #include "OpusTags.hxx"
#include "OggUtil.hxx" #include "OggUtil.hxx"
#include "decoder_api.h" #include "decoder_api.h"
#include "OggCodec.hxx"
extern "C" {
#include "ogg_codec.h"
}
#include "audio_check.h" #include "audio_check.h"
#include "tag_handler.h" #include "tag_handler.h"
......
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
#include "VorbisDecoderPlugin.h" #include "VorbisDecoderPlugin.h"
#include "VorbisComments.hxx" #include "VorbisComments.hxx"
#include "decoder_api.h" #include "decoder_api.h"
#include "OggCodec.hxx"
extern "C" { extern "C" {
#include "ogg_codec.h"
#include "audio_check.h" #include "audio_check.h"
#include "uri.h" #include "uri.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