changeset 452:102356764938

Merge

--- a/README	Tue Mar 31 18:02:03 2015 +0100
+++ b/README	Tue Mar 31 18:04:14 2015 +0100
@@ -11,40 +11,12 @@
 Features
 ========
 
- * robust monophonic pitch track extraction
+ * robust monophonic pitch track extraction (using pYIN)
  * note track extraction
- * facility to adjust the note track
- * note pitch adjusts to pitch track when notes are split
+ * facility to manually adjust pitch track and note track
+ * note pitch automatically snaps to pitch track
  * import/export of pitch track and note track
-
-
-Warning
-=======
-
-This program is still a prototype, which may change, and which
-generally may not have the functionality you'd expect.
-
-
-Note Editing
-============
-
-A particular problem (see Warning, above) is the opaque editing
-procedure. In order to edit notes, enter the multi-tool mode by
-selecting the move button in the toolbar. There are four ways in which
-you can change a note:
-
- 1. by clicking on the upper half of a note and dragging you can move
-    the note
- 2. by clicking on the beginning or end of a note and dragging you can
-    change the onset or offset time
- 3. by clicking into the bottom part of a note you can split the note
-    (this will recalculate the pitch of the resulting new notes)
- 4. by shift-clicking into the bottom part of a note you can delete
-    the note
-
-By double-clicking into an empty part of the timeline you can create a
-new note.
-
+ * some more
 
 Authors, Citation, License and Use
 ==================================
@@ -52,7 +24,7 @@
 Tony was developed at Queen Mary, University of London in
 collaboration with New York University.
 
-Code copyright 2005-2014 Chris Cannam, Queen Mary University of
+Code copyright 2005-2015 Chris Cannam, Queen Mary University of
 London, and the Tony project authors: Matthias Mauch, George Fazekas,
 Justin Salamon, and Rachel Bittner, except where indicated in the
 individual source files. Thanks also to Simon Dixon and Juan Bello.