Commit 030169ba authored by IOhannes m zmölnig's avatar IOhannes m zmölnig

Merge remote-tracking branch 'origin/videoVIDS'

Closes: https://github.com/umlaeute/Gem/issues/228
parents b8fb191d f5e80ff0
This diff is collapsed.
......@@ -51,12 +51,13 @@ public:
std::vector<std::string>());
virtual bool setColor(int);
virtual bool trySetProperties(gem::Properties&props, bool);
private:
std::string m_name;
pixBlock m_pixBlock;
gem::Properties m_props;
videoInput m_vi;
videoInput*m_vi;
int m_ID, m_wantID;
int m_width, m_height;
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment