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

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 cd42620e3f40
children a1cd5abcb38b
comparison
equal deleted inserted replaced
1037:bf0e5944289b 1038:cc27f35aa75c
47 int getComponentCount() const; 47 int getComponentCount() const;
48 ModelChannelSpec getComponent(int c) const; 48 ModelChannelSpec getComponent(int c) const;
49 49
50 const ZoomConstraint *getZoomConstraint() const { return &m_zoomConstraint; } 50 const ZoomConstraint *getZoomConstraint() const { return &m_zoomConstraint; }
51 51
52 int getFrameCount() const; 52 sv_frame_t getFrameCount() const;
53 int getChannelCount() const; 53 int getChannelCount() const;
54 int getSampleRate() const; 54 int getSampleRate() const;
55 55
56 virtual Model *clone() const; 56 virtual Model *clone() const;
57 57
58 float getValueMinimum() const { return -1.0f; } 58 float getValueMinimum() const { return -1.0f; }
59 float getValueMaximum() const { return 1.0f; } 59 float getValueMaximum() const { return 1.0f; }
60 60
61 virtual int getStartFrame() const { return 0; } 61 virtual sv_frame_t getStartFrame() const { return 0; }
62 virtual int getEndFrame() const { return getFrameCount(); } 62 virtual sv_frame_t getEndFrame() const { return getFrameCount(); }
63 63
64 virtual int getData(int channel, int start, int count, 64 virtual sv_frame_t getData(int channel, sv_frame_t start, sv_frame_t count,
65 float *buffer) const; 65 float *buffer) const;
66 66
67 virtual int getData(int channel, int start, int count, 67 virtual sv_frame_t getData(int channel, sv_frame_t start, sv_frame_t count,
68 double *buffer) const; 68 double *buffer) const;
69 69
70 virtual int getData(int fromchannel, int tochannel, 70 virtual sv_frame_t getData(int fromchannel, int tochannel,
71 int start, int count, 71 sv_frame_t start, sv_frame_t count,
72 float **buffer) const; 72 float **buffer) const;
73 73
74 virtual int getSummaryBlockSize(int desired) const; 74 virtual int getSummaryBlockSize(int desired) const;
75 75
76 virtual void getSummaries(int channel, int start, int count, 76 virtual void getSummaries(int channel, sv_frame_t start, sv_frame_t count,
77 RangeBlock &ranges, 77 RangeBlock &ranges,
78 int &blockSize) const; 78 int &blockSize) const;
79 79
80 virtual Range getSummary(int channel, int start, int count) const; 80 virtual Range getSummary(int channel, sv_frame_t start, sv_frame_t count) const;
81 81
82 virtual void toXml(QTextStream &out, 82 virtual void toXml(QTextStream &out,
83 QString indent = "", 83 QString indent = "",
84 QString extraAttributes = "") const; 84 QString extraAttributes = "") const;
85 85
86 signals: 86 signals:
87 void modelChanged(); 87 void modelChanged();
88 void modelChangedWithin(int, int); 88 void modelChangedWithin(sv_frame_t, sv_frame_t);
89 void completionChanged(); 89 void completionChanged();
90 90
91 protected slots: 91 protected slots:
92 void componentModelChanged(); 92 void componentModelChanged();
93 void componentModelChangedWithin(int, int); 93 void componentModelChangedWithin(sv_frame_t, sv_frame_t);
94 void componentModelCompletionChanged(); 94 void componentModelCompletionChanged();
95 95
96 protected: 96 protected:
97 ChannelSpecList m_components; 97 ChannelSpecList m_components;
98 static PowerOfSqrtTwoZoomConstraint m_zoomConstraint; 98 static PowerOfSqrtTwoZoomConstraint m_zoomConstraint;