comparison data/fileio/MIDIFileReader.cpp @ 1056:c4898e57eea5 tonioni

Merge from default branch
author Chris Cannam
date Mon, 23 Mar 2015 10:04:48 +0000
parents 920699b6989d
children cc27f35aa75c
comparison
equal deleted inserted replaced
1007:ba404199345f 1056:c4898e57eea5
34 #include "base/Pitch.h" 34 #include "base/Pitch.h"
35 #include "base/RealTime.h" 35 #include "base/RealTime.h"
36 #include "model/NoteModel.h" 36 #include "model/NoteModel.h"
37 37
38 #include <QString> 38 #include <QString>
39 #include <QFileInfo>
39 40
40 #include <sstream> 41 #include <sstream>
41 42
42 #include "base/Debug.h" 43 #include "base/Debug.h"
43 44
930 } 931 }
931 932
932 if (!model) { 933 if (!model) {
933 model = new NoteModel(m_mainModelSampleRate, 1, 0.0, 0.0, false); 934 model = new NoteModel(m_mainModelSampleRate, 1, 0.0, 0.0, false);
934 model->setValueQuantization(1.0); 935 model->setValueQuantization(1.0);
936 model->setObjectName(QFileInfo(m_path).fileName());
935 } 937 }
936 938
937 const MIDITrack &track = m_midiComposition.find(trackToLoad)->second; 939 const MIDITrack &track = m_midiComposition.find(trackToLoad)->second;
938 940
939 int totalEvents = track.size(); 941 int totalEvents = track.size();