From bac53689eb922b00f950bda858c7f431f9d27b96 Mon Sep 17 00:00:00 2001
From: yanmorin <yanmorin>
Date: Mon, 7 Aug 2006 17:36:44 +0000
Subject: [PATCH] Remove debug from audiolayer and modify LIBS flags so that qt
don't be compiled into sflphoned
---
INSTALL | 16 ++++++++--------
m4/gwqt.m4 | 3 ++-
src/audio/audiolayer.cpp | 7 -------
src/gui/qt/Makefile.am | 3 ++-
4 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/INSTALL b/INSTALL
index 23e5f25d0e..56b077d6a0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -102,16 +102,16 @@ for another architecture.
Installation Names
==================
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc. You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
+give `configure' the option `--exec-prefix=PREFIX', the package will
+use PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
@@ -159,7 +159,7 @@ where SYSTEM can have one of these forms:
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
+use the `--target=TYPE' option to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
diff --git a/m4/gwqt.m4 b/m4/gwqt.m4
index e4fda76fef..15cc013659 100644
--- a/m4/gwqt.m4
+++ b/m4/gwqt.m4
@@ -241,7 +241,8 @@ if test x$QT_IS_STATIC = xyes ; then
OLDLIBS="$LIBS"
LIBS="$QT_LDADD"
AC_CHECK_LIB(Xft, XftFontOpen, QT_LDADD="$QT_LDADD -lXft")
- LIBS="$LIBS"
+dnl LIBS="$LIBS"
+ LIBS=""
fi
AC_MSG_CHECKING([QT_CXXFLAGS])
diff --git a/src/audio/audiolayer.cpp b/src/audio/audiolayer.cpp
index 9696c434de..c6b50cd86e 100644
--- a/src/audio/audiolayer.cpp
+++ b/src/audio/audiolayer.cpp
@@ -270,7 +270,6 @@ AudioLayer::audioCallback (const void *inputBuffer, void *outputBuffer,
// Urgent data (dtmf, incoming call signal) come first.
toGet = (urgentAvail < (int)(framesPerBuffer * sizeof(int16) * _outChannel)) ? urgentAvail : framesPerBuffer * sizeof(int16) * _outChannel;
_urgentRingBuffer.Get(out, toGet, spkrVolume);
- _debug("out: %p, toGet: %d, spkrVolume: %d\n", out, toGet, spkrVolume);
// Consume the regular one as well (same amount of bytes)
_mainSndRingBuffer.Discard(toGet);
@@ -288,11 +287,7 @@ AudioLayer::audioCallback (const void *inputBuffer, void *outputBuffer,
if (toGet) {
_mainSndRingBuffer.Get(out, toGet, spkrVolume);
} else {
- //_debug("padding %d...\n", (int)(framesPerBuffer * sizeof(int16)*_outChannel));
- //_mainSndRingBuffer.debug();
- //portaudio::System::instance().sleep(framesPerBuffer*sizeof(int16));
bzero(out, framesPerBuffer * sizeof(int16) * _outChannel);
-
}
}
}
@@ -302,8 +297,6 @@ AudioLayer::audioCallback (const void *inputBuffer, void *outputBuffer,
toPut = (micAvailPut <= (int)(framesPerBuffer * sizeof(int16) * _inChannel)) ? micAvailPut : framesPerBuffer * sizeof(int16) * _inChannel;
_micRingBuffer.Put(in, toPut, micVolume );
- if (toPut==0 && toGet==0) { return 1; }
-
return paContinue;
}
diff --git a/src/gui/qt/Makefile.am b/src/gui/qt/Makefile.am
index fed6a4e339..5fa20d1e35 100644
--- a/src/gui/qt/Makefile.am
+++ b/src/gui/qt/Makefile.am
@@ -115,7 +115,8 @@ CLEANFILES = \
$(BUILT_SOURCES)
sflphone_qt_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DDATADIR=\"$(sflphone_datadir)\"
-sflphone_qt_LDADD = $(top_srcdir)/libs/taxidermy/libtaxidermy.la
+# add QT_LIBS because LIBS conflicts in sflphone.la and was set to "" in m4/gwqt.m4
+sflphone_qt_LDADD = $(top_srcdir)/libs/taxidermy/libtaxidermy.la $(QT_LIBS)
AM_CPPFLAGS = -I$(top_srcdir)/libs/ $(QT_CXXFLAGS) $(X_INCLUDES) $(all_includes)
AM_LDFLAGS = $(QT_LDADD) $(X_LDFLAGS) $(all_libraries)
--
GitLab