Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
01dd540d
Commit
01dd540d
authored
Jan 30, 2013
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decoder_list: convert to C++
parent
81420806
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
25 additions
and
30 deletions
+25
-30
Makefile.am
Makefile.am
+1
-2
CommandLine.cxx
src/CommandLine.cxx
+1
-1
DecoderList.cxx
src/DecoderList.cxx
+2
-2
DecoderList.hxx
src/DecoderList.hxx
+3
-5
DecoderPrint.cxx
src/DecoderPrint.cxx
+1
-1
DecoderThread.cxx
src/DecoderThread.cxx
+1
-1
Main.cxx
src/Main.cxx
+1
-1
SongUpdate.cxx
src/SongUpdate.cxx
+2
-2
TagFile.cxx
src/TagFile.cxx
+1
-1
UpdateSong.cxx
src/UpdateSong.cxx
+1
-4
decoder_plugin.h
src/decoder_plugin.h
+8
-0
dump_playlist.cxx
test/dump_playlist.cxx
+1
-4
read_tags.cxx
test/read_tags.cxx
+1
-3
run_decoder.cxx
test/run_decoder.cxx
+1
-3
No files found.
Makefile.am
View file @
01dd540d
...
@@ -77,7 +77,6 @@ mpd_headers = \
...
@@ -77,7 +77,6 @@ mpd_headers = \
src/gerror.h
\
src/gerror.h
\
src/glib_compat.h
\
src/glib_compat.h
\
src/gcc.h
\
src/gcc.h
\
src/decoder_list.h
\
src/decoder/pcm_decoder_plugin.h
\
src/decoder/pcm_decoder_plugin.h
\
src/input_stream.h
\
src/input_stream.h
\
src/text_input_stream.h
\
src/text_input_stream.h
\
...
@@ -465,7 +464,7 @@ libdecoder_plugins_a_SOURCES = \
...
@@ -465,7 +464,7 @@ libdecoder_plugins_a_SOURCES = \
src/decoder/dsdlib.h
\
src/decoder/dsdlib.h
\
src/decoder_buffer.c
\
src/decoder_buffer.c
\
src/decoder_plugin.c
\
src/decoder_plugin.c
\
src/
decoder_list.c
src/
DecoderList.cxx src/DecoderList.hxx
libdecoder_plugins_a_CPPFLAGS
=
$(AM_CPPFLAGS)
\
libdecoder_plugins_a_CPPFLAGS
=
$(AM_CPPFLAGS)
\
$(VORBIS_CFLAGS)
$(TREMOR_CFLAGS)
\
$(VORBIS_CFLAGS)
$(TREMOR_CFLAGS)
\
$
(
patsubst
-I
%/FLAC,-I%,
$(FLAC_CFLAGS)
)
\
$
(
patsubst
-I
%/FLAC,-I%,
$(FLAC_CFLAGS)
)
\
...
...
src/CommandLine.cxx
View file @
01dd540d
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
#include "ls.hxx"
#include "ls.hxx"
#include "Log.hxx"
#include "Log.hxx"
#include "conf.h"
#include "conf.h"
#include "
decoder_list.h
"
#include "
DecoderList.hxx
"
#include "decoder_plugin.h"
#include "decoder_plugin.h"
#include "OutputList.hxx"
#include "OutputList.hxx"
#include "output_plugin.h"
#include "output_plugin.h"
...
...
src/
decoder_list.c
→
src/
DecoderList.cxx
View file @
01dd540d
/*
/*
* Copyright (C) 2003-201
2
The Music Player Daemon Project
* Copyright (C) 2003-201
3
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,7 +18,7 @@
...
@@ -18,7 +18,7 @@
*/
*/
#include "config.h"
#include "config.h"
#include "
decoder_list.h
"
#include "
DecoderList.hxx
"
#include "decoder_plugin.h"
#include "decoder_plugin.h"
#include "conf.h"
#include "conf.h"
#include "mpd_error.h"
#include "mpd_error.h"
...
...
src/
decoder_list.h
→
src/
DecoderList.hxx
View file @
01dd540d
/*
/*
* Copyright (C) 2003-201
1
The Music Player Daemon Project
* Copyright (C) 2003-201
3
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,10 +17,8 @@
...
@@ -17,10 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
*/
#ifndef MPD_DECODER_LIST_H
#ifndef MPD_DECODER_LIST_HXX
#define MPD_DECODER_LIST_H
#define MPD_DECODER_LIST_HXX
#include <stdbool.h>
struct
decoder_plugin
;
struct
decoder_plugin
;
...
...
src/DecoderPrint.cxx
View file @
01dd540d
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
#include "config.h"
#include "config.h"
#include "DecoderPrint.hxx"
#include "DecoderPrint.hxx"
#include "
decoder_list.h
"
#include "
DecoderList.hxx
"
#include "decoder_plugin.h"
#include "decoder_plugin.h"
#include "Client.hxx"
#include "Client.hxx"
...
...
src/DecoderThread.cxx
View file @
01dd540d
...
@@ -30,9 +30,9 @@
...
@@ -30,9 +30,9 @@
#include "decoder_api.h"
#include "decoder_api.h"
#include "tag.h"
#include "tag.h"
#include "InputStream.hxx"
#include "InputStream.hxx"
#include "DecoderList.hxx"
extern
"C"
{
extern
"C"
{
#include "decoder_list.h"
#include "replay_gain_ape.h"
#include "replay_gain_ape.h"
#include "uri.h"
#include "uri.h"
}
}
...
...
src/Main.cxx
View file @
01dd540d
...
@@ -50,13 +50,13 @@
...
@@ -50,13 +50,13 @@
#include "fs/Path.hxx"
#include "fs/Path.hxx"
#include "PlaylistRegistry.hxx"
#include "PlaylistRegistry.hxx"
#include "ZeroconfGlue.hxx"
#include "ZeroconfGlue.hxx"
#include "DecoderList.hxx"
extern
"C"
{
extern
"C"
{
#include "daemon.h"
#include "daemon.h"
#include "stats.h"
#include "stats.h"
#include "audio_config.h"
#include "audio_config.h"
#include "pcm_resample.h"
#include "pcm_resample.h"
#include "decoder_list.h"
}
}
#include "mpd_error.h"
#include "mpd_error.h"
...
...
src/SongUpdate.cxx
View file @
01dd540d
...
@@ -29,10 +29,10 @@ extern "C" {
...
@@ -29,10 +29,10 @@ extern "C" {
#include "fs/Path.hxx"
#include "fs/Path.hxx"
#include "tag.h"
#include "tag.h"
#include "input_stream.h"
#include "input_stream.h"
#include "decoder_plugin.h"
#include "DecoderList.hxx"
extern
"C"
{
extern
"C"
{
#include "decoder_list.h"
#include "decoder_plugin.h"
#include "tag_ape.h"
#include "tag_ape.h"
#include "tag_id3.h"
#include "tag_id3.h"
#include "tag_handler.h"
#include "tag_handler.h"
...
...
src/TagFile.cxx
View file @
01dd540d
...
@@ -22,9 +22,9 @@
...
@@ -22,9 +22,9 @@
extern
"C"
{
extern
"C"
{
#include "uri.h"
#include "uri.h"
#include "decoder_list.h"
}
}
#include "DecoderList.hxx"
#include "decoder_plugin.h"
#include "decoder_plugin.h"
#include "input_stream.h"
#include "input_stream.h"
...
...
src/UpdateSong.cxx
View file @
01dd540d
...
@@ -27,10 +27,7 @@
...
@@ -27,10 +27,7 @@
#include "Directory.hxx"
#include "Directory.hxx"
#include "song.h"
#include "song.h"
#include "decoder_plugin.h"
#include "decoder_plugin.h"
#include "DecoderList.hxx"
extern
"C"
{
#include "decoder_list.h"
}
#include <glib.h>
#include <glib.h>
...
...
src/decoder_plugin.h
View file @
01dd540d
...
@@ -190,6 +190,10 @@ decoder_plugin_container_scan( const struct decoder_plugin *plugin,
...
@@ -190,6 +190,10 @@ decoder_plugin_container_scan( const struct decoder_plugin *plugin,
return
plugin
->
container_scan
(
pathname
,
tnum
);
return
plugin
->
container_scan
(
pathname
,
tnum
);
}
}
#ifdef __cplusplus
extern
"C"
{
#endif
/**
/**
* Does the plugin announce the specified file name suffix?
* Does the plugin announce the specified file name suffix?
*/
*/
...
@@ -204,4 +208,8 @@ bool
...
@@ -204,4 +208,8 @@ bool
decoder_plugin_supports_mime_type
(
const
struct
decoder_plugin
*
plugin
,
decoder_plugin_supports_mime_type
(
const
struct
decoder_plugin
*
plugin
,
const
char
*
mime_type
);
const
char
*
mime_type
);
#ifdef __cplusplus
}
#endif
#endif
#endif
test/dump_playlist.cxx
View file @
01dd540d
...
@@ -24,16 +24,13 @@
...
@@ -24,16 +24,13 @@
#include "input_stream.h"
#include "input_stream.h"
#include "conf.h"
#include "conf.h"
#include "decoder_api.h"
#include "decoder_api.h"
#include "DecoderList.hxx"
#include "InputInit.hxx"
#include "InputInit.hxx"
#include "IOThread.hxx"
#include "IOThread.hxx"
#include "PlaylistRegistry.hxx"
#include "PlaylistRegistry.hxx"
#include "PlaylistPlugin.hxx"
#include "PlaylistPlugin.hxx"
#include "fs/Path.hxx"
#include "fs/Path.hxx"
extern
"C"
{
#include "decoder_list.h"
}
#include <glib.h>
#include <glib.h>
#include <unistd.h>
#include <unistd.h>
...
...
test/read_tags.cxx
View file @
01dd540d
...
@@ -19,9 +19,7 @@
...
@@ -19,9 +19,7 @@
#include "config.h"
#include "config.h"
#include "IOThread.hxx"
#include "IOThread.hxx"
extern
"C"
{
#include "DecoderList.hxx"
#include "decoder_list.h"
}
#include "decoder_api.h"
#include "decoder_api.h"
#include "InputInit.hxx"
#include "InputInit.hxx"
#include "InputStream.hxx"
#include "InputStream.hxx"
...
...
test/run_decoder.cxx
View file @
01dd540d
...
@@ -19,9 +19,7 @@
...
@@ -19,9 +19,7 @@
#include "config.h"
#include "config.h"
#include "IOThread.hxx"
#include "IOThread.hxx"
extern
"C"
{
#include "DecoderList.hxx"
#include "decoder_list.h"
}
#include "decoder_api.h"
#include "decoder_api.h"
#include "InputInit.hxx"
#include "InputInit.hxx"
#include "input_stream.h"
#include "input_stream.h"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment