From 68ffa097e187da663fa3f537b430428ea5e8de2e Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 25 Aug 2013 09:25:07 +0000 Subject: split out source handling to prepare for avconv/ffmpeg support We should've done this at the start, but we didn't. --- lib/dtas/player/client_handler.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/dtas/player/client_handler.rb') diff --git a/lib/dtas/player/client_handler.rb b/lib/dtas/player/client_handler.rb index cddbe4c..44f0b57 100644 --- a/lib/dtas/player/client_handler.rb +++ b/lib/dtas/player/client_handler.rb @@ -204,7 +204,7 @@ module DTAS::Player::ClientHandler # :nodoc: # this offset in the @current.format (not player @format) @queue.unshift([ @current.infile, "#{__current_decoded_samples}s" ]) else - # DTAS::Source::Command (hash), just rerun it + # DTAS::Source::Cmd (hash), just rerun it @queue.unshift(@current.to_hsh) end # We also want to hard drop the buffer so we do not get repeated audio. @@ -424,7 +424,7 @@ module DTAS::Player::ClientHandler # :nodoc: case msg.shift when "cat" io.emit({ - "command" => @srccmd || DTAS::Source::SOURCE_DEFAULTS["command"], + "command" => @srccmd || DTAS::Source::Sox::SOX_DEFAULTS["command"], "env" => @srcenv, }.to_yaml) when "ed" -- cgit v1.2.3-24-ge0c7