comparison data/model/NoteModel.h @ 1527:710e6250a401 zoom

Merge from default branch

     published by the Free Software Foundation; either version 2 of the
     License, or (at your option) any later version.  See the file
     COPYING included with this distribution for more information.
 */
 
-#ifndef _NOTE_MODEL_H_
-#define _NOTE_MODEL_H_
+#ifndef SV_NOTE_MODEL_H
+#define SV_NOTE_MODEL_H
 
 #include "IntervalModel.h"
 #include "NoteData.h"
 #include "base/RealTime.h"
 #include "base/PlayParameterRepository.h"

 struct Note
 {
 public:
     Note(sv_frame_t _frame) : frame(_frame), value(0.0f), duration(0), level(1.f) { }
     Note(sv_frame_t _frame, float _value, sv_frame_t _duration, float _level, QString _label) :
-	frame(_frame), value(_value), duration(_duration), level(_level), label(_label) { }
+        frame(_frame), value(_value), duration(_duration), level(_level), label(_label) { }
 
     int getDimensions() const { return 3; }
 
     sv_frame_t frame;
     float value;

     
     void toXml(QTextStream &stream,
                QString indent = "",
                QString extraAttributes = "") const
     {
-	stream <<
+        stream <<
             QString("%1<point frame=\"%2\" value=\"%3\" duration=\"%4\" level=\"%5\" label=\"%6\" %7/>\n")
-	    .arg(indent).arg(frame).arg(value).arg(duration).arg(level)
+            .arg(indent).arg(frame).arg(value).arg(duration).arg(level)
             .arg(XmlExportable::encodeEntities(label)).arg(extraAttributes);
     }
 
     QString toDelimitedDataString(QString delimiter, DataExportOptions opts, sv_samplerate_t sampleRate) const {
         QStringList list;

         if (label != "") list << label;
         return list.join(delimiter);
     }
 
     struct Comparator {
-	bool operator()(const Note &p1,
-			const Note &p2) const {
-	    if (p1.frame != p2.frame) return p1.frame < p2.frame;
-	    if (p1.value != p2.value) return p1.value < p2.value;
-	    if (p1.duration != p2.duration) return p1.duration < p2.duration;
+        bool operator()(const Note &p1,
+                        const Note &p2) const {
+            if (p1.frame != p2.frame) return p1.frame < p2.frame;
+            if (p1.value != p2.value) return p1.value < p2.value;
+            if (p1.duration != p2.duration) return p1.duration < p2.duration;
             if (p1.level != p2.level) return p1.level < p2.level;
-	    return p1.label < p2.label;
-	}
+            return p1.label < p2.label;
+        }
     };
     
     struct OrderComparator {
-	bool operator()(const Note &p1,
-			const Note &p2) const {
-	    return p1.frame < p2.frame;
-	}
+        bool operator()(const Note &p1,
+                        const Note &p2) const {
+            return p1.frame < p2.frame;
+        }
     };
 };
 
 
 class NoteModel : public IntervalModel<Note>, public NoteExportable
 {
     Q_OBJECT
     
 public:
     NoteModel(sv_samplerate_t sampleRate, int resolution,
-	      bool notifyOnAdd = true) :
-	IntervalModel<Note>(sampleRate, resolution, notifyOnAdd),
-	m_valueQuantization(0)
-    {
-	PlayParameterRepository::getInstance()->addPlayable(this);
+              bool notifyOnAdd = true) :
+        IntervalModel<Note>(sampleRate, resolution, notifyOnAdd),
+        m_valueQuantization(0)
+    {
+        PlayParameterRepository::getInstance()->addPlayable(this);
     }
 
     NoteModel(sv_samplerate_t sampleRate, int resolution,
-	      float valueMinimum, float valueMaximum,
-	      bool notifyOnAdd = true) :
-	IntervalModel<Note>(sampleRate, resolution,
+              float valueMinimum, float valueMaximum,
+              bool notifyOnAdd = true) :
+        IntervalModel<Note>(sampleRate, resolution,
                             valueMinimum, valueMaximum,
                             notifyOnAdd),
-	m_valueQuantization(0)
-    {
-	PlayParameterRepository::getInstance()->addPlayable(this);
+        m_valueQuantization(0)
+    {
+        PlayParameterRepository::getInstance()->addPlayable(this);
     }
 
     virtual ~NoteModel()
     {
         PlayParameterRepository::getInstance()->removePlayable(this);

     {
         std::cerr << "NoteModel::toXml: extraAttributes = \"" 
                   << extraAttributes.toStdString() << std::endl;
 
         IntervalModel<Note>::toXml
-	    (out,
+            (out,
              indent,
-	     QString("%1 subtype=\"note\" valueQuantization=\"%2\"")
-	     .arg(extraAttributes).arg(m_valueQuantization));
+             QString("%1 subtype=\"note\" valueQuantization=\"%2\"")
+             .arg(extraAttributes).arg(m_valueQuantization));
     }
 
     /**
      * TabularModel methods.  
      */

         return getNotesWithin(getStartFrame(), getEndFrame());
     }
 
     NoteList getNotesWithin(sv_frame_t startFrame, sv_frame_t endFrame) const {
         
-	PointList points = getPoints(startFrame, endFrame);
+        PointList points = getPoints(startFrame, endFrame);
         NoteList notes;
 
         for (PointList::iterator pli =
-		 points.begin(); pli != points.end(); ++pli) {
-
-	    sv_frame_t duration = pli->duration;
+                 points.begin(); pli != points.end(); ++pli) {
+
+            sv_frame_t duration = pli->duration;
             if (duration == 0 || duration == 1) {
                 duration = sv_frame_t(getSampleRate() / 20);
             }
 
             int pitch = int(lrintf(pli->value));