diff options
Diffstat (limited to 'rotord/rotor.h')
| -rwxr-xr-x | rotord/rotor.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/rotord/rotor.h b/rotord/rotor.h index ef1ae23..f530bc3 100755 --- a/rotord/rotor.h +++ b/rotord/rotor.h @@ -201,7 +201,7 @@ namespace Rotor { class Frame_spec{ public: Frame_spec(float _time,float _framerate,int _w,int _h){ time=_time; framerate=_framerate; w=_w; h=_h;}; - float time; + float time; //this hould probably be implemented with a num/denom scheme eventually for accuracy float framerate; int h,w; Frame_spec lastframe(){ @@ -393,7 +393,7 @@ namespace Rotor { return image; } private: - Image *image; + Image *image; //is an image generator }; class Video_output: public Image_node { public: @@ -422,16 +422,16 @@ namespace Rotor { Video_input(){}; Video_input(map<string,string> &settings) { base_settings(settings); - loader=new ofGstVideoUtils(); + player=new ofGstVideoPlayer(); + image=new Image(); }; - ~Video_input(){ delete loader; }; + ~Video_input(){ delete player; delete image;}; bool load(const string &filename); - Image *get_output(const Frame_spec &frame){ - return nullptr; - }; + Image *get_output(const Frame_spec &frame); Video_input* clone(map<string,string> &_settings) { return new Video_input(_settings);}; private: - ofGstVideoUtils *loader; + ofGstVideoPlayer *player; + Image *image; }; //------------------------------------------------------------------- class Node_factory{ @@ -514,7 +514,7 @@ namespace Rotor { int make_preview(int nodeID, float time); //starts a frame preview - returns status code - how to retrieve? bool load_audio(const string &filename,vector<Base_audio_processor*> processors); Render_requirements get_requirements(); - bool load_video(string nodeID,string &filename);//can be performance or clip + bool load_video(const string &nodeID,const string &filename);//can be performance or clip private: int state; double progress; //for a locking process: audio analysis or rendering |