jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

put the new Audio stuff to be a maintener stuff (--enable-maintener)

Browse Source
This commit is contained in:
jpbl
2006-01-11 14:53:52 +00:00
parent 66da23071c
commit 006ccecb29
3 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
configure.ac
View File

@ -163,6 +163,23 @@ fi
sflphone_datadir=$datadir/sflphone sflphone_datadir=$datadir/sflphone
AC_SUBST(sflphone_datadir) AC_SUBST(sflphone_datadir)
AC_MSG_CHECKING([whether to enable the maintener code])
AC_ARG_ENABLE(maintener,
[ --enable-maintener Enable maintener code [default=no]],
[
CXXFLAGS="$CXXFLAGS -DENABLE_MAINTENER"
AC_MSG_RESULT(yes)
maintener="yes"
],
[
AC_MSG_RESULT(no)
maintener="no"
]
)
AM_CONDITIONAL(MAINTENER_CODE, test x$maintener = xyes)
AC_SUBST(LIB_DNSSD) AC_SUBST(LIB_DNSSD)
AM_CONDITIONAL(USE_ZEROCONF, test "$have_libdns_sd" = "yes") AM_CONDITIONAL(USE_ZEROCONF, test "$have_libdns_sd" = "yes")

6
src/audio/Makefile.am
View File

@ -1,4 +1,8 @@
SUBDIRS = gsm pacpp OpenAL if MAINTENER_CODE
maintener_directories = OpenAL
endif
SUBDIRS = gsm pacpp ${maintener_directories}
noinst_LTLIBRARIES = libaudio.la noinst_LTLIBRARIES = libaudio.la

11
src/audio/OpenAL/OpenALLayer.cpp
View File

@ -26,6 +26,8 @@
#include <AL/al.h> #include <AL/al.h>
#include <AL/alc.h> #include <AL/alc.h>
#define DEFAULT_DEVICE_NAME "default"
SFLAudio::OpenALLayer::OpenALLayer() SFLAudio::OpenALLayer::OpenALLayer()
: AudioLayer("openal") : AudioLayer("openal")
{} {}
@ -42,6 +44,10 @@ SFLAudio::OpenALLayer::getDevicesNames()
devname += sizeof(ALCchar) * (strlen(devname) + 1); devname += sizeof(ALCchar) * (strlen(devname) + 1);
} }
} }
else {
devices.push_back(DEFAULT_DEVICE_NAME);
}
return devices; return devices;
@ -51,7 +57,10 @@ SFLAudio::Device *
SFLAudio::OpenALLayer::openDevice() SFLAudio::OpenALLayer::openDevice()
{ {
Device *dev = new OpenALDevice(); Device *dev = new OpenALDevice();
if(dev->load() == false) { if(dev->load()) {
dev->setName(DEFAULT_DEVICE_NAME);
}
else {
delete dev; delete dev;
dev = new NullDevice(); dev = new NullDevice();
} }