about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2014-12-29 12:15:22 +0000
committerEric Wong <e@80x24.org>2014-12-29 12:20:49 +0000
commit54956f0529053fbf7a10c44419d97836e7817a6e (patch)
tree531146a47afb6cca21e2adb432d355a99fc1c7c5
parent3ce3983c3cb958fa0c7f946c331914134b5c43b7 (diff)
downloaddtas-54956f0529053fbf7a10c44419d97836e7817a6e.tar.gz
We cannot afford to break the entire player because somebody
enqueued a non-existent file (or enqueued and later renamed it).
-rw-r--r--lib/dtas/source/splitfx.rb19
1 files changed, 9 insertions, 10 deletions
diff --git a/lib/dtas/source/splitfx.rb b/lib/dtas/source/splitfx.rb
index 2b10e5c..5340f3d 100644
--- a/lib/dtas/source/splitfx.rb
+++ b/lib/dtas/source/splitfx.rb
@@ -33,23 +33,22 @@ class DTAS::Source::SplitFX < DTAS::Source::Sox # :nodoc:
     end
 
     sfx = DTAS::SplitFX.new
-    begin
-      Dir.chdir(File.dirname(ymlfile)) do # ugh
-        @ymlhash = YAML.load(buf)
-        @ymlhash['tracks'] ||= [ "t 0 default" ]
-        sfx.import(@ymlhash)
-        sfx.infile.replace(File.expand_path(sfx.infile))
-      end
-      @splitfx = sfx
-    rescue
-      return false
+    Dir.chdir(File.dirname(ymlfile)) do # ugh
+      @ymlhash = YAML.load(buf)
+      @ymlhash['tracks'] ||= [ "t 0 default" ]
+      sfx.import(@ymlhash)
+      sfx.infile.replace(File.expand_path(sfx.infile))
     end
+    @splitfx = sfx
     @infile = ymlfile
     sox = @sox.try(sfx.infile, offset) or return false
     rv = source_file_dup(ymlfile, offset)
     rv.sox = sox
     rv.env = sfx.env
     rv
+  rescue => e
+    warn "#{e.message} (#{e.class})"
+    false
   end
 
   def __load_comments