Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
006ccecb
Commit
006ccecb
authored
19 years ago
by
jpbl
Browse files
Options
Downloads
Patches
Plain Diff
put the new Audio stuff to be a maintener stuff (--enable-maintener)
parent
66da2307
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
configure.ac
+17
-0
17 additions, 0 deletions
configure.ac
src/audio/Makefile.am
+5
-1
5 additions, 1 deletion
src/audio/Makefile.am
src/audio/OpenAL/OpenALLayer.cpp
+10
-1
10 additions, 1 deletion
src/audio/OpenAL/OpenALLayer.cpp
with
32 additions
and
2 deletions
configure.ac
+
17
−
0
View file @
006ccecb
...
...
@@ -163,6 +163,23 @@ fi
sflphone_datadir=$datadir/sflphone
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)
AM_CONDITIONAL(USE_ZEROCONF, test "$have_libdns_sd" = "yes")
...
...
This diff is collapsed.
Click to expand it.
src/audio/Makefile.am
+
5
−
1
View file @
006ccecb
SUBDIRS
=
gsm pacpp OpenAL
if
MAINTENER_CODE
maintener_directories
=
OpenAL
endif
SUBDIRS
=
gsm pacpp
${
maintener_directories
}
noinst_LTLIBRARIES
=
libaudio.la
...
...
This diff is collapsed.
Click to expand it.
src/audio/OpenAL/OpenALLayer.cpp
+
10
−
1
View file @
006ccecb
...
...
@@ -26,6 +26,8 @@
#include
<AL/al.h>
#include
<AL/alc.h>
#define DEFAULT_DEVICE_NAME "default"
SFLAudio
::
OpenALLayer
::
OpenALLayer
()
:
AudioLayer
(
"openal"
)
{}
...
...
@@ -42,6 +44,10 @@ SFLAudio::OpenALLayer::getDevicesNames()
devname
+=
sizeof
(
ALCchar
)
*
(
strlen
(
devname
)
+
1
);
}
}
else
{
devices
.
push_back
(
DEFAULT_DEVICE_NAME
);
}
return
devices
;
...
...
@@ -51,7 +57,10 @@ SFLAudio::Device *
SFLAudio
::
OpenALLayer
::
openDevice
()
{
Device
*
dev
=
new
OpenALDevice
();
if
(
dev
->
load
()
==
false
)
{
if
(
dev
->
load
())
{
dev
->
setName
(
DEFAULT_DEVICE_NAME
);
}
else
{
delete
dev
;
dev
=
new
NullDevice
();
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment