avcodec confusion

1 files changed, 5 insertions, 10 deletions

diff --git a/rotord/rotor.h b/rotord/rotor.h
index bedf936..d808dd8 100755
--- a/rotord/rotor.h
+++ b/rotord/rotor.h
@@ -97,7 +97,7 @@ extern "C" {
 
 #include "vampHost.h"
 #include "xmlIO.h"
-//#include "avCodec.h"
+#include "libavexporter.h"
 
 namespace Rotor {
 #define IDLE 0
@@ -268,13 +268,6 @@ namespace Rotor {
 			vector<Image_input*> image_inputs;			//image node also has image inputs and outputs
 			void create_image_input(const string &description) {image_inputs.push_back(new Image_input(description));};
 			virtual Image *get_output(const Frame_spec &frame)=0;
-
-			/*{	//sample implementation
-														//do something with the inputs
-														//and then
-				return ((Image_node*)(image_inputs[0]->connection))->get_output(frame);
-			}
-			*/
 			Image *get_preview(const Frame_spec &frame);
 			Image *image; 								//this can be privately allocated or just passed on as the node see fit
 		private:
@@ -406,8 +399,9 @@ namespace Rotor {
 			Video_output(){};
 			Video_output(map<string,string> &settings) {
 				base_settings(settings);
-				exporter=new ofxMovieExporter();
+				exporter=new libav::exporter();
 			};
+			~Video_output(){ delete exporter; };
 			Image *get_output(const Frame_spec &frame){
 				if (image_inputs[0]->connection) {
 					return ((Image_node*)(image_inputs[0]->connection))->get_output(frame);
@@ -418,7 +412,8 @@ namespace Rotor {
 			bool render(const float duration, const float framerate,const string &output_filename,const string &audio_filename);
 
 		private:
-			ofxMovieExporter *exporter;
+			//ofxMovieExporter *exporter;
+			libav::exporter *exporter;
 	};
 	//-------------------------------------------------------------------
 	class Node_factory{