comparison layer/LayerFactory.cpp @ 1006:2937929ea6dc 3.0-integration

Merge from default branch
author Chris Cannam
date Tue, 20 Oct 2015 09:14:24 +0100
parents b247d3ffcbb9
children a34a2a25907c
comparison
equal deleted inserted replaced
1003:5fdf5cd032ac 1006:2937929ea6dc
287 if (name == "waveform") return Waveform; 287 if (name == "waveform") return Waveform;
288 if (name == "spectrogram") return Spectrogram; 288 if (name == "spectrogram") return Spectrogram;
289 if (name == "timeruler") return TimeRuler; 289 if (name == "timeruler") return TimeRuler;
290 if (name == "timeinstants") return TimeInstants; 290 if (name == "timeinstants") return TimeInstants;
291 if (name == "timevalues") return TimeValues; 291 if (name == "timevalues") return TimeValues;
292 if (name == "notes") return Notes;
292 if (name == "flexinotes") return FlexiNotes; 293 if (name == "flexinotes") return FlexiNotes;
293 if (name == "regions") return Regions; 294 if (name == "regions") return Regions;
294 if (name == "text") return Text; 295 if (name == "text") return Text;
295 if (name == "image") return Image; 296 if (name == "image") return Image;
296 if (name == "colour3dplot") return Colour3DPlot; 297 if (name == "colour3dplot") return Colour3DPlot;