diff options
| author | Tim Redfern <tim@eclectronics.org> | 2013-09-11 17:05:41 +0100 |
|---|---|---|
| committer | Tim Redfern <tim@eclectronics.org> | 2013-09-11 17:05:41 +0100 |
| commit | 119dbdb43b859b529112d49dbeb3e05831372f68 (patch) | |
| tree | 77f9aeab7eff3243af50b5622bcd70fa253a277d | |
| parent | c7b8107e6dc8d36b411a1ba6121a6257c7f0e901 (diff) | |
making graph loading asynchronous
| -rw-r--r-- | rotord/src/libavwrapper.cpp | 2 | ||||
| -rw-r--r-- | rotord/src/rendercontext.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/rotord/src/libavwrapper.cpp b/rotord/src/libavwrapper.cpp index 321725e..717667c 100644 --- a/rotord/src/libavwrapper.cpp +++ b/rotord/src/libavwrapper.cpp @@ -569,7 +569,7 @@ bool libav::decoder::avtry(int result, const std::string& msg) { bool libav::ffms2_decoder::open(const std::string& filename){ mutex.lock(); loaded=false; - FFMS_Index *index = FFMS_MakeIndex(filename.c_str(), 0, 0, NULL, NULL, FFMS_IEH_ABORT, NULL, NULL, &errinfo); + FFMS_Index *index = FFMS_MakeIndex(filename.c_str(), 0, 0, NULL, NULL, FFMS_IEH_IGNORE, NULL, NULL, &errinfo); if (index == NULL) { std::cerr<<"ffmpegsource: "<<errinfo.Buffer<<std::endl; mutex.unlock(); diff --git a/rotord/src/rendercontext.h b/rotord/src/rendercontext.h index b525a07..62eb7f4 100644 --- a/rotord/src/rendercontext.h +++ b/rotord/src/rendercontext.h @@ -24,6 +24,7 @@ namespace Rotor { #define FAILED 7 #define NOT_FOUND 8 #define CANCELLED 9 + #define LOADING_GRAPH 10 #define ANALYSE_AUDIO 1 #define PREVIEW 2 |