summaryrefslogtreecommitdiff
path: root/rotord/rotor.h
diff options
context:
space:
mode:
authorTim Redfern <tim@herge.(none)>2013-05-18 17:34:53 +0100
committerTim Redfern <tim@herge.(none)>2013-05-18 17:34:53 +0100
commitbcd9eeed1f60c594da11d93c1b52c4ec192280ce (patch)
treeaf760f3e2a1cefc3abcc177f9b5c75a5722c7d67 /rotord/rotor.h
parentfad2c7236e70faf0669dde3e6cbd51986fdbc6ee (diff)
dependencies installer
Diffstat (limited to 'rotord/rotor.h')
-rwxr-xr-xrotord/rotor.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/rotord/rotor.h b/rotord/rotor.h
index d8ee021..c3886d8 100755
--- a/rotord/rotor.h
+++ b/rotord/rotor.h
@@ -65,6 +65,7 @@ extern "C" {
#include "libavexporter.h"
#include "gstvideoloader.h"
#include "utils.h" //fequal
+#include "libavwrapper.h"
namespace Rotor {
#define IDLE 0
@@ -644,16 +645,17 @@ namespace Rotor {
Video_loader(){};
Video_loader(map<string,string> &settings) {
base_settings(settings);
- player=new ofGstVideoPlayer();
- image=new Image();
+ //player=new ofGstVideoPlayer();
+ //image=new Image();
};
- ~Video_loader(){ delete player; delete image;};
+ ~Video_loader(){};
bool load(const string &filename);
Image *output(const Frame_spec &frame);
Video_loader* clone(map<string,string> &_settings) { return new Video_loader(_settings);};
private:
- ofGstVideoPlayer *player;
- Image *image;
+ //ofGstVideoPlayer *player;
+ libav::decoder player;
+ Image image;
};
class Video_cycler: public Image_node {
//cycles through video inputs in order