Mercurial > hg > svcore
changeset 864:6d07bcc844a1 tonioni
sample id instead of plugin data
| author | Chris Cannam |
|---|---|
| date | Tue, 07 Jan 2014 13:09:53 +0000 |
| parents | 1f98e28f70c6 |
| children | 9196cff56abe |
| files | data/model/DenseTimeValueModel.h data/model/FlexiNoteModel.h data/model/NoteModel.h data/model/SparseOneDimensionalModel.h |
| diffstat | 4 files changed, 7 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/data/model/DenseTimeValueModel.h Tue Jan 07 10:57:28 2014 +0000 +++ b/data/model/DenseTimeValueModel.h Tue Jan 07 13:09:53 2014 +0000 @@ -85,8 +85,7 @@ float **buffers) const = 0; virtual bool canPlay() const { return true; } - virtual QString getDefaultPlayPluginId() const { return ""; } - virtual QString getDefaultPlayPluginConfiguration() const { return ""; } + virtual QString getDefaultPlaySampleId() const { return ""; } virtual QString toDelimitedDataString(QString delimiter, size_t f0, size_t f1) const;
--- a/data/model/FlexiNoteModel.h Tue Jan 07 10:57:28 2014 +0000 +++ b/data/model/FlexiNoteModel.h Tue Jan 07 13:09:53 2014 +0000 @@ -135,14 +135,9 @@ virtual bool canPlay() const { return true; } - virtual QString getDefaultPlayPluginId() const + virtual QString getDefaultPlaySampleId() const { - return "dssi:_builtin:sample_player"; - } - - virtual QString getDefaultPlayPluginConfiguration() const - { - return "<plugin program=\"click\"/>"; + return "click"; } virtual void toXml(QTextStream &out,
--- a/data/model/NoteModel.h Tue Jan 07 10:57:28 2014 +0000 +++ b/data/model/NoteModel.h Tue Jan 07 13:09:53 2014 +0000 @@ -129,14 +129,9 @@ virtual bool canPlay() const { return true; } - virtual QString getDefaultPlayPluginId() const + virtual QString getDefaultPlaySampleId() const { - return "dssi:_builtin:sample_player"; - } - - virtual QString getDefaultPlayPluginConfiguration() const - { - return "<plugin program=\"piano\"/>"; + return "piano"; } virtual void toXml(QTextStream &out,
--- a/data/model/SparseOneDimensionalModel.h Tue Jan 07 10:57:28 2014 +0000 +++ b/data/model/SparseOneDimensionalModel.h Tue Jan 07 13:09:53 2014 +0000 @@ -90,14 +90,9 @@ virtual bool canPlay() const { return true; } - virtual QString getDefaultPlayPluginId() const + virtual QString getDefaultPlaySampleId() const { - return "dssi:_builtin:sample_player"; - } - - virtual QString getDefaultPlayPluginConfiguration() const - { - return "<plugin program=\"tap\"/>"; + return "tap"; } int getIndexOf(const Point &point)