Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
598b836c
Commit
598b836c
authored
Feb 07, 2005
by
llea
Browse files
Fix compilation without -alsa
parent
379990ae
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/audiortp.cpp
View file @
598b836c
...
...
@@ -68,13 +68,13 @@ AudioRtp::createNewSession (SipCall *ca) {
symetric
=
true
;
}
if
(
manager
->
useAlsa
)
{
RTXThread
=
new
AudioRtpRTX
(
ca
,
manager
->
audiodriver
,
#
if
def ALSA
RTXThread
=
new
AudioRtpRTX
(
ca
,
manager
->
audiodriver
,
manager
->
audiodriverReadAlsa
,
manager
,
symetric
);
}
else
{
RTXThread
=
new
AudioRtpRTX
(
ca
,
manager
->
audiodriver
,
NULL
,
manager
,
#
else
RTXThread
=
new
AudioRtpRTX
(
ca
,
manager
->
audiodriver
,
NULL
,
manager
,
symetric
);
}
#endif
if
(
RTXThread
->
start
()
!=
0
)
{
return
-
1
;
...
...
@@ -110,8 +110,9 @@ AudioRtpRTX::AudioRtpRTX (SipCall *sipcall, AudioDrivers *driver,
this
->
ca
=
sipcall
;
this
->
sym
=
sym
;
this
->
audioDevice
=
driver
;
if
(
manager
->
useAlsa
)
this
->
audioDeviceRead
=
read_driver
;
#ifdef ALSA
this
->
audioDeviceRead
=
read_driver
;
#endif
// TODO: Change bind address according to user settings.
InetHostAddress
local_ip
(
"0.0.0.0"
);
...
...
@@ -254,18 +255,19 @@ AudioRtpRTX::run (void) {
// Send session
////////////////////////////
if
(
!
manager
->
mute
)
{
if
(
manager
->
useAlsa
)
{
i
=
audioDeviceRead
->
readBuffer
(
data_from_mic
,
320
);
}
else
{
i
=
audioDevice
->
readBuffer
(
data_from_mic
,
320
);
}
#ifdef ALSA
i
=
audioDeviceRead
->
readBuffer
(
data_from_mic
,
320
);
#
else
i
=
audioDevice
->
readBuffer
(
data_from_mic
,
320
);
#endif
}
else
{
// When IP-phone user click on mute button, we read buffer of a
// temp buffer to avoid delay in sound.
if
(
manager
->
useAlsa
)
i
=
audioDeviceRead
->
readBuffer
(
data_mute
,
320
);
else
i
=
audioDevice
->
readBuffer
(
data_mute
,
320
);
#ifdef
i
=
audioDeviceRead
->
readBuffer
(
data_mute
,
320
);
#else
i
=
audioDevice
->
readBuffer
(
data_mute
,
320
);
#endif
}
// TODO : return an error because no sound
...
...
src/manager.cpp
View file @
598b836c
...
...
@@ -141,12 +141,10 @@ Manager::createSettingsPath (void) {
void
Manager
::
selectAudioDriver
(
void
)
{
if
(
Config
::
getb
(
"Audio"
,
"Drivers.driverOSS"
))
{
useAlsa
=
false
;
this
->
audiodriver
=
new
AudioDriversOSS
(
AudioDrivers
::
ReadWrite
);
}
if
(
Config
::
getb
(
"Audio"
,
"Drivers.driverALSA"
))
{
#ifdef ALSA
useAlsa
=
true
;
this
->
audiodriver
=
new
AudioDriversALSA
(
AudioDrivers
::
WriteOnly
);
this
->
audiodriverReadAlsa
=
new
AudioDriversALSA
(
AudioDrivers
::
ReadOnly
);
#endif
...
...
src/manager.h
View file @
598b836c
...
...
@@ -46,7 +46,6 @@ public:
#ifdef ALSA
AudioDrivers
*
audiodriverReadAlsa
;
#endif
bool
useAlsa
;
ToneGenerator
*
tone
;
QString
*
DirectCall
;
// from -p argv
bool
mute
;
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment