diff options
Diffstat (limited to 'rotord/rotor.h')
| -rwxr-xr-x | rotord/rotor.h | 12 |
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 |