# HG changeset patch
# User Chris Cannam
# Date 1401790474 -3600
# Node ID c1fc074971edd62d494a98f70da21d456a3e68fd
# Parent  bf0b419fdaac5e92ed5cfae5c448cf3e1f967913# Parent  ddae586bc47bbe718d625109065b06d11d23db8a
Merge from default branch

diff -r bf0b419fdaac -r c1fc074971ed layer/LayerFactory.cpp
--- a/layer/LayerFactory.cpp	Thu May 29 16:27:52 2014 +0100
+++ b/layer/LayerFactory.cpp	Tue Jun 03 11:14:34 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<FlexiNoteModel *>(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<const TimeRulerLayer *>(layer)) return TimeRuler;
     if (dynamic_cast<const TimeInstantLayer *>(layer)) return TimeInstants;
     if (dynamic_cast<const TimeValueLayer *>(layer)) return TimeValues;
-	if (dynamic_cast<const FlexiNoteLayer *>(layer)) return FlexiNotes;
+    if (dynamic_cast<const FlexiNoteLayer *>(layer)) return FlexiNotes;
     if (dynamic_cast<const NoteLayer *>(layer)) return Notes;
     if (dynamic_cast<const RegionLayer *>(layer)) return Regions;
     if (dynamic_cast<const TextLayer *>(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<NoteLayer, NoteModel>(layer, model)) 
 	return; 
 
-	// GF: added FlexiNoteLayer
+    // GF: added FlexiNoteLayer
     if (trySetModel<FlexiNoteLayer, FlexiNoteModel>(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);