Mercurial > hg > sonic-annotator

changeset 345:1286914e4fe0 by-id

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to compatibility with by-id branch of svcore
author Chris Cannam
date Tue, 09 Jul 2019 10:30:41 +0100
parents 54618edac669
children 90169412b1a7
files repoint-lock.json repoint-project.json runner/MIDIFeatureWriter.h
diffstat 3 files changed, 18 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/repoint-lock.json	Mon Feb 04 10:21:20 2019 +0000
+++ b/repoint-lock.json	Tue Jul 09 10:30:41 2019 +0100
@@ -1,25 +1,25 @@
 {
   "libraries": {
     "vamp-plugin-sdk": {
-      "pin": "da86fb0bccb3"
+      "pin": "62987b6d6a3b"
     },
     "svcore": {
-      "pin": "8aa1447fe27e"
+      "pin": "9945ad04c174"
     },
     "checker": {
-      "pin": "5c60e26e16ca"
+      "pin": "c8c17e51aab0"
     },
     "piper-vamp-cpp": {
       "pin": "0e3328c6091f59c912e25bc392a7dc75182be1c7"
     },
     "dataquay": {
-      "pin": "807b55408d9e"
+      "pin": "b82360a98f49"
     },
     "bqvec": {
-      "pin": "be1ce11183f4"
+      "pin": "c2d355c29372"
     },
     "bqfft": {
-      "pin": "a766fe47501b"
+      "pin": "ff1d1bd48876"
     },
     "bqresample": {
       "pin": "f5dee7d40378"
@@ -28,10 +28,10 @@
       "pin": "7686116dcdd5"
     },
     "bqaudiostream": {
-      "pin": "87dac9687fa4"
+      "pin": "e3a6c41e042f"
     },
     "sv-dependency-builds": {
-      "pin": "2f2b27544483"
+      "pin": "f3731af47c4b"
     }
   }
 }
--- a/repoint-project.json	Mon Feb 04 10:21:20 2019 +0000
+++ b/repoint-project.json	Tue Jul 09 10:30:41 2019 +0100
@@ -17,7 +17,7 @@
         "svcore": {
             "vcs": "hg",
 	    "service": "soundsoftware",
-	    "branch": "bqaudiostream"
+	    "branch": "by-id"
         },
         "checker": {
             "vcs": "hg",
--- a/runner/MIDIFeatureWriter.h	Mon Feb 04 10:21:20 2019 +0000
+++ b/runner/MIDIFeatureWriter.h	Tue Jul 09 10:30:41 2019 +0100
@@ -14,11 +14,12 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _MIDI_FEATURE_WRITER_H_
-#define _MIDI_FEATURE_WRITER_H_
+#ifndef MIDI_FEATURE_WRITER_H
+#define MIDI_FEATURE_WRITER_H
 
 #include "transform/FileFeatureWriter.h"
-#include "data/model/NoteData.h"
+#include "base/NoteData.h"
+#include "base/NoteExportable.h"
 
 class MIDIFileWriter;
 
@@ -52,7 +53,11 @@
 	virtual NoteList getNotes() const {
 	    return m_notes;
 	}
-	virtual NoteList getNotesWithin(sv_frame_t, sv_frame_t) const {
+	virtual NoteList getNotesActiveAt(sv_frame_t) const {
+	    // Not required by MIDIFileWriter, not supported
+	    return NoteList();
+	}
+	virtual NoteList getNotesStartingWithin(sv_frame_t, sv_frame_t) const {
 	    // Not required by MIDIFileWriter, not supported
 	    return NoteList();
 	}