Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
b399adc0
Commit
b399adc0
authored
Sep 02, 2005
by
jpbl
Browse files
removed the input/output audio difference
parent
48a1081d
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/audio/audiolayer.cpp
View file @
b399adc0
...
...
@@ -55,20 +55,20 @@ AudioLayer::closeStream (void)
}
void
AudioLayer
::
openDevice
(
int
outputIndex
,
int
inputI
ndex
)
AudioLayer
::
openDevice
(
int
i
ndex
)
{
closeStream
();
// Set up the parameters required to open a (Callback)Stream:
portaudio
::
DirectionSpecificStreamParameters
outParams
(
portaudio
::
System
::
instance
().
deviceByIndex
(
outputI
ndex
),
outParams
(
portaudio
::
System
::
instance
().
deviceByIndex
(
i
ndex
),
2
,
portaudio
::
INT16
,
true
,
portaudio
::
System
::
instance
().
deviceByIndex
(
outputI
ndex
).
defaultLowOutputLatency
(),
portaudio
::
System
::
instance
().
deviceByIndex
(
i
ndex
).
defaultLowOutputLatency
(),
NULL
);
portaudio
::
DirectionSpecificStreamParameters
inParams
(
portaudio
::
System
::
instance
().
deviceByIndex
(
in
putIn
dex
),
inParams
(
portaudio
::
System
::
instance
().
deviceByIndex
(
index
),
2
,
portaudio
::
INT16
,
true
,
portaudio
::
System
::
instance
().
deviceByIndex
(
in
putIn
dex
).
defaultLowInputLatency
(),
portaudio
::
System
::
instance
().
deviceByIndex
(
index
).
defaultLowInputLatency
(),
NULL
);
portaudio
::
StreamParameters
const
params
(
inParams
,
outParams
,
...
...
src/audio/audiolayer.h
View file @
b399adc0
...
...
@@ -42,7 +42,7 @@ public:
AudioLayer
();
~
AudioLayer
(
void
);
void
openDevice
(
int
,
int
);
void
openDevice
(
int
);
void
startStream
(
void
);
void
stopStream
(
void
);
void
sleep
(
int
);
...
...
src/gui/qt/configurationpanel.ui.h
View file @
b399adc0
...
...
@@ -111,7 +111,7 @@ void ConfigurationPanel::init()
((
QRadioButton
*
)
stunButtonGroup
->
find
(
get_config_fields_int
(
SIGNALISATION
,
USE_STUN
)))
->
setChecked
(
true
);
// For audio tab
((
QRadioButton
*
)
DriverChoice
->
find
(
get_config_fields_int
(
AUDIO
,
OUTPUT_
DRIVER_NAME
)))
->
setChecked
(
true
);
((
QRadioButton
*
)
DriverChoice
->
find
(
get_config_fields_int
(
AUDIO
,
DRIVER_NAME
)))
->
setChecked
(
true
);
codec1
->
setCurrentText
(
QString
(
get_config_fields_str
(
AUDIO
,
CODEC1
)));
codec2
->
setCurrentText
(
QString
(
get_config_fields_str
(
AUDIO
,
CODEC2
)));
...
...
src/managerimpl.cpp
View file @
b399adc0
...
...
@@ -874,8 +874,7 @@ ManagerImpl::initConfigFile (void)
fill_config_fields_str
(
SIGNALISATION
,
STUN_SERVER
,
DFT_STUN_SERVER
);
fill_config_fields_int
(
SIGNALISATION
,
USE_STUN
,
NO
);
fill_config_fields_int
(
AUDIO
,
OUTPUT_DRIVER_NAME
,
DFT_DRIVER
);
fill_config_fields_int
(
AUDIO
,
INPUT_DRIVER_NAME
,
DFT_DRIVER
);
fill_config_fields_int
(
AUDIO
,
DRIVER_NAME
,
DFT_DRIVER
);
fill_config_fields_int
(
AUDIO
,
NB_CODEC
,
DFT_NB_CODEC
);
fill_config_fields_str
(
AUDIO
,
CODEC1
,
DFT_CODEC
);
fill_config_fields_str
(
AUDIO
,
CODEC2
,
DFT_CODEC
);
...
...
@@ -915,8 +914,7 @@ ManagerImpl::selectAudioDriver (void)
#if defined(AUDIO_PORTAUDIO)
_audiodriverPA
=
new
AudioLayer
();
_audiodriverPA
->
openDevice
(
get_config_fields_int
(
AUDIO
,
OUTPUT_DRIVER_NAME
),
get_config_fields_int
(
AUDIO
,
INPUT_DRIVER_NAME
));
_audiodriverPA
->
openDevice
(
get_config_fields_int
(
AUDIO
,
DRIVER_NAME
));
#else
# error You must define one AUDIO driver to use.
#endif
...
...
src/user_cfg.h
View file @
b399adc0
...
...
@@ -63,8 +63,7 @@
#define SEND_DTMF_AS "DTMF.sendDTMFas"
#define STUN_SERVER "STUN.STUNserver"
#define USE_STUN "STUN.useStun"
#define OUTPUT_DRIVER_NAME "Drivers.outputDriverName"
#define INPUT_DRIVER_NAME "Drivers.inputDriverName"
#define DRIVER_NAME "Drivers.driverName"
#define NB_CODEC "Codecs.nbCodec"
#define CODEC1 "Codecs.codec1"
#define CODEC2 "Codecs.codec2"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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