comparison data/model/NoteModel.h @ 912:2175c2ebd5c6 tonioni

Merge from default branch
author Chris Cannam
date Wed, 14 May 2014 09:58:07 +0100
parents c48b07b34cb3
children 59e7fe1b1003
comparison
equal deleted inserted replaced
901:68e880e0b857 912:2175c2ebd5c6
129 129
130 virtual bool canPlay() const { return true; } 130 virtual bool canPlay() const { return true; }
131 131
132 virtual QString getDefaultPlayClipId() const 132 virtual QString getDefaultPlayClipId() const
133 { 133 {
134 return "piano"; 134 return "elecpiano";
135 } 135 }
136 136
137 virtual void toXml(QTextStream &out, 137 virtual void toXml(QTextStream &out,
138 QString indent = "", 138 QString indent = "",
139 QString extraAttributes = "") const 139 QString extraAttributes = "") const