Mercurial > hg > svcore

comparison data/model/RegionModel.h @ 1038:cc27f35aa75c cxx11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Introducing the signed 64-bit frame index type, and fixing build failures from inclusion of -Wconversion with -Werror. Not finished yet.
author Chris Cannam
date Tue, 03 Mar 2015 15:18:24 +0000
parents 59e7fe1b1003
children a1cd5abcb38b
comparison
equal deleted inserted replaced
1037:bf0e5944289b 1038:cc27f35aa75c
35 35
36 struct RegionRec 36 struct RegionRec
37 { 37 {
38 public: 38 public:
39 RegionRec() : frame(0), value(0.f), duration(0) { } 39 RegionRec() : frame(0), value(0.f), duration(0) { }
40 RegionRec(long _frame) : frame(_frame), value(0.0f), duration(0) { } 40 RegionRec(sv_frame_t _frame) : frame(_frame), value(0.0f), duration(0) { }
41 RegionRec(long _frame, float _value, int _duration, QString _label) : 41 RegionRec(sv_frame_t _frame, float _value, sv_frame_t _duration, QString _label) :
42 frame(_frame), value(_value), duration(_duration), label(_label) { } 42 frame(_frame), value(_value), duration(_duration), label(_label) { }
43 43
44 int getDimensions() const { return 3; } 44 int getDimensions() const { return 3; }
45 45
46 long frame; 46 sv_frame_t frame;
47 float value; 47 float value;
48 int duration; 48 sv_frame_t duration;
49 QString label; 49 QString label;
50 50
51 QString getLabel() const { return label; } 51 QString getLabel() const { return label; }
52 52
53 void toXml(QTextStream &stream, 53 void toXml(QTextStream &stream,