From f260cd93067d81e7e5bc33d8f1b30f0639a1dc89 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 10 Oct 2013 09:10:51 +0000 Subject: format: common detection code (based on sox) This reduces duplication for sox-based components, which our audio editing components will rely on. We only use avconv/ffmpeg for odd formats which sox does not play natively, and editing audio in strange/lossy formats is undesirable anyways. --- lib/dtas/splitfx.rb | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'lib/dtas/splitfx.rb') diff --git a/lib/dtas/splitfx.rb b/lib/dtas/splitfx.rb index b83f7db..6f1654e 100644 --- a/lib/dtas/splitfx.rb +++ b/lib/dtas/splitfx.rb @@ -134,27 +134,12 @@ class DTAS::SplitFX # :nodoc: load_tracks!(hash) end - # FIXME: duplicate from dtas/source/sox - def precision - qx(@env, %W(soxi -p #@infile), err: "/dev/null").to_i # sox.git f4562efd0aa3 - rescue # fallback to parsing the whole output - s = qx(@env, %W(soxi #@infile), err: "/dev/null") - s =~ /Precision\s+:\s*(\d+)-bit/n - v = $1.to_i - return v if v > 0 - raise TypeError, "could not determine precision for #@infile" - end - def load_input!(hash) @infile = hash["infile"] or raise ArgumentError, "'infile' not specified" if infmt = hash["infmt"] # rarely needed @infmt = DTAS::Format.load(infmt) else # likely - @infmt = DTAS::Format.new - @infmt.channels = qx(@env, %W(soxi -c #@infile)).to_i - @infmt.rate = qx(@env, %W(soxi -r #@infile)).to_i - @infmt.bits ||= precision - # we don't care for type + @infmt = DTAS::Format.from_file(@env, @infile) end end -- cgit v1.2.3-24-ge0c7