summaryrefslogtreecommitdiff
path: root/rotord/rotor.cpp
diff options
context:
space:
mode:
authorTim Redfern <tim@eclectronics.org>2013-05-27 12:40:16 +0100
committerTim Redfern <tim@eclectronics.org>2013-05-27 12:40:16 +0100
commit12c7449bd73a49ede4dacb90a9b0b7f73eb2e287 (patch)
tree442afc39917e523c723aa65124c59d6777033176 /rotord/rotor.cpp
parent493b87d7c8f8872a19bbb0347daf61cc5b24f578 (diff)
quick fix
Diffstat (limited to 'rotord/rotor.cpp')
-rwxr-xr-xrotord/rotor.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/rotord/rotor.cpp b/rotord/rotor.cpp
index 5e4c6bb..83a3b8f 100755
--- a/rotord/rotor.cpp
+++ b/rotord/rotor.cpp
@@ -55,13 +55,18 @@ bool Signal_output::render(const float duration, const float framerate,string &x
cerr << "Rotor: Signal_output rendering " << duration << " seconds at " << framerate << " frames per second" << endl;
float step=1.0f/framerate;
float v=0.0f;
+ float min=10000000.0f;
+ float max=-10000000.0f;
for (float f=0.0f;f<duration;f+=step) {
float u=get_output(Time_spec(f,framerate,duration));
if (!fequal(u,v)) {
xml_out+=("<signal time='"+ofToString(f)+"'>"+ofToString(u)+"</signal>\n");
v=u;
+ if (v>max) max=v;
+ if (v<min) min=v;
}
}
+ xml_out+=("<signal_finished min='"+ofToString(min)+"' max='"+ofToString(max)+"'/>\n");
return true;
}
@@ -164,7 +169,7 @@ int Audio_analysis::process_frame(uint8_t *data,int samples_in_frame) {
}
void Audio_analysis::cleanup() {
analyser.cleanup();
- print_features();
+ //print_features();
}
void Audio_analysis::print_features(){
for (auto i: analyser.features) {
@@ -242,7 +247,7 @@ bool Video_loader::load(const string &filename){
}
*/
Poco::Path path;
- string uri="file://"+path.current()+filename;
+ string uri="file://"+filename;
isLoaded=player.open(uri);
if (isLoaded){
cerr<<"Rotor::Video_loader: "<<filename<<", "<<player.getNumberOfFrames()<<" frames "<<", "<<player.getWidth()<<"x"<<player.getHeight()<<endl;