# HG changeset patch
# User Chris Cannam
# Date 1445260627 -3600
# Node ID a3d73feeb850dc66750f50bbfa7b9c4dfc10b45f
# Parent  d8013f97df3cae53f29f283afcd92983884c5440# Parent  fcc7e62bfac76adcd06c1147b74d1b9e02f7122e
Merge from branch "2.0-integration"

diff -r fcc7e62bfac7 -r a3d73feeb850 CHANGELOG
--- a/CHANGELOG	Mon Oct 19 14:16:55 2015 +0100
+++ b/CHANGELOG	Mon Oct 19 14:17:07 2015 +0100
@@ -1,4 +1,14 @@
 
+Changes in Tony 2.0 since the previous release 1.0:
+
+ * Tony now has a Record button, allowing you to record audio from the
+   microphone and analyse it
+
+ * Graphical rendering and icons now properly support hi-dpi/Retina
+   displays
+
+ * The playback speed dial uses a more sensible scale
+	
 Changes in Tony 1.0 since the previous release 0.6:
 
  * The underlying pYin analysis plugin has been updated; more analysis
diff -r fcc7e62bfac7 -r a3d73feeb850 src/MainWindow.cpp
--- a/src/MainWindow.cpp	Mon Oct 19 14:16:55 2015 +0100
+++ b/src/MainWindow.cpp	Mon Oct 19 14:17:07 2015 +0100
@@ -1430,10 +1430,6 @@
     emit canExportNotes(haveNotes);
     emit canSnapNotes(haveSelection && haveNotes);
 
-    cerr << "haveWaveform = " << haveWaveform << endl;
-    cerr << "haveMainModel = " << haveMainModel << endl;
-    cerr << "havePlayTarget = " << havePlayTarget << endl;
-    
     emit canPlayWaveform(haveWaveform && haveMainModel && havePlayTarget);
     emit canPlayPitch(havePitchTrack && haveMainModel && havePlayTarget);
     emit canPlayNotes(haveNotes && haveMainModel && havePlayTarget);
@@ -3222,7 +3218,7 @@
         .arg(QT_VERSION_STR);
 
     aboutText += 
-        "<p>Copyright &copy; 2005&ndash;2014 Chris Cannam, Queen Mary University of London, and the Tony project authors: Matthias Mauch, George Fazekas, Justin Salamon, and Rachel Bittner.</p>"
+        "<p>Copyright &copy; 2005&ndash;2015 Chris Cannam, Queen Mary University of London, and the Tony project authors: Matthias Mauch, George Fazekas, Justin Salamon, and Rachel Bittner.</p>"
         "<p>pYIN analysis plugin written by Matthias Mauch.</p>"
         "<p>This program is free software; you can redistribute it and/or "
         "modify it under the terms of the GNU General Public License as "