diff options
Diffstat (limited to 'rotord/rotor.h')
| -rwxr-xr-x | rotord/rotor.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/rotord/rotor.h b/rotord/rotor.h index e9b272c..7ebde45 100755 --- a/rotord/rotor.h +++ b/rotord/rotor.h @@ -54,17 +54,16 @@ extern "C" { } */ -#include "ofxMovieExporter.h" #define AUDIO_INBUF_SIZE 20480 #define AUDIO_REFILL_THRESH 4096 #include "vampHost.h" #include "xmlIO.h" -#include "libavaudioloader.h" +//#include "libavaudioloader.h" //#include "libavexporter.h" #include "utils.h" //fequal -#include "libavwrapper.h" +#include "libavwrapper_guarded.h" namespace Rotor { #define IDLE 0 @@ -686,9 +685,9 @@ namespace Rotor { Video_output(){}; Video_output(map<string,string> &settings) { base_settings(settings); - //exporter=new libav::Exporter(); + exporter=new libav::exporter(); }; - ~Video_output(){ /*delete exporter;*/ }; + ~Video_output(){ delete exporter; }; Image *output(const Frame_spec &frame){ if (image_inputs[0]->connection) { return ((Image_node*)(image_inputs[0]->connection))->get_output(frame); @@ -700,8 +699,8 @@ namespace Rotor { private: //ofxMovieExporter *exporter; - //libav::Exporter *exporter; - libav::Audioloader audioloader; + libav::exporter *exporter; + libav::audioloader audioloader; //libav::encoder encoder; }; class Video_loader: public Image_node { @@ -1184,7 +1183,7 @@ namespace Rotor { float output_framerate; bool audio_loaded; - libav::Audioloader audioloader; + //libav::audioloader audioloader; }; } |