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

slight tweak of avuton's idea of causing an error when no audio output's found

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@3093 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2005-03-17 00:56:31 +00:00
parent 70865740fb
commit c1057f0c34
2 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
configure.ac
View File

@ -126,14 +126,6 @@ if test x$enable_oss = xyes; then
AC_CHECK_HEADER(sys/soundcard.h,[enable_oss=yes;AC_DEFINE(HAVE_OSS,1,[Define to enable OSS])],[AC_MSG_WARN(Soundcard headers not found -- disabling OSS support);enable_oss=no]) AC_CHECK_HEADER(sys/soundcard.h,[enable_oss=yes;AC_DEFINE(HAVE_OSS,1,[Define to enable OSS])],[AC_MSG_WARN(Soundcard headers not found -- disabling OSS support);enable_oss=no])
fi fi
if test x$enable_ao = xno &&
test x$enable_oss = xno &&
test x$enable_shout = xno &&
test x$enable_alsa = xno &&
test x$enable_osx = xno; then
AC_MSG_ERROR("Cannot compile without an output target")
fi
if test x$enable_alsa = xyes; then if test x$enable_alsa = xyes; then
AM_PATH_ALSA(0.9.0,[AC_DEFINE(HAVE_ALSA,1,[Define to enable ALSA support]) MPD_LIBS="$MPD_LIBS $ALSA_LIBS" MPD_CFLAGS="$MPD_CFLAGS $ALSA_CFLAGS"],enable_alsa=no) AM_PATH_ALSA(0.9.0,[AC_DEFINE(HAVE_ALSA,1,[Define to enable ALSA support]) MPD_LIBS="$MPD_LIBS $ALSA_LIBS" MPD_CFLAGS="$MPD_CFLAGS $ALSA_CFLAGS"],enable_alsa=no)
fi fi
@ -559,22 +551,6 @@ fi
echo "" echo ""
echo "Volume Mixer Support:"
if test x$enable_oss = xyes; then
echo "OSS mixer support .............enabled"
else
echo "OSS mixer support .............disabled"
fi
if test x$enable_alsa = xyes; then
echo "ALSA mixer support ............enabled"
else
echo "ALSA mixer support ............disabled"
fi
echo ""
echo "Audio Output Support:" echo "Audio Output Support:"
if test x$enable_ao = xyes; then if test x$enable_ao = xyes; then
echo "Playing audio via libao .......enabled" echo "Playing audio via libao .......enabled"
@ -608,6 +584,14 @@ fi
echo "" echo ""
if test x$enable_ao = xno &&
test x$enable_oss = xno &&
test x$enable_shout = xno &&
test x$enable_alsa = xno &&
test x$enable_osx = xno; then
AC_MSG_ERROR("No Audio Output types configured!")
fi
echo "Audio Format Support:" echo "Audio Format Support:"
if test x$enable_id3 = xyes; then if test x$enable_id3 = xyes; then

7
src/audioOutputs/audioOutput_osx.c
View File

@ -101,14 +101,9 @@ static void osx_dropBufferedAudio(AudioOutput * audioOutput) {
OsxData * od = (OsxData *)audioOutput->data; OsxData * od = (OsxData *)audioOutput->data;
pthread_mutex_lock(&od->mutex); pthread_mutex_lock(&od->mutex);
od->go = 0;
od->len = 0; od->len = 0;
od->go = 0;
pthread_mutex_unlock(&od->mutex); pthread_mutex_unlock(&od->mutex);
/*if(od->started) {
AudioOutputUnitStop(od->au);
od->started = 0;
}*/
} }
static void osx_closeDevice(AudioOutput * audioOutput) { static void osx_closeDevice(AudioOutput * audioOutput) {