# HG changeset patch # User Chris Cannam # Date 1401790252 -3600 # Node ID ddae586bc47bbe718d625109065b06d11d23db8a # Parent 052cbaad991eec9d8bdf1069bb173fa5513f21c1 Restore commit:6a8d922f991d which was apparently reverted in error as commit:c2291e22bf0c diff -r 052cbaad991e -r ddae586bc47b layer/LayerFactory.cpp --- a/layer/LayerFactory.cpp Tue Jun 03 10:59:48 2014 +0100 +++ b/layer/LayerFactory.cpp Tue Jun 03 11:10:52 2014 +0100 @@ -164,7 +164,7 @@ types.insert(Notes); } - // NOTE: GF: types is a set, so order of insertion does not matter + // NOTE: GF: types is a set, so order of insertion does not matter if (dynamic_cast(model)) { types.insert(FlexiNotes); } @@ -197,7 +197,7 @@ LayerTypeSet types; types.insert(TimeInstants); types.insert(TimeValues); - types.insert(FlexiNotes); + types.insert(FlexiNotes); types.insert(Notes); types.insert(Regions); types.insert(Text); @@ -214,7 +214,7 @@ if (dynamic_cast(layer)) return TimeRuler; if (dynamic_cast(layer)) return TimeInstants; if (dynamic_cast(layer)) return TimeValues; - if (dynamic_cast(layer)) return FlexiNotes; + if (dynamic_cast(layer)) return FlexiNotes; if (dynamic_cast(layer)) return Notes; if (dynamic_cast(layer)) return Regions; if (dynamic_cast(layer)) return Text; @@ -235,7 +235,7 @@ case TimeInstants: return "instants"; case TimeValues: return "values"; case Notes: return "notes"; - case FlexiNotes: return "flexible notes"; + case FlexiNotes: return "flexinotes"; case Regions: return "regions"; case Text: return "text"; case Image: return "image"; @@ -316,7 +316,7 @@ if (trySetModel(layer, model)) return; - // GF: added FlexiNoteLayer + // GF: added FlexiNoteLayer if (trySetModel(layer, model)) return; @@ -349,7 +349,7 @@ return new SparseOneDimensionalModel(baseModel->getSampleRate(), 1); } else if (layerType == TimeValues) { return new SparseTimeValueModel(baseModel->getSampleRate(), 1, true); - } else if (layerType == FlexiNotes) { + } else if (layerType == FlexiNotes) { return new FlexiNoteModel(baseModel->getSampleRate(), 1, true); } else if (layerType == Notes) { return new NoteModel(baseModel->getSampleRate(), 1, true);