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
20bfeefd
Commit
20bfeefd
authored
Aug 12, 2011
by
Tristan Matthews
Browse files
audiolayer: init pointer members
parent
935e59a2
Changes
3
Hide whitespace changes
Inline
Side-by-side
sflphone-common/src/audio/audiolayer.h
View file @
20bfeefd
...
...
@@ -74,8 +74,11 @@ class AudioLayer
,
_isStarted
(
false
)
,
_manager
(
manager
)
,
_urgentRingBuffer
(
SIZEBUF
,
default_id
)
,
_mainBuffer
(
0
)
,
_recorder
(
0
)
,
_indexIn
(
0
)
,
_indexOut
(
0
)
,
_indexRing
(
0
)
,
_audioSampleRate
(
0
)
,
_frameSize
(
0
)
,
_inChannel
(
1
)
...
...
@@ -84,8 +87,9 @@ class AudioLayer
,
_mutex
()
,
_dcblocker
(
0
)
,
_audiofilter
(
0
)
,
_noisesuppressstate
(
false
)
,
_countNotificationTime
(
0
)
,
_time
(
new
ost
::
Time
()
)
{
,
_time
(
new
ost
::
Time
)
{
}
...
...
@@ -94,8 +98,8 @@ class AudioLayer
*/
virtual
~
AudioLayer
(
void
)
{
delete
_time
;
delete
_dcblocker
;
delete
_audiofilter
;
delete
_dcblocker
;
}
virtual
bool
closeLayer
(
void
)
=
0
;
...
...
@@ -241,7 +245,6 @@ class AudioLayer
* Set the audio recorder
*/
void
setRecorderInstance
(
Recordable
*
rec
)
{
_recorder
=
NULL
;
_recorder
=
rec
;
}
...
...
sflphone-common/src/audio/pulseaudio/pulselayer.cpp
View file @
20bfeefd
...
...
@@ -232,19 +232,18 @@ static void playback_overflow_callback (pa_stream* s UNUSED, void* userdata UNUS
PulseLayer
::
PulseLayer
(
ManagerImpl
*
manager
)
:
AudioLayer
(
manager
,
PULSEAUDIO
)
,
context
(
NULL
)
,
m
(
NULL
)
,
playback
(
NULL
)
,
record
(
NULL
)
,
ringtone
(
NULL
)
,
context
(
0
)
,
m
(
0
)
,
playback
(
0
)
,
record
(
0
)
,
ringtone
(
0
)
,
_converter
(
0
)
,
byteCounter
(
0
)
{
_urgentRingBuffer
.
createReadPointer
();
AudioLayer
::
_noisesuppressstate
=
true
;
byteCounter
=
0
;
openLayer
();
}
...
...
sflphone-common/src/audio/pulseaudio/pulselayer.h
View file @
20bfeefd
...
...
@@ -115,14 +115,6 @@ class PulseLayer : public AudioLayer
return
true
;
}
/**
* UNUSED in pulseaudio layer
*/
//std::vector<std::string> getSoundCardsInfo( int stream UNUSED ) {
//std::vector<std::string> tmp;
//return tmp;
//}
/**
* Reduce volume of every audio applications connected to the same sink
*/
...
...
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