# HG changeset patch
# User Chris Cannam
# Date 1368525327 -3600
# Node ID c379b43935ef7e8c6d99b1d4335e76c3d948d067
# Parent  a2eb9de7302e38e0b54ab1fe7f2ae8754494a6e2# Parent  2bd629a29fa351960d973d84d01a647e0364324b
Merge

diff -r a2eb9de7302e -r c379b43935ef configure
--- a/configure	Tue May 14 09:54:27 2013 +0100
+++ b/configure	Tue May 14 10:55:27 2013 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for SVcore 1.8.
+# Generated by GNU Autoconf 2.69 for SVcore 2.1.
 #
 # Report bugs to <cannam@all-day-breakfast.com>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='SVcore'
 PACKAGE_TARNAME='svcore'
-PACKAGE_VERSION='1.8'
-PACKAGE_STRING='SVcore 1.8'
+PACKAGE_VERSION='2.1'
+PACKAGE_STRING='SVcore 2.1'
 PACKAGE_BUGREPORT='cannam@all-day-breakfast.com'
 PACKAGE_URL=''
 
@@ -1319,7 +1319,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures SVcore 1.8 to adapt to many kinds of systems.
+\`configure' configures SVcore 2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1380,7 +1380,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of SVcore 1.8:";;
+     short | recursive ) echo "Configuration of SVcore 2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1525,7 +1525,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-SVcore configure 1.8
+SVcore configure 2.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1865,7 +1865,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by SVcore $as_me 1.8, which was
+It was created by SVcore $as_me 2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -7417,7 +7417,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by SVcore $as_me 1.8, which was
+This file was extended by SVcore $as_me 2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7470,7 +7470,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-SVcore config.status 1.8
+SVcore config.status 2.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -8044,7 +8044,7 @@
 fi
 
 
-if ! $QMAKE -r; then
+if ! $QMAKE -r svcore.pro; then
    as_fn_error $? "qmake failed: Command was \"$QMAKE -r\"" "$LINENO" 5
 fi
 
@@ -8056,7 +8056,7 @@
 
 The file config.pri contains the configuration settings for
 qmake.  If you want to adjust these by hand, edit config.pri
-and run \"qmake -r\" again to regenerate the Makefile.
+and run \"$QMAKE -r\" again to regenerate the Makefile.
 " >&5
 $as_echo "$as_me:
 
@@ -8066,5 +8066,5 @@
 
 The file config.pri contains the configuration settings for
 qmake.  If you want to adjust these by hand, edit config.pri
-and run \"qmake -r\" again to regenerate the Makefile.
+and run \"$QMAKE -r\" again to regenerate the Makefile.
 " >&6;}
diff -r a2eb9de7302e -r c379b43935ef configure.ac
--- a/configure.ac	Tue May 14 09:54:27 2013 +0100
+++ b/configure.ac	Tue May 14 10:55:27 2013 +0100
@@ -1,5 +1,5 @@
 
-AC_INIT(SVcore, 1.8, cannam@all-day-breakfast.com)
+AC_INIT([SVcore], [2.1], cannam@all-day-breakfast.com)
 
 AC_CONFIG_SRCDIR(base/Pitch.h)
 
@@ -114,7 +114,7 @@
 
 AC_OUTPUT
 
-if ! $QMAKE -r; then
+if ! $QMAKE -r svcore.pro; then
    AC_MSG_ERROR([qmake failed: Command was "$QMAKE -r"])
 fi
 
@@ -126,5 +126,5 @@
 
 The file config.pri contains the configuration settings for
 qmake.  If you want to adjust these by hand, edit config.pri
-and run "qmake -r" again to regenerate the Makefile.
+and run "$QMAKE -r" again to regenerate the Makefile.
 ])
diff -r a2eb9de7302e -r c379b43935ef data/fileio/test/test.pro
--- a/data/fileio/test/test.pro	Tue May 14 09:54:27 2013 +0100
+++ b/data/fileio/test/test.pro	Tue May 14 10:55:27 2013 +0100
@@ -1,7 +1,7 @@
 
 TEMPLATE = app
 
-LIBS += -L../../.. -L../../../debug -L../../../../dataquay -lsvcore -ldataquay
+LIBS += -L../../.. -L../../../release -L../../../../dataquay/release -lsvcore -ldataquay
 
 win32-g++ {
     INCLUDEPATH += ../../../../sv-dependency-builds/win32-mingw/include
diff -r a2eb9de7302e -r c379b43935ef transform/FeatureExtractionModelTransformer.cpp
--- a/transform/FeatureExtractionModelTransformer.cpp	Tue May 14 09:54:27 2013 +0100
+++ b/transform/FeatureExtractionModelTransformer.cpp	Tue May 14 10:55:27 2013 +0100
@@ -681,8 +681,6 @@
  
         frame = lrintf((m_fixedRateFeatureNo / m_descriptor->sampleRate)
                        * inputRate);
-
-//        std::cerr << "Feature hasTimestamp = " << feature.hasTimestamp << ", timestamp = " << feature.timestamp << ", frame works out to " << frame << std::endl;
     }
 	
     // Rather than repeat the complicated tests from the constructor