Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Makefile.am sound.c sound_esd.c
Added Files:
sound_pa.c
Log Message:
Optionally use PulseAudio to play sounds.
===================================================================
RCS file: /cvs/e/e16/e/src/Makefile.am,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -3 -r1.100 -r1.101
--- Makefile.am 23 Feb 2008 12:17:18 -0000 1.100
+++ Makefile.am 1 Mar 2008 15:22:32 -0000 1.101
@@ -146,7 +146,7 @@
libe16dir = $(pkglibdir)
-libe16_LTLIBRARIES = $(LIBSND_ESD) $(LIBFNT_IFT) $(LIBFNT_XFT) $(LIBFNT_PANGO)
+libe16_LTLIBRARIES = $(LIBSND_ESD) $(LIBSND_PA) $(LIBFNT_IFT) $(LIBFNT_XFT)
$(LIBFNT_PANGO)
if USE_LIBESD
LIBSND_ESD = libsound_esd.la
@@ -156,6 +156,14 @@
libsound_esd_la_LDFLAGS = -module -avoid-version
endif
+if USE_LIBPA
+LIBSND_PA = libsound_pa.la
+libsound_pa_la_SOURCES = sound_pa.c sound_load.c
+libsound_pa_la_CFLAGS = $(PA_CFLAGS)
+libsound_pa_la_LIBADD = $(PA_LIBS)
+libsound_pa_la_LDFLAGS = -module -avoid-version
+endif
+
LIBFNT_IFT = libfont_ift.la
libfont_ift_la_SOURCES = ttfont.c
libfont_ift_la_CFLAGS = $(IMLIB2_CFLAGS)
@@ -180,9 +188,9 @@
else
-MODULE_SRCS = sound_esd.c sound_load.c ttfont.c text_xft.c text_pango.c
-MODULE_LIBS = $(ESD_LIBS) $(PANGO_LIBS) $(XFT_LIBS)
-MODULE_CFLAGS = $(ESD_CFLAGS) $(PANGO_CFLAGS) $(XFT_CFLAGS)
+MODULE_SRCS = sound_esd.c sound_pa.c sound_load.c ttfont.c text_xft.c
text_pango.c
+MODULE_LIBS = $(ESD_LIBS) $(PA_LIBS) $(PANGO_LIBS) $(XFT_LIBS)
+MODULE_CFLAGS = $(ESD_CFLAGS) $(PA_CFLAGS) $(PANGO_CFLAGS) $(XFT_CFLAGS)
endif
===================================================================
RCS file: /cvs/e/e16/e/src/sound.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- sound.c 1 Mar 2008 15:19:54 -0000 1.60
+++ sound.c 1 Mar 2008 15:22:32 -0000 1.61
@@ -52,6 +52,9 @@
#if defined(HAVE_SOUND_ESD)
extern const SoundOps SoundOps_esd;
static const SoundOps *ops = &SoundOps_esd;
+#elif defined(HAVE_SOUND_PA)
+extern const SoundOps SoundOps_pa;
+static const SoundOps *ops = &SoundOps_pa;
#endif
#endif
===================================================================
RCS file: /cvs/e/e16/e/src/sound_esd.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- sound_esd.c 28 Jan 2008 21:20:09 -0000 1.4
+++ sound_esd.c 1 Mar 2008 15:22:32 -0000 1.5
@@ -142,4 +142,4 @@
_sound_esd_Play,
};
-#endif /* HAVE_SOUND && HAVE_LIBESD */
+#endif /* HAVE_SOUND && HAVE_SOUND_ESD */
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
