Remove debug from audiolayer and modify LIBS flags so that qt don't be compiled into sflphoned

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

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])

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;
 }
 

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)