mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Fix some status outputs, updates #1170, requires merging

Browse source 
Originally committed to SVN as r4482.
This commit is contained in:
Amar Takhar 2010-06-12 05:48:02 +00:00
parent c95eb3fcce
commit cd62441b70
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
aegisub/configure.in
View file

@ -646,7 +646,7 @@ if test "$with_oss" != "no"; then
. /etc/oss.conf . /etc/oss.conf
CPPFLAGS="$CPPFLAGS -I${OSSLIBDIR}/include/sys" CPPFLAGS="$CPPFLAGS -I${OSSLIBDIR}/include/sys"
fi fi
AC_CHECK_HEADERS([soundcard.h sys/soundcard.h], [with_oss=yes], [with_oss=no]) AC_CHECK_HEADERS([soundcard.h sys/soundcard.h], [with_oss="yes"], [with_oss="no"])
# XXX: maybe check if OSS works # XXX: maybe check if OSS works
fi fi
@ -1171,7 +1171,6 @@ else
fi fi
AC_DEFINE_UNQUOTED([DEFAULT_PROVIDER_VIDEO], ["$default_provider_video"], [Default Video Provider.]) AC_DEFINE_UNQUOTED([DEFAULT_PROVIDER_VIDEO], ["$default_provider_video"], [Default Video Provider.])
# Default Audio Provider. # Default Audio Provider.
if ! test -z "$with_provider_audio"; then if ! test -z "$with_provider_audio"; then
default_provider_audio="$with_provider_audio" default_provider_audio="$with_provider_audio"
@ -1184,7 +1183,6 @@ else
fi fi
AC_DEFINE_UNQUOTED([DEFAULT_PROVIDER_AUDIO], ["$default_provider_audio"], [Default Video Provider.]) AC_DEFINE_UNQUOTED([DEFAULT_PROVIDER_AUDIO], ["$default_provider_audio"], [Default Video Provider.])
# Default Subtitle Provider. # Default Subtitle Provider.
if ! test -z "$with_provider_subtitle"; then if ! test -z "$with_provider_subtitle"; then
default_provider_subtitle="$with_provider_subtitle" default_provider_subtitle="$with_provider_subtitle"
@ -1197,7 +1195,6 @@ else
fi fi
AC_DEFINE_UNQUOTED([DEFAULT_PROVIDER_SUBTITLE], ["$default_provider_subtitle"], [Default Subtitle Provider.]) AC_DEFINE_UNQUOTED([DEFAULT_PROVIDER_SUBTITLE], ["$default_provider_subtitle"], [Default Subtitle Provider.])
# Default audio player. # Default audio player.
if ! test -z "$with_player_audio"; then if ! test -z "$with_player_audio"; then
default_player_audio="$with_player_audio" default_player_audio="$with_player_audio"
@ -1208,6 +1205,8 @@ else
default_player_audio="openal" default_player_audio="openal"
elif test "$with_portaudio" = "yes"; then elif test "$with_portaudio" = "yes"; then
default_player_audio="portaudio" default_player_audio="portaudio"
elif test "$with_oss" = "yes"; then
default_player_audio="oss"
elif test "$with_pulseaudio" = "yes"; then elif test "$with_pulseaudio" = "yes"; then
default_player_audio="pulseaudio" default_player_audio="pulseaudio"
fi fi
@ -1215,6 +1214,25 @@ fi
AC_DEFINE_UNQUOTED([DEFAULT_PLAYER_AUDIO], ["$default_player_audio"], [Default audio player.]) AC_DEFINE_UNQUOTED([DEFAULT_PLAYER_AUDIO], ["$default_player_audio"], [Default audio player.])
# Set some friendly strings if some of the above aren't detected.
if test -z "$default_provider_video"; then
default_provider_video="NONE (requires ffmpeg)"
fi
if test -z "$default_provider_audio"; then
default_provider_audio="NONE (requires ffmpeg)"
fi
if test -z "$default_provider_subtitle"; then
default_provider_audio="NONE"
fi
if test -z "$default_player_audio"; then
default_player_audio="NONE"
fi
############### ###############
# Misc settings # Misc settings