summaryrefslogtreecommitdiff
path: root/rotord/rotor.h
diff options
context:
space:
mode:
Diffstat (limited to 'rotord/rotor.h')
-rwxr-xr-xrotord/rotor.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/rotord/rotor.h b/rotord/rotor.h
index 7ebde45..a0a310f 100755
--- a/rotord/rotor.h
+++ b/rotord/rotor.h
@@ -685,9 +685,8 @@ namespace Rotor {
Video_output(){};
Video_output(map<string,string> &settings) {
base_settings(settings);
- exporter=new libav::exporter();
};
- ~Video_output(){ delete exporter; };
+ ~Video_output(){ };
Image *output(const Frame_spec &frame){
if (image_inputs[0]->connection) {
return ((Image_node*)(image_inputs[0]->connection))->get_output(frame);
@@ -698,10 +697,7 @@ namespace Rotor {
bool render(const float duration, const float framerate,const string &output_filename,const string &audio_filename,float& progress);
private:
- //ofxMovieExporter *exporter;
- libav::exporter *exporter;
- libav::audioloader audioloader;
- //libav::encoder encoder;
+
};
class Video_loader: public Image_node {
public:
@@ -1162,6 +1158,7 @@ namespace Rotor {
void cancel(); //interrupt locking process
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);
+ bool _load_audio(const string &filename,vector<Base_audio_processor*> processors);
Render_requirements get_requirements();
bool load_video(const string &nodeID,const string &filename);//can be performance or clip
private:
@@ -1177,13 +1174,11 @@ namespace Rotor {
std::string output_dir;
Audio_thumbnailer *audio_thumb;
- //vampHost::QMAnalyser audio_analyser;
Graph graph;
Node_factory factory;
float output_framerate;
bool audio_loaded;
- //libav::audioloader audioloader;
};
}