Skip to content
Snippets Groups Projects

Resolves #343 GUI and Frame Refactor

Merged Nicolas Pope requested to merge feature/gui2 into master
2 files
+ 5
6
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -32,6 +32,7 @@ class BaseBuilder : public ftl::data::Generator {
void setID(uint32_t id) { id_ = id; }
void setPool(ftl::data::Pool *p) { pool_ = p; }
void setBufferSize(size_t s) { bufferSize_ = s; }
inline ftl::Handle onFrameSet(const ftl::data::FrameSetCallback &cb) override { return cb_.on(cb); }
@@ -51,6 +52,7 @@ class BaseBuilder : public ftl::data::Generator {
ftl::data::Pool *pool_;
int id_;
size_t size_;
size_t bufferSize_ = 1;
ftl::Handler<const ftl::data::FrameSetPtr&> cb_;
ftl::data::ChangeType ctype_ = ftl::data::ChangeType::COMPLETED;
};
@@ -139,8 +141,6 @@ class ForeignBuilder : public BaseBuilder {
LockedFrameSet get(int64_t timestamp) override;
void setBufferSize(size_t n) { bufferSize_ = n; }
private:
std::list<std::shared_ptr<ftl::data::FrameSet>> framesets_; // Active framesets
//std::list<ftl::data::FrameSet*> allocated_; // Keep memory allocations
@@ -153,7 +153,6 @@ class ForeignBuilder : public BaseBuilder {
std::atomic<int> jobs_;
volatile bool skip_;
ftl::Handle main_id_;
size_t bufferSize_;
std::string name_;
Loading