Commit e241c935 authored by jpbl's avatar jpbl

correct uses of Manager singleton

parent 540cadec
......@@ -92,11 +92,10 @@ dnl AC_SUBST(LIBQT)
if test $ac_cv_header_portaudio_h = no; then
AC_MSG_ERROR([*** missing portaudio.h. You need a working PortAudio installation. See http://www.portaudio.com])
fi
AC_CHECK_LIB([portaudio], [Pa_GetDeviceCount], [
else
portaudio_LIBS="-lportaudio "
portaudio_CFLAGS="-DAUDIO_PORTAUDIO "],
[AC_MSG_ERROR([*** missing portaudio V19 library. You need a working PortAudio installation. See http://www.portaudio.com])])
portaudio_CFLAGS="-DAUDIO_PORTAUDIO "
fi
SFLPHONE_LIBS="$SFLPHONE_LIBS $portaudio_LIBS"
SFLPHONE_CXXFLAGS=="$SFLPHONE_CXXFLAGS $portaudio_CFLAGS"
......
......@@ -201,9 +201,8 @@ AudioLayer::audioCallback (const void *inputBuffer, void *outputBuffer,
int urgentAvail, // number of int16 right and int16 left
normalAvail, // number of int16 right and int16 left
micAvailPut;
ManagerImpl& _manager = Manager::instance();
unsigned short spkrVolume = _manager.getSpkrVolume();
unsigned short micVolume = _manager.getMicVolume();
unsigned short spkrVolume = Manager::instance().getSpkrVolume();
unsigned short micVolume = Manager::instance().getMicVolume();
// AvailForGet tell the number of chars inside the buffer
// framePerBuffer are the number of int16 for one channel (left)
......@@ -217,7 +216,7 @@ AudioLayer::audioCallback (const void *inputBuffer, void *outputBuffer,
_mainSndRingBuffer.Discard(toGet);
}
else {
Tone* tone = _manager.getTelephoneTone();
Tone* tone = Manager::instance().getTelephoneTone();
if ( tone != 0) {
tone->getNext(out, framesPerBuffer, spkrVolume);
} else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment