oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/mpg123: convert to C++

Browse Source
This commit is contained in:
Max Kellermann 2013-07-28 12:45:48 +02:00
parent d3641766a5
commit 258d0ea97e
4 changed files with 48 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -504,7 +504,9 @@ libdecoder_plugins_a_SOURCES += \
endif endif
if HAVE_MPG123 if HAVE_MPG123
libdecoder_plugins_a_SOURCES += src/decoder/mpg123_decoder_plugin.c libdecoder_plugins_a_SOURCES += \
src/decoder/Mpg123DecoderPlugin.cxx \
src/decoder/Mpg123DecoderPlugin.hxx
endif endif
if HAVE_MPCDEC if HAVE_MPCDEC

2
src/DecoderList.cxx
View File

@ -36,12 +36,12 @@
#include "decoder/FaadDecoderPlugin.hxx" #include "decoder/FaadDecoderPlugin.hxx"
#include "decoder/MadDecoderPlugin.hxx" #include "decoder/MadDecoderPlugin.hxx"
#include "decoder/SndfileDecoderPlugin.hxx" #include "decoder/SndfileDecoderPlugin.hxx"
#include "decoder/Mpg123DecoderPlugin.hxx"
#include <glib.h> #include <glib.h>
#include <string.h> #include <string.h>
extern const struct decoder_plugin mpg123_decoder_plugin;
extern const struct decoder_plugin mpcdec_decoder_plugin; extern const struct decoder_plugin mpcdec_decoder_plugin;
extern const struct decoder_plugin modplug_decoder_plugin; extern const struct decoder_plugin modplug_decoder_plugin;
extern const struct decoder_plugin mikmod_decoder_plugin; extern const struct decoder_plugin mikmod_decoder_plugin;

33
src/decoder/mpg123_decoder_plugin.c → src/decoder/Mpg123DecoderPlugin.cxx
View File

@ -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 * 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
@ -18,6 +18,7 @@
*/ */
#include "config.h" /* must be first for large file support */ #include "config.h" /* must be first for large file support */
#include "Mpg123DecoderPlugin.hxx"
#include "decoder_api.h" #include "decoder_api.h"
#include "audio_check.h" #include "audio_check.h"
#include "tag_handler.h" #include "tag_handler.h"
@ -57,7 +58,7 @@ static bool
mpd_mpg123_open(mpg123_handle *handle, const char *path_fs, mpd_mpg123_open(mpg123_handle *handle, const char *path_fs,
struct audio_format *audio_format) struct audio_format *audio_format)
{ {
GError *gerror = NULL; GError *gerror = nullptr;
char *path_dup; char *path_dup;
int error; int error;
int channels, encoding; int channels, encoding;
@ -111,8 +112,8 @@ mpd_mpg123_file_decode(struct decoder *decoder, const char *path_fs)
/* open the file */ /* open the file */
handle = mpg123_new(NULL, &error); handle = mpg123_new(nullptr, &error);
if (handle == NULL) { if (handle == nullptr) {
g_warning("mpg123_new() failed: %s", g_warning("mpg123_new() failed: %s",
mpg123_plain_strerror(error)); mpg123_plain_strerror(error));
return; return;
@ -172,7 +173,7 @@ mpd_mpg123_file_decode(struct decoder *decoder, const char *path_fs)
/* send to MPD */ /* send to MPD */
cmd = decoder_data(decoder, NULL, buffer, nbytes, info.bitrate); cmd = decoder_data(decoder, nullptr, buffer, nbytes, info.bitrate);
if (cmd == DECODE_COMMAND_SEEK) { if (cmd == DECODE_COMMAND_SEEK) {
off_t c = decoder_seek_where(decoder)*audio_format.sample_rate; off_t c = decoder_seek_where(decoder)*audio_format.sample_rate;
@ -202,8 +203,8 @@ mpd_mpg123_scan_file(const char *path_fs,
int error; int error;
off_t num_samples; off_t num_samples;
handle = mpg123_new(NULL, &error); handle = mpg123_new(nullptr, &error);
if (handle == NULL) { if (handle == nullptr) {
g_warning("mpg123_new() failed: %s", g_warning("mpg123_new() failed: %s",
mpg123_plain_strerror(error)); mpg123_plain_strerror(error));
return false; return false;
@ -231,15 +232,19 @@ mpd_mpg123_scan_file(const char *path_fs,
static const char *const mpg123_suffixes[] = { static const char *const mpg123_suffixes[] = {
"mp3", "mp3",
NULL nullptr
}; };
const struct decoder_plugin mpg123_decoder_plugin = { const struct decoder_plugin mpg123_decoder_plugin = {
.name = "mpg123", "mpg123",
.init = mpd_mpg123_init, mpd_mpg123_init,
.finish = mpd_mpg123_finish, mpd_mpg123_finish,
.file_decode = mpd_mpg123_file_decode,
/* streaming not yet implemented */ /* streaming not yet implemented */
.scan_file = mpd_mpg123_scan_file, nullptr,
.suffixes = mpg123_suffixes, mpd_mpg123_file_decode,
mpd_mpg123_scan_file,
nullptr,
nullptr,
mpg123_suffixes,
nullptr,
}; };

25
src/decoder/Mpg123DecoderPlugin.hxx Normal file
View File

@ -0,0 +1,25 @@
/*
* 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
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_DECODER_MPG123_HXX
#define MPD_DECODER_MPG123_HXX
extern const struct decoder_plugin mpg123_decoder_plugin;
#endif