# HG changeset patch # User Chris Cannam # Date 1389100193 0 # Node ID 6d07bcc844a1deb03497cf490aad03d6daf2275e # Parent 1f98e28f70c63ab92be3d5bf0e86764243ef0c90 sample id instead of plugin data diff -r 1f98e28f70c6 -r 6d07bcc844a1 data/model/DenseTimeValueModel.h --- 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; diff -r 1f98e28f70c6 -r 6d07bcc844a1 data/model/FlexiNoteModel.h --- 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 ""; + return "click"; } virtual void toXml(QTextStream &out, diff -r 1f98e28f70c6 -r 6d07bcc844a1 data/model/NoteModel.h --- 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 ""; + return "piano"; } virtual void toXml(QTextStream &out, diff -r 1f98e28f70c6 -r 6d07bcc844a1 data/model/SparseOneDimensionalModel.h --- 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 ""; + return "tap"; } int getIndexOf(const Point &point)