Switch segment storage from single vector to vector of arrays

[pulseview.git] / pv / data / logic.hpp

diff --git a/pv/data/logic.hpp b/pv/data/logic.hpp
index 51e12cb984db45675ac8a47886d771ebe8f538ed..6e5749a31ee86daac20bf38f2b963a66ed69ebb3 100644 (file)
--- a/pv/data/logic.hpp
+++ b/pv/data/logic.hpp
@@ -14,46 +14,46 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_DATA_LOGIC_H
-#define PULSEVIEW_PV_DATA_LOGIC_H
+#ifndef PULSEVIEW_PV_DATA_LOGIC_HPP
+#define PULSEVIEW_PV_DATA_LOGIC_HPP
 
 #include "signaldata.hpp"
 
 #include <deque>
-#include <memory>
 
 namespace pv {
 namespace data {
 
-class LogicSnapshot;
+class LogicSegment;
 
 class Logic : public SignalData
 {
 public:
        Logic(unsigned int num_channels);
 
-       int get_num_channels() const;
+       unsigned int num_channels() const;
 
-       void push_snapshot(
-               std::shared_ptr<LogicSnapshot> &snapshot);
+       void push_segment(
+               std::shared_ptr<LogicSegment> &segment);
 
-       std::deque< std::shared_ptr<LogicSnapshot> >&
-               get_snapshots();
+       const std::deque< std::shared_ptr<LogicSegment> >&
+               logic_segments() const;
+
+       std::vector< std::shared_ptr<Segment> > segments() const;
 
        void clear();
 
-       uint64_t get_max_sample_count() const;
+       uint64_t max_sample_count() const;
 
 private:
        const unsigned int num_channels_;
-       std::deque< std::shared_ptr<LogicSnapshot> > snapshots_;
+       std::deque< std::shared_ptr<LogicSegment> > segments_;
 };
 
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DATA_LOGIC_H
+#endif // PULSEVIEW_PV_DATA_LOGIC_HPP