Revision: 816
http://ultrastar-ng.svn.sourceforge.net/ultrastar-ng/?rev=816&view=rev
Author: yoda-jm
Date: 2008-06-29 03:42:40 -0700 (Sun, 29 Jun 2008)
Log Message:
-----------
Changed libda "record" flags with "libda" flags
Modified Paths:
--------------
trunk/audio/Makefile.am
trunk/configure.in
Modified: trunk/audio/Makefile.am
===================================================================
--- trunk/audio/Makefile.am 2008-06-29 10:28:38 UTC (rev 815)
+++ trunk/audio/Makefile.am 2008-06-29 10:42:40 UTC (rev 816)
@@ -7,34 +7,34 @@
lib = -lboost_thread
sources = audio.cpp audio_dev_tone.cpp
-if RECORD_ALSA
+if LIBDA_ALSA
sources += audio_dev_alsa.cpp
-flags += @RECORD_ALSA_FLAGS@
-lib += @RECORD_ALSA_LIBS@
+flags += @LIBDA_ALSA_FLAGS@
+lib += @LIBDA_ALSA_LIBS@
endif
-if RECORD_PA18
+if LIBDA_PA18
sources += audio_dev_pa18.cpp
-flags += @RECORD_PA18_FLAGS@
-lib += @RECORD_PA18_LIBS@
+flags += @LIBDA_PA18_FLAGS@
+lib += @LIBDA_PA18_LIBS@
endif
-if RECORD_PA19
+if LIBDA_PA19
sources += audio_dev_pa.cpp
-flags += @RECORD_PA19_FLAGS@
-lib += @RECORD_PA19_LIBS@
+flags += @LIBDA_PA19_FLAGS@
+lib += @LIBDA_PA19_LIBS@
endif
-if RECORD_GST
+if LIBDA_GST
sources += audio_dev_gst.cpp
-flags += @RECORD_GST_FLAGS@
-lib += @RECORD_GST_LIBS@
+flags += @LIBDA_GST_FLAGS@
+lib += @LIBDA_GST_LIBS@
endif
-if RECORD_JACK
+if LIBDA_JACK
sources += audio_dev_jack.cpp
-flags += @RECORD_JACK_FLAGS@
-lib += @RECORD_JACK_LIBS@
+flags += @LIBDA_JACK_FLAGS@
+lib += @LIBDA_JACK_LIBS@
endif
libdausng_la_SOURCES = $(sources)
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2008-06-29 10:28:38 UTC (rev 815)
+++ trunk/configure.in 2008-06-29 10:42:40 UTC (rev 816)
@@ -71,70 +71,70 @@
)
if test $video_layer = yes ; then video_layer="autodetect" ; fi
-AC_ARG_ENABLE(record-alsa,
- AC_HELP_STRING(--enable-record-alsa,
- Enable alsa record backend [[[default=autodetect]]]),
+AC_ARG_ENABLE(libda-alsa,
+ AC_HELP_STRING(--enable-libda-alsa,
+ Enable alsa libda backend [[[default=autodetect]]]),
[case "${enableval}" in
- yes) enable_record_alsa="yes" ;;
- no) enable_record_alsa="no" ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-record-alsa) ;;
+ yes) enable_libda_alsa="yes" ;;
+ no) enable_libda_alsa="no" ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-libda-alsa) ;;
esac],
- enable_record_alsa="autodetect")
-AC_ARG_ENABLE(record-pa18,
- AC_HELP_STRING(--enable-record-pa18,
- Enable PortAudioV18 record backend [[[default=autodetect]]]),
+ enable_libda_alsa="autodetect")
+AC_ARG_ENABLE(libda-pa18,
+ AC_HELP_STRING(--enable-libda-pa18,
+ Enable PortAudioV18 libda backend [[[default=autodetect]]]),
[case "${enableval}" in
- yes) enable_record_pa18="yes" ;;
- no) enable_record_pa18="no" ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-record-pa18) ;;
+ yes) enable_libda_pa18="yes" ;;
+ no) enable_libda_pa18="no" ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-libda-pa18) ;;
esac],
- enable_record_pa18="autodetect")
-AC_ARG_ENABLE(record-pa19,
- AC_HELP_STRING(--enable-record-pa19,
- Enable PortAudioV19 record backend [[[default=autodetect]]]),
+ enable_libda_pa18="autodetect")
+AC_ARG_ENABLE(libda-pa19,
+ AC_HELP_STRING(--enable-libda-pa19,
+ Enable PortAudioV19 libda backend [[[default=autodetect]]]),
[case "${enableval}" in
- yes) enable_record_pa19="yes" ;;
- no) enable_record_pa19="no" ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-record-pa19) ;;
+ yes) enable_libda_pa19="yes" ;;
+ no) enable_libda_pa19="no" ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-libda-pa19) ;;
esac],
- enable_record_pa19="autodetect")
-AC_ARG_ENABLE(record-portaudio,
- AC_HELP_STRING(--enable-record-portaudio,
- Enable at least one PortAudio record backend (override pa18 and pa19) [[[default=autodetect]]]),
+ enable_libda_pa19="autodetect")
+AC_ARG_ENABLE(libda-portaudio,
+ AC_HELP_STRING(--enable-libda-portaudio,
+ Enable at least one PortAudio libda backend (override pa18 and pa19) [[[default=autodetect]]]),
[case "${enableval}" in
- yes) enable_record_pa="yes" ;;
- no) enable_record_pa="no" ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-record-portaudio) ;;
+ yes) enable_libda_pa="yes" ;;
+ no) enable_libda_pa="no" ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-libda-portaudio) ;;
esac],
- enable_record_pa="autodetect")
+ enable_libda_pa="autodetect")
-if test enable_record_pa = no ; then
- enable_record_pa18="no"
- enable_record_pa19="no"
+if test enable_libda_pa = no ; then
+ enable_libda_pa18="no"
+ enable_libda_pa19="no"
fi
-if test enable_record_pa = yes ; then
- enable_record_pa18="autodetect"
- enable_record_pa19="autodetect"
+if test enable_libda_pa = yes ; then
+ enable_libda_pa18="autodetect"
+ enable_libda_pa19="autodetect"
fi
-AC_ARG_ENABLE(record-gst,
- AC_HELP_STRING(--enable-record-gst,
- Enable GStreamer record backend [[[default=autodetect]]]),
+AC_ARG_ENABLE(libda-gst,
+ AC_HELP_STRING(--enable-libda-gst,
+ Enable GStreamer libda backend [[[default=autodetect]]]),
[case "${enableval}" in
- yes) enable_record_gst="yes" ;;
- no) enable_record_gst="no" ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-record-gst) ;;
+ yes) enable_libda_gst="yes" ;;
+ no) enable_libda_gst="no" ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-libda-gst) ;;
esac],
- enable_record_gst="autodetect")
-AC_ARG_ENABLE(record-jack,
- AC_HELP_STRING(--enable-record-jack,
- Enable Jack record backend [[[default=autodetect]]]),
+ enable_libda_gst="autodetect")
+AC_ARG_ENABLE(libda-jack,
+ AC_HELP_STRING(--enable-libda-jack,
+ Enable Jack libda backend [[[default=autodetect]]]),
[case "${enableval}" in
- yes) enable_record_jack="yes" ;;
- no) enable_record_jack="no" ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-record-jack) ;;
+ yes) enable_libda_jack="yes" ;;
+ no) enable_libda_jack="no" ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-libda-jack) ;;
esac],
- enable_record_jack="autodetect")
+ enable_libda_jack="autodetect")
# Check for the standard headers
AC_HEADER_STDC
@@ -174,9 +174,9 @@
AC_CHECK_PROGS(SDLCONFIG, sdl-config, AC_MSG_ERROR(Cannot find sdl-config))
# Record backend detection
-PKG_CHECK_MODULES(alsa, alsa , [record_alsa="yes"] , [record_alsa="no"])
-PKG_CHECK_MODULES(jack, jack , [record_jack="yes"] , [record_jack="no"])
-PKG_CHECK_MODULES(portAudioV19, portaudio-2.0 , [record_pa19="yes"] , [record_pa19="no"])
+PKG_CHECK_MODULES(alsa, alsa , [libda_alsa="yes"] , [libda_alsa="no"])
+PKG_CHECK_MODULES(jack, jack , [libda_jack="yes"] , [libda_jack="no"])
+PKG_CHECK_MODULES(portAudioV19, portaudio-2.0 , [libda_pa19="yes"] , [libda_pa19="no"])
PKG_CHECK_MODULES(ffmpeg, libavutil libavformat libavcodec libswscale, [ffmpeg_detected="yes"],[ffmpeg_detected="no"])
@@ -185,10 +185,10 @@
saved_LIBS=$LIBS
# Only detect pa18 if pa19 is not found (pa19 is detected as pa18 else)
-if test $record_pa19 = no ; then
- AC_CHECK_LIB(portaudio, Pa_Initialize, [record_pa18="yes"] , [record_pa18="no"])
+if test $libda_pa19 = no ; then
+ AC_CHECK_LIB(portaudio, Pa_Initialize, [libda_pa18="yes"] , [libda_pa18="no"])
else
- record_pa18="no"
+ libda_pa18="no"
fi
AC_CHECK_LIB(SDL_image, IMG_LoadPNG_RW,[sdl_image="yes"],[sdl_image="no"])
LIBS=$saved_LIBS
@@ -267,122 +267,122 @@
AC_SUBST(SVG_FLAGS)
AC_SUBST(SVG_LIBS)
-# Configure alsa record backend
-if test $record_alsa = yes ; then
- if test $enable_record_alsa = no ; then
- RECORD_ALSA_FLAGS=""
- RECORD_ALSA_LIBS=""
- RECORD_ALSA=false
+# Configure alsa libda backend
+if test $libda_alsa = yes ; then
+ if test $enable_libda_alsa = no ; then
+ LIBDA_ALSA_FLAGS=""
+ LIBDA_ALSA_LIBS=""
+ LIBDA_ALSA=false
else
- RECORD_ALSA_FLAGS=`pkg-config --cflags alsa`
- RECORD_ALSA_LIBS=`pkg-config --libs alsa`
- RECORD_ALSA=true
+ LIBDA_ALSA_FLAGS=`pkg-config --cflags alsa`
+ LIBDA_ALSA_LIBS=`pkg-config --libs alsa`
+ LIBDA_ALSA=true
fi
else
- if test $enable_record_alsa = yes ; then
+ if test $enable_libda_alsa = yes ; then
AC_MSG_ERROR(Cannot find alsa, but explicitly required)
fi
- RECORD_ALSA_FLAGS=""
- RECORD_ALSA_LIBS=""
- RECORD_ALSA=false
+ LIBDA_ALSA_FLAGS=""
+ LIBDA_ALSA_LIBS=""
+ LIBDA_ALSA=false
fi
-AM_CONDITIONAL(RECORD_ALSA, ${RECORD_ALSA})
-AC_SUBST(RECORD_ALSA_FLAGS)
-AC_SUBST(RECORD_ALSA_LIBS)
+AM_CONDITIONAL(LIBDA_ALSA, ${LIBDA_ALSA})
+AC_SUBST(LIBDA_ALSA_FLAGS)
+AC_SUBST(LIBDA_ALSA_LIBS)
-# Configure jack record backend
-if test $record_jack = yes ; then
- if test $enable_record_jack = no ; then
- RECORD_JACK_FLAGS=""
- RECORD_JACK_LIBS=""
- RECORD_JACK=false
+# Configure jack libda backend
+if test $libda_jack = yes ; then
+ if test $enable_libda_jack = no ; then
+ LIBDA_JACK_FLAGS=""
+ LIBDA_JACK_LIBS=""
+ LIBDA_JACK=false
else
- RECORD_JACK_FLAGS=`pkg-config --cflags jack`
- RECORD_JACK_LIBS=`pkg-config --libs jack`
- RECORD_JACK=true
+ LIBDA_JACK_FLAGS=`pkg-config --cflags jack`
+ LIBDA_JACK_LIBS=`pkg-config --libs jack`
+ LIBDA_JACK=true
fi
else
- if test $enable_record_jack = yes ; then
+ if test $enable_libda_jack = yes ; then
AC_MSG_ERROR(Cannot find jack, but explicitly required)
fi
- RECORD_JACK_FLAGS=""
- RECORD_JACK_LIBS=""
- RECORD_JACK=false
+ LIBDA_JACK_FLAGS=""
+ LIBDA_JACK_LIBS=""
+ LIBDA_JACK=false
fi
-AM_CONDITIONAL(RECORD_JACK, ${RECORD_JACK})
-AC_SUBST(RECORD_JACK_FLAGS)
-AC_SUBST(RECORD_JACK_LIBS)
+AM_CONDITIONAL(LIBDA_JACK, ${LIBDA_JACK})
+AC_SUBST(LIBDA_JACK_FLAGS)
+AC_SUBST(LIBDA_JACK_LIBS)
-# Configure portaudio record backend
-if test $record_pa18 = no -a $record_pa19 = no -a $enable_record_pa = yes ; then
+# Configure portaudio libda backend
+if test $libda_pa18 = no -a $libda_pa19 = no -a $enable_libda_pa = yes ; then
AC_MSG_ERROR(Cannot find PortAudio (V18 or V19), but explicitly required)
fi
-if test $record_pa18 = yes ; then
- if test $enable_record_pa18 = no ; then
- RECORD_PA18_FLAGS=""
- RECORD_PA18_LIBS=""
- RECORD_PA18=false
+if test $libda_pa18 = yes ; then
+ if test $enable_libda_pa18 = no ; then
+ LIBDA_PA18_FLAGS=""
+ LIBDA_PA18_LIBS=""
+ LIBDA_PA18=false
else
- RECORD_PA18_FLAGS=""
- RECORD_PA18_LIBS="-lportaudio"
- RECORD_PA18=true
+ LIBDA_PA18_FLAGS=""
+ LIBDA_PA18_LIBS="-lportaudio"
+ LIBDA_PA18=true
fi
else
- if test $enable_record_pa18 = yes ; then
+ if test $enable_libda_pa18 = yes ; then
AC_MSG_ERROR(Cannot find PortAudioV18, but explicitly required)
fi
- RECORD_PA18_FLAGS=""
- RECORD_PA18_LIBS=""
- RECORD_PA18=false
+ LIBDA_PA18_FLAGS=""
+ LIBDA_PA18_LIBS=""
+ LIBDA_PA18=false
fi
-AM_CONDITIONAL(RECORD_PA18, ${RECORD_PA18})
-AC_SUBST(RECORD_PA18_FLAGS)
-AC_SUBST(RECORD_PA18_LIBS)
-if test $record_pa19 = yes ; then
- if test $enable_record_pa19 = no ; then
- RECORD_PA19_FLAGS=""
- RECORD_PA19_LIBS=""
- RECORD_PA19=false
+AM_CONDITIONAL(LIBDA_PA18, ${LIBDA_PA18})
+AC_SUBST(LIBDA_PA18_FLAGS)
+AC_SUBST(LIBDA_PA18_LIBS)
+if test $libda_pa19 = yes ; then
+ if test $enable_libda_pa19 = no ; then
+ LIBDA_PA19_FLAGS=""
+ LIBDA_PA19_LIBS=""
+ LIBDA_PA19=false
else
- RECORD_PA19_FLAGS=`pkg-config --cflags portaudio-2.0`
- RECORD_PA19_LIBS=`pkg-config --libs portaudio-2.0`
- RECORD_PA19=true
+ LIBDA_PA19_FLAGS=`pkg-config --cflags portaudio-2.0`
+ LIBDA_PA19_LIBS=`pkg-config --libs portaudio-2.0`
+ LIBDA_PA19=true
fi
else
- if test $enable_record_pa19 = yes ; then
+ if test $enable_libda_pa19 = yes ; then
AC_MSG_ERROR(Cannot find PortAudioV19, but explicitly required)
fi
- RECORD_PA19_FLAGS=""
- RECORD_PA19_LIBS=""
- RECORD_PA19=false
+ LIBDA_PA19_FLAGS=""
+ LIBDA_PA19_LIBS=""
+ LIBDA_PA19=false
fi
-AM_CONDITIONAL(RECORD_PA19, ${RECORD_PA19})
-AC_SUBST(RECORD_PA19_FLAGS)
-AC_SUBST(RECORD_PA19_LIBS)
+AM_CONDITIONAL(LIBDA_PA19, ${LIBDA_PA19})
+AC_SUBST(LIBDA_PA19_FLAGS)
+AC_SUBST(LIBDA_PA19_LIBS)
-# Configure gstreamer record backend
+# Configure gstreamer libda backend
if test $gst_detected = yes ; then
- if test $enable_record_gst = no ; then
- RECORD_GST_FLAGS=""
- RECORD_GST_LIBS=""
- RECORD_GST=false
+ if test $enable_libda_gst = no ; then
+ LIBDA_GST_FLAGS=""
+ LIBDA_GST_LIBS=""
+ LIBDA_GST=false
else
- RECORD_GST_FLAGS=`pkg-config --cflags gstreamer-0.10`
- RECORD_GST_LIBS=`pkg-config --libs gstreamer-0.10`
- RECORD_GST=true
+ LIBDA_GST_FLAGS=`pkg-config --cflags gstreamer-0.10`
+ LIBDA_GST_LIBS=`pkg-config --libs gstreamer-0.10`
+ LIBDA_GST=true
fi
else
- if test $enable_record_gst = yes ; then
+ if test $enable_libda_gst = yes ; then
AC_MSG_ERROR(Cannot find GStreamer, but explicitly required)
fi
- RECORD_GST_FLAGS=""
- RECORD_GST_LIBS=""
- RECORD_GST=false
+ LIBDA_GST_FLAGS=""
+ LIBDA_GST_LIBS=""
+ LIBDA_GST=false
fi
-AM_CONDITIONAL(RECORD_GST, ${RECORD_GST})
-AC_SUBST(RECORD_GST_FLAGS)
-AC_SUBST(RECORD_GST_LIBS)
+AM_CONDITIONAL(LIBDA_GST, ${LIBDA_GST})
+AC_SUBST(LIBDA_GST_FLAGS)
+AC_SUBST(LIBDA_GST_LIBS)
# Do things for video
case $video_layer in
@@ -556,21 +556,21 @@
echo "debug | --{enable,disable}-debug | $debug "
echo "audio | --with-audio | $audio_layer "
echo "video | --with-video | $video_layer "
-echo "record | --with-record-{} | none "
+echo "libda | --with-libda-{} | none "
echo " | | ~tone "
-if test ${RECORD_ALSA} = true ; then
+if test ${LIBDA_ALSA} = true ; then
echo " | | alsa "
fi
-if test ${RECORD_PA18} = true ; then
+if test ${LIBDA_PA18} = true ; then
echo " | | portaudio V18 "
fi
-if test ${RECORD_PA19} = true ; then
+if test ${LIBDA_PA19} = true ; then
echo " | | portaudio V19 "
fi
-if test ${RECORD_GST} = true ; then
+if test ${LIBDA_GST} = true ; then
echo " | | gstreamer "
fi
-if test ${RECORD_JACK} = true ; then
+if test ${LIBDA_JACK} = true ; then
echo " | | jack "
fi
echo " "
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|