summaryrefslogtreecommitdiff
path: root/rotord/src/graph.cpp
diff options
context:
space:
mode:
authorComment <tim@gray.(none)>2013-11-02 16:13:41 +0000
committerComment <tim@gray.(none)>2013-11-02 16:13:41 +0000
commit510a5218d5e981db3dde9ed31ddc6f732ed6a22a (patch)
treeb9d09c4dbdefed1ec693e0492841cde426ef6643 /rotord/src/graph.cpp
parent8864f5da9649c176e472a7fb8913dd8114deec54 (diff)
parenteaccb1437465c6aa49e1d5511876852543e3b0fa (diff)
merge branch
Diffstat (limited to 'rotord/src/graph.cpp')
-rw-r--r--rotord/src/graph.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/rotord/src/graph.cpp b/rotord/src/graph.cpp
index c33c59d..3f1d02b 100644
--- a/rotord/src/graph.cpp
+++ b/rotord/src/graph.cpp
@@ -566,9 +566,12 @@ bool Graph::load_audio(const string &filename,vector<Audio_processor*> processor
Logger& logger = Logger::get("Rotor");
logger.information("Analysing "+filename);
- audio_loaded=false;
+ //audio_loaded=false;
libav::audio_decoder loader;
- loader.open(filename);
+ if (!loader.open(filename)) {
+ logger.error("ERROR: Could not open audio: "+filename);
+ return false;
+ }
duration=loader.get_duration();
@@ -612,7 +615,7 @@ bool Graph::load_audio(const string &filename,vector<Audio_processor*> processor
}
logger.information("Finished audio analysis");
- audio_loaded=true;
+ //audio_loaded=true;
return true;
}
bool Graph::load_video(const string &nodeID,const string &filename){