Mercurial > hg > sonic-annotator
comparison runner/MIDIFeatureWriter.cpp @ 331:e39307a8d22d
Use sv samplerate/frame types, fixing compiler warnings
author | Chris Cannam |
---|---|
date | Tue, 12 Jun 2018 10:14:22 +0100 |
parents | ef03350baec7 |
children |
comparison
equal
deleted
inserted
replaced
330:4819abbd24bb | 331:e39307a8d22d |
---|---|
74 QString filename = getOutputFilename(trackId, transformId); | 74 QString filename = getOutputFilename(trackId, transformId); |
75 if (filename == "") { | 75 if (filename == "") { |
76 throw FailedToOpenOutputStream(trackId, transformId); | 76 throw FailedToOpenOutputStream(trackId, transformId); |
77 } | 77 } |
78 | 78 |
79 int sampleRate = transform.getSampleRate(); | 79 sv_samplerate_t sampleRate = transform.getSampleRate(); |
80 | 80 |
81 if (m_rates.find(filename) == m_rates.end()) { | 81 if (m_rates.find(filename) == m_rates.end()) { |
82 m_rates[filename] = sampleRate; | 82 m_rates[filename] = sampleRate; |
83 } | 83 } |
84 | 84 |
102 | 102 |
103 for (int i = 0; i < (int)features.size(); ++i) { | 103 for (int i = 0; i < (int)features.size(); ++i) { |
104 | 104 |
105 const Plugin::Feature &feature(features[i]); | 105 const Plugin::Feature &feature(features[i]); |
106 | 106 |
107 Vamp::RealTime timestamp = feature.timestamp; | 107 RealTime timestamp(feature.timestamp); |
108 int frame = Vamp::RealTime::realTime2Frame(timestamp, sampleRate); | 108 sv_frame_t frame = RealTime::realTime2Frame(timestamp, sampleRate); |
109 | 109 |
110 int duration = 1; | 110 sv_frame_t duration = 1; |
111 if (feature.hasDuration) { | 111 if (feature.hasDuration) { |
112 duration = Vamp::RealTime::realTime2Frame(feature.duration, sampleRate); | 112 RealTime rduration(feature.duration); |
113 duration = RealTime::realTime2Frame(rduration, sampleRate); | |
113 } | 114 } |
114 | 115 |
115 #ifdef DEBUG_MIDI_FEATURE_WRITER | 116 #ifdef DEBUG_MIDI_FEATURE_WRITER |
116 SVCERR << "feature timestamp = " << feature.timestamp << ", sampleRate = " << sampleRate << ", frame = " << frame << endl; | 117 SVCERR << "feature timestamp = " << feature.timestamp << ", sampleRate = " << sampleRate << ", frame = " << frame << endl; |
117 SVCERR << "feature duration = " << feature.duration << ", sampleRate = " << sampleRate << ", duration = " << duration << endl; | 118 SVCERR << "feature duration = " << feature.duration << ", sampleRate = " << sampleRate << ", duration = " << duration << endl; |
150 { | 151 { |
151 for (NoteMap::const_iterator i = m_notes.begin(); i != m_notes.end(); ++i) { | 152 for (NoteMap::const_iterator i = m_notes.begin(); i != m_notes.end(); ++i) { |
152 | 153 |
153 QString filename = i->first; | 154 QString filename = i->first; |
154 NoteList notes = i->second; | 155 NoteList notes = i->second; |
155 float rate = m_rates[filename]; | 156 sv_samplerate_t rate = m_rates[filename]; |
156 | 157 |
157 TrivialNoteExportable exportable(notes); | 158 TrivialNoteExportable exportable(notes); |
158 | 159 |
159 { | 160 { |
160 MIDIFileWriter writer(filename, &exportable, rate); | 161 MIDIFileWriter writer(filename, &exportable, rate); |