summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Redfern <tim@eclectronics.org>2013-09-10 13:40:26 +0100
committerTim Redfern <tim@eclectronics.org>2013-09-10 13:40:26 +0100
commit9ef45919f0eb3bebeb6ee1ee6e1da2d859b43790 (patch)
treed83d2061a72ffb62bbe48fc0323e09b7cbe9c334
parent157d5cf3af1bc4e6d4391d51bb4aa3699022ee6b (diff)
fix audio loader on reinit graph
-rw-r--r--rotord/src/cvimage.h1
-rw-r--r--rotord/src/graph.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/rotord/src/cvimage.h b/rotord/src/cvimage.h
index 0f0f931..2902295 100644
--- a/rotord/src/cvimage.h
+++ b/rotord/src/cvimage.h
@@ -102,6 +102,7 @@ namespace Rotor {
};
bool setup(int _w,int _h){ //set up with internal data
if ((w!=_w)|(h!=_h)){
+ free();
rgb.create(_h,_w,CV_8UC3);
RGBdata=rgb.data; //can move to use the bare pointer eventually
ownsRGBdata=false; //will not be necessary
diff --git a/rotord/src/graph.cpp b/rotord/src/graph.cpp
index 03d0a4b..2e89a4c 100644
--- a/rotord/src/graph.cpp
+++ b/rotord/src/graph.cpp
@@ -261,6 +261,7 @@ bool Graph::check_audio(string audio,string path){
}
cerr<<"Rotor: audio file "<<path+audio<<" not found"<<endl;
}
+ audio_loaded=false;
return false;
}
bool Graph::parseJson(string &data,string &media_path){