hallon-fifo 0.0.2 → 0.0.3

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+
+*.sublime-*

data/lib/hallon-fifo/fifo.rb

@@ -3,29 +3,23 @@ require "mkfifo"
 module Hallon
 	class Fifo
 
+		attr_accessor :format, :output
+
 		def initialize
 			@buffer = Array.new
 			@playing, @stopped = false
-			@buffer_size = 22050
+			@buffer_size = 22050 # overridden by format=
 
 			@output ||= "hallon-fifo.pcm"
 			File.delete(@output) if File.exists?(@output)
 			File.mkfifo(@output) # Will error if it's overwriting another file
 		end
 
-		def format
-			@format
-		end
-
 		def format=(new_format)
 			@format = new_format
 			@buffer_size = new_format[:rate] / 2
 		end
 
-		def output
-			@output
-		end
-
 		def output=(new_output)
 			old_output, @output = @output, new_output
 
@@ -36,6 +30,7 @@ module Hallon
 
 		def drops
 			# This SHOULD return the number of times the queue "stuttered"
+			# However, it ain't easy to do this with only knowledge of the fifo pipe.
 			0
 		end
 
@@ -55,25 +50,38 @@ module Hallon
 			@buffer.clear
 		end
 
+		def reset
+			self.output = @output
+		end
+
 		def stream # runs indefinitely
 			@stream_thread = Thread.new do
 				queue = File.new(@output, "wb")
 
 				loop do
 
+					start = Time.now.to_f
+					complete = start + 0.5
+
 					# Get the next block from Spotify.
 					audio_data = yield(@buffer_size)
 
 					if audio_data.nil? # Audio format has changed, reset buffer.
-						@buffer.clear # reset structure
-					else # Write to our buffer and, if playing, to the FIFO queue.
+						@buffer.clear
+					else
 						@buffer += audio_data
-
-						queue.syswrite packed_samples(@buffer)
+						begin
+							queue.syswrite packed_samples(@buffer)
+						rescue Errno::EPIPE
+					        self.reset
+						end
 						@buffer.clear
 					end
 
 					ensure_playing
+
+					finish = Time.now.to_f
+					sleep complete - finish if finish < complete
 				end
 			end
 		end

data/lib/hallon-fifo/version.rb

@@ -1,5 +1,5 @@
 module Hallon
   class Fifo
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hallon-fifo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mkfifo
@@ -69,3 +69,4 @@ signing_key:
 specification_version: 3
 summary: Stream Spotify through Hallon to a FIFO queue.
 test_files: []
+has_rdoc: