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
9bf7fde4
Commit
9bf7fde4
authored
Dec 21, 2010
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure.ac: hook the cdio_paranoia input plugin
parent
4783ebc9
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
49 additions
and
0 deletions
+49
-0
INSTALL
INSTALL
+3
-0
Makefile.am
Makefile.am
+7
-0
NEWS
NEWS
+2
-0
configure.ac
configure.ac
+16
-0
user.xml
doc/user.xml
+11
-0
input_registry.c
src/input_registry.c
+7
-0
ls.c
src/ls.c
+3
-0
No files found.
INSTALL
View file @
9bf7fde4
...
@@ -141,6 +141,9 @@ For the sticker database.
...
@@ -141,6 +141,9 @@ For the sticker database.
libcue - http://libcue.sourceforge.net/
libcue - http://libcue.sourceforge.net/
For CUE sheet support.
For CUE sheet support.
libcdio - http://www.gnu.org/software/libcdio/
For playing audio CDs.
pkg-config
pkg-config
----------
----------
...
...
Makefile.am
View file @
9bf7fde4
...
@@ -106,6 +106,7 @@ mpd_headers = \
...
@@ -106,6 +106,7 @@ mpd_headers = \
src/input/curl_input_plugin.h
\
src/input/curl_input_plugin.h
\
src/input/rewind_input_plugin.h
\
src/input/rewind_input_plugin.h
\
src/input/mms_input_plugin.h
\
src/input/mms_input_plugin.h
\
src/input/cdio_paranoia_input_plugin.h
\
src/text_file.h
\
src/text_file.h
\
src/text_input_stream.h
\
src/text_input_stream.h
\
src/icy_server.h
\
src/icy_server.h
\
...
@@ -612,11 +613,13 @@ endif
...
@@ -612,11 +613,13 @@ endif
INPUT_CFLAGS
=
\
INPUT_CFLAGS
=
\
$(CURL_CFLAGS)
\
$(CURL_CFLAGS)
\
$(CDIO_PARANOIA_CFLAGS)
\
$(FFMPEG_CFLAGS)
\
$(FFMPEG_CFLAGS)
\
$(MMS_CFLAGS)
$(MMS_CFLAGS)
INPUT_LIBS
=
\
INPUT_LIBS
=
\
$(CURL_LIBS)
\
$(CURL_LIBS)
\
$(CDIO_PARANOIA_LIBS)
\
$(FFMPEG_LIBS)
\
$(FFMPEG_LIBS)
\
$(MMS_LIBS)
$(MMS_LIBS)
...
@@ -632,6 +635,10 @@ INPUT_SRC += src/input/curl_input_plugin.c \
...
@@ -632,6 +635,10 @@ INPUT_SRC += src/input/curl_input_plugin.c \
src/icy_metadata.c
src/icy_metadata.c
endif
endif
if
ENABLE_CDIO_PARANOIA
INPUT_SRC
+=
src/input/cdio_paranoia_input_plugin.c
endif
if
HAVE_FFMPEG
if
HAVE_FFMPEG
INPUT_SRC
+=
src/input/ffmpeg_input_plugin.c
INPUT_SRC
+=
src/input/ffmpeg_input_plugin.c
endif
endif
...
...
NEWS
View file @
9bf7fde4
ver 0.17 (2010/??/??)
ver 0.17 (2010/??/??)
* input:
- cdio_paranoia: new input plugin to play audio CDs
* output:
* output:
- osx: allow user to specify other audio devices
- osx: allow user to specify other audio devices
...
...
configure.ac
View file @
9bf7fde4
...
@@ -135,6 +135,11 @@ AC_ARG_ENABLE(bzip2,
...
@@ -135,6 +135,11 @@ AC_ARG_ENABLE(bzip2,
[enable bzip2 archive support (default: disabled)]),,
[enable bzip2 archive support (default: disabled)]),,
enable_bzip2=no)
enable_bzip2=no)
AC_ARG_ENABLE(cdio-paranoia,
AS_HELP_STRING([--enable-cdio-paranoia],
[enable support for audio CD support]),,
enable_cdio_paranoia=auto)
AC_ARG_ENABLE(cue,
AC_ARG_ENABLE(cue,
AS_HELP_STRING([--enable-cue],
AS_HELP_STRING([--enable-cue],
[enable support for libcue support]),,
[enable support for libcue support]),,
...
@@ -633,6 +638,16 @@ if test x$enable_lastfm = xyes; then
...
@@ -633,6 +638,16 @@ if test x$enable_lastfm = xyes; then
fi
fi
AM_CONDITIONAL(ENABLE_LASTFM, test x$enable_lastfm = xyes)
AM_CONDITIONAL(ENABLE_LASTFM, test x$enable_lastfm = xyes)
dnl ---------------------------------- libcue ---------------------------------
MPD_AUTO_PKG(cdio_paranoia, CDIO_PARANOIA, [libcdio_paranoia],
[libcdio_paranoia audio CD library], [libcdio_paranoia not found])
if test x$enable_cdio_paranoia = xyes; then
AC_DEFINE([ENABLE_CDIO_PARANOIA], 1,
[Define to enable libcdio_paranoia support])
fi
AM_CONDITIONAL(ENABLE_CDIO_PARANOIA, test x$enable_cdio_paranoia = xyes)
dnl ---------------------------------- libogg ---------------------------------
dnl ---------------------------------- libogg ---------------------------------
if test x$with_tremor == xno || test -z $with_tremor; then
if test x$with_tremor == xno || test -z $with_tremor; then
PKG_CHECK_MODULES(OGG, [ogg], enable_ogg=yes, enable_ogg=no)
PKG_CHECK_MODULES(OGG, [ogg], enable_ogg=yes, enable_ogg=no)
...
@@ -1579,6 +1594,7 @@ echo -en '\nStreaming support:\n\t'
...
@@ -1579,6 +1594,7 @@ echo -en '\nStreaming support:\n\t'
results(curl,[CURL])
results(curl,[CURL])
results(lastfm,[Last.FM])
results(lastfm,[Last.FM])
results(mms,[MMS])
results(mms,[MMS])
results(cdio_paranoia, [CDIO_PARANOIA])
echo -ne '\n\n##########################################\n\n'
echo -ne '\n\n##########################################\n\n'
...
...
doc/user.xml
View file @
9bf7fde4
...
@@ -621,6 +621,17 @@ cd mpd-version</programlisting>
...
@@ -621,6 +621,17 @@ cd mpd-version</programlisting>
Plays streams with the MMS protocol.
Plays streams with the MMS protocol.
</para>
</para>
</section>
</section>
<section>
<title><varname>
cdio_paranoia
</varname></title>
<para>
Plays audio CDs. The URI has the form:
"
<filename>
cdda://[DEVICE][/TRACK]
</filename>
". The
simplest form
<filename>
cdda://
</filename>
plays the whole
disc in the default drive.
</para>
</section>
</section>
</section>
<section>
<section>
...
...
src/input_registry.c
View file @
9bf7fde4
...
@@ -37,6 +37,10 @@
...
@@ -37,6 +37,10 @@
#include "input/mms_input_plugin.h"
#include "input/mms_input_plugin.h"
#endif
#endif
#ifdef ENABLE_CDIO_PARANOIA
#include "input/cdio_paranoia_input_plugin.h"
#endif
#include <glib.h>
#include <glib.h>
const
struct
input_plugin
*
const
input_plugins
[]
=
{
const
struct
input_plugin
*
const
input_plugins
[]
=
{
...
@@ -53,6 +57,9 @@ const struct input_plugin *const input_plugins[] = {
...
@@ -53,6 +57,9 @@ const struct input_plugin *const input_plugins[] = {
#ifdef ENABLE_MMS
#ifdef ENABLE_MMS
&
input_plugin_mms
,
&
input_plugin_mms
,
#endif
#endif
#ifdef ENABLE_CDIO_PARANOIA
&
input_plugin_cdio_paranoia
,
#endif
NULL
NULL
};
};
...
...
src/ls.c
View file @
9bf7fde4
...
@@ -49,6 +49,9 @@ static const char *remoteUrlPrefixes[] = {
...
@@ -49,6 +49,9 @@ static const char *remoteUrlPrefixes[] = {
"rtmpt://"
,
"rtmpt://"
,
"rtmps://"
,
"rtmps://"
,
#endif
#endif
#ifdef ENABLE_CDIO_PARANOIA
"cdda://"
,
#endif
NULL
NULL
};
};
...
...
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