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
9999a20c
Commit
9999a20c
authored
Jan 16, 2005
by
Warren Dukes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
this should fix compile bugs #350 and #351
git-svn-id:
https://svn.musicpd.org/mpd/trunk@2884
09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent
9a18f61d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
9 deletions
+33
-9
configure.ac
configure.ac
+13
-9
audioOutput_ao.c
src/audioOutputs/audioOutput_ao.c
+20
-0
No files found.
configure.ac
View file @
9999a20c
...
...
@@ -31,11 +31,11 @@ if test x$CC = xgcc; then
fi
MPD_LIBS=""
AC_ARG_ENABLE(a
udio,[ --disable-audio disable support for playing
],,enable_ao=yes)
AC_ARG_ENABLE(a
o,[ --disable-ao disable support for libao
],,enable_ao=yes)
AC_ARG_ENABLE(shout,[ --disable-shout disable support for streaming through shout],,enable_shout=yes)
AC_ARG_ENABLE(iconv,[ --disable-iconv disable iconv support],,enable_iconv=yes)
AC_ARG_ENABLE(ipv6,[ --disable-ipv6 disable IPv6 support],,enable_ipv6=yes)
AC_ARG_ENABLE(
alsa
,[ --disable-oss disable OSS support],,enable_oss=yes)
AC_ARG_ENABLE(
oss
,[ --disable-oss disable OSS support],,enable_oss=yes)
AC_ARG_ENABLE(alsa,[ --disable-alsa disable ALSA Mixer support],,enable_alsa=yes)
AC_ARG_ENABLE(ogg,[ --disable-ogg disable ogg support],,enable_ogg=yes)
AC_ARG_ENABLE(flac,[ --disable-flac disable flac support],,enable_flac=yes)
...
...
@@ -101,15 +101,13 @@ AP_maGiC_VALUE
)
fi
if test x$enable_ao = xyes; then
if test x$enable_ogg = xno; then
AC_MSG_WARN("disabling shout streaming support since vorbis was not found")
fi
if test x$enable_ogg = xno; then
AC_MSG_WARN("disabling shout streaming support since vorbis was not found")
fi
if test x$enable_ao = xyes; then
XIPH_PATH_AO(MPD_LIBS="$MPD_LIBS $AO_LIBS" MPD_CFLAGS="$MPD_CFLAGS $AO_CFLAGS",AC_MSG_ERROR(Must have libao installed!!!))
AC_DEFINE(HAVE_A
UDIO, 1, [Define to play audi
o])
AC_DEFINE(HAVE_A
O, 1, [Define to play with a
o])
fi
if test x$enable_shout = xyes; then
...
...
@@ -535,9 +533,15 @@ fi
echo ""
echo "Audio Format Support:"
if test x$enable_ao = xyes; then
echo "Playing audio .................enabled"
echo "Playing audio via libao .......enabled"
else
echo "Playing audio via libao .......disabled"
fi
if test x$enable_oss = xyes; then
echo "Playing audio via OSS .........enabled"
else
echo "Playing audio
........
.........disabled"
echo "Playing audio
via OSS
.........disabled"
fi
if test x$enable_shout = xyes; then
...
...
src/audioOutputs/audioOutput_ao.c
View file @
9999a20c
...
...
@@ -17,6 +17,9 @@
*/
#include "../audioOutput.h"
#ifdef HAVE_AO
#include "../conf.h"
#include "../log.h"
...
...
@@ -237,3 +240,20 @@ AudioOutputPlugin aoPlugin =
audioOutputAo_closeDevice
,
NULL
/* sendMetadataFunc */
};
#else
#include <stdio.h>
AudioOutputPlugin
aoPlugin
=
{
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
};
#endif
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