Enlightenment CVS committal
Author : tsauerbeck
Project : misc
Module : eplayer
Dir : misc/eplayer
Modified Files:
.cvsignore ChangeLog README autogen.sh configure.ac
Log Message:
Replaced libao by our own plugin system. At the moment, there's only an OSS plugin,
ALSA will probably follow soon. See ChangeLog for details ;)
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- .cvsignore 16 Oct 2003 14:54:33 -0000 1.1
+++ .cvsignore 21 Oct 2003 17:53:38 -0000 1.2
@@ -14,4 +14,4 @@
missing
mkinstalldirs
stamp-h1
-
+libtool
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ChangeLog 18 Oct 2003 15:25:35 -0000 1.9
+++ ChangeLog 21 Oct 2003 17:53:38 -0000 1.10
@@ -1,4 +1,14 @@
-$Id: ChangeLog,v 1.9 2003/10/18 15:25:35 tsauerbeck Exp $
+$Id: ChangeLog,v 1.10 2003/10/21 17:53:38 tsauerbeck Exp $
+
+2003-10-21 Tilman Sauerbeck <[EMAIL PROTECTED]>
+ * configure.ac: check for sys/soundcard.h to determine whether
+ the OSS output plugin should be built
+ * src/vorbis.c, src/output: added output plugin stuff to replace
+ libao
+ * src/output/oss/oss.c: added OSS output plugin
+ * src/mixer.c, src/mixer.h: removed, mixer is controlled by the
+ output plugin now
+ * misc other stuff
2003-10-18 Tilman Sauerbeck <[EMAIL PROTECTED]>
* src/vorbis.c: track_open() initializes the "time_text"
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- README 15 Oct 2003 16:19:00 -0000 1.2
+++ README 21 Oct 2003 17:53:38 -0000 1.3
@@ -8,8 +8,8 @@
found here:
http://xiph.org/ogg/vorbis/
-It relies on libvorbis, libvorbisfile, libao, and libogg. Further, it uses Ecore(2)
and EVAS
-for the interface.
+It relies on libvorbis, libvorbisfile and libogg. Further, it uses
+Ecore(2), EVAS and Edje for the interface.
--------------------------------------------------------------------------------------------
FAQ
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/autogen.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- autogen.sh 15 Oct 2003 16:54:01 -0000 1.2
+++ autogen.sh 21 Oct 2003 17:53:38 -0000 1.3
@@ -2,7 +2,11 @@
## Script to bootstrap the build enviroment
+rm -rf autom4te.cache
+rm -f aclocal.m4
+
aclocal $ACLOCAL_FLAGS -I m4
-autoconf
autoheader
+autoconf
+libtoolize --automake
automake --add-missing --copy --gnu
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- configure.ac 16 Oct 2003 17:25:40 -0000 1.4
+++ configure.ac 21 Oct 2003 17:53:38 -0000 1.5
@@ -1,3 +1,5 @@
+# $Id: configure.ac,v 1.5 2003/10/21 17:53:38 tsauerbeck Exp $
+
AC_INIT(src/eplayer.c)
AM_CONFIG_HEADER(config.h)
@@ -9,25 +11,42 @@
AC_PROG_INSTALL
AC_HEADER_STDC
AC_C_BIGENDIAN
+AM_DISABLE_STATIC
+AC_PROG_LIBTOOL
AC_EXPAND_DIR(DATA_DIR, "$datadir/eplayer")
AC_DEFINE_UNQUOTED(DATA_DIR, "$DATA_DIR", [Directory to install data files in])
+AC_EXPAND_DIR(PLUGIN_DIR, "$libdir/eplayer")
+AC_DEFINE_UNQUOTED(PLUGIN_DIR, "$PLUGIN_DIR", [Directory to install plugins in])
+AC_SUBST(PLUGIN_DIR)
+
AC_ARG_ENABLE(debug,
[ --enable-debug debug build (default: no)], [
AC_DEFINE([DEBUG], [], [Define to 1 if you want debugging output])
CFLAGS=`echo "$CFLAGS -g -Wall" | sed s/" -s"//`
])
+dnl Check for libdl
+tmp=$LIBS
+AC_CHECK_HEADERS(dlfcn.h, , AC_MSG_ERROR(Cannot find dlfcn.h))
+AC_CHECK_LIB(dl, dlsym, DL_LIBS="-ldl", AC_MSG_ERROR(Cannot find libdl))
+AC_SUBST(DL_LIBS)
+LIBS=$tmp
+
dnl I'd like to use XIPH_PATH_VORBIS here, but it seems to be quite
dnl unstable and there's no pkgconfig file either :/
+tmp=$LIBS
+
AC_CHECK_LIB(vorbis, vorbis_info_init, ,
AC_MSG_ERROR(Cannot find libvorbis))
AC_CHECK_LIB(vorbisfile, ov_open, ,
AC_MSG_ERROR(Cannot find libvorbisfile))
-XIPH_PATH_AO(, AC_MSG_ERROR(Cannot find libao))
+VORBIS_LIBS="-lvorbis -lvorbisfile -logg"
+AC_SUBST(VORBIS_LIBS)
+LIBS=$tmp
AC_PATH_GENERIC(ecore, , ,
AC_MSG_ERROR(Cannot find ecore: Is ecore-config in path?))
@@ -41,6 +60,17 @@
AC_PATH_GENERIC(esmart, , ,
AC_MSG_ERROR(Cannot find esmart: Is esmart-config in path?))
+dnl Check for OSS
+AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h)
+
+if test "${ac_cv_header_sys_soundcard_h}" = "yes" || test
"${ac_cv_header_machine_soundcard_h}" = "yes"; then
+ have_oss="yes"
+else
+ have_oss="no"
+fi
+
+AM_CONDITIONAL(HAVE_OSS, test "$have_oss" = "yes")
+
AC_OUTPUT([
Makefile
data/Makefile
@@ -48,4 +78,14 @@
data/images/Makefile
m4/Makefile
src/Makefile
+src/output/Makefile
+src/output/oss/Makefile
])
+
+echo
+echo "$PACKAGE $VERSION"
+echo
+echo "Output Plugins"
+echo
+echo "OSS...........: ${ac_cv_header_sys_soundcard_h}"
+echo
-------------------------------------------------------
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
