raop-client 0.1.0 → 0.1.1

data/CHANGELOG.txt

@@ -1,5 +1,11 @@
 = Net::RAOP::Client CHANGELOG
 
+== 0.1.1
+
+* Fixing a bug with setting volume.
+* Added options and flush methods
+* Using IO#write instead of IO#syswrite
+
 == 0.1.0
 
 * Birthday!

data/examples/read_stdin.rb

@@ -6,6 +6,8 @@ require 'raop'
 
 raop = Net::RAOP::Client.new(ARGV[0])
 raop.connect
+raop.volume = -10
 raop.play $stdin
+sleep 10
 raop.disconnect
 

data/lib/raop/client.rb

@@ -4,7 +4,7 @@ require 'socket'
 class Net::RAOP::Client
   ##
   # The version of Net::RAOP::Client you're using
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 
   ##
   # Create a new Net::RAOP::Client to connect to +host+ Airport Express
@@ -55,8 +55,8 @@ class Net::RAOP::Client
   ##
   # Set the +volume+ on the Airport Express. -144 is quiet, 0 is loud.
   def volume=(volume)
-    volume = 0 + volume if volume < 0
-    raise ArgumentError if volume < 0 || volume > 144
+    volume = volume.abs
+    raise ArgumentError if volume > 144
     params = Net::RTSP::SetParameter.new(@session_id,
                                          { :volume => "-#{volume}".to_i }
                                         )
@@ -78,6 +78,15 @@ class Net::RAOP::Client
   end
 
   private
+  def flush
+    puts @seq
+    @rtsp_client.request(Net::RTSP::Flush.new(@session_id, @seq))
+  end
+
+  def options
+    @rtsp_client.request(Net::RTSP::Options.new)
+  end
+
   @@data_cache = {}
   def send_sample(sample, pos = 0, count = sample.length)
     # FIXME do we really need +pos+ or +count+?
@@ -103,7 +112,7 @@ class Net::RAOP::Client
       @aes_crypt.update(sample.slice(0, crypt_length)) +
       sample.slice(crypt_length, sample.length)
 
-    @data_socket.syswrite(data)
+    @data_socket.write(data)
   end
 
   def rsa_encrypt(plain_text)

data/lib/raop/rtsp.rb

@@ -105,9 +105,9 @@ module Net
       end
 
       private
-      def write_header(sock, client_id, cseq)
+      def write_header(sock, client_id, cseq, url = nil)
         self['Content-Length'] = @body.length.to_s if @body
-        url = sprintf("rtsp://%s/%s", sock.io.addr.last, client_id)
+        url ||= sprintf("rtsp://%s/%s", sock.io.addr.last, client_id)
         buf = "#{@method} #{url} RTSP/1.0\r\n" +
           "CSeq: #{cseq}\r\n"
         each_capitalized do |k,v|
@@ -124,12 +124,40 @@ module Net
       end
     end
 
+    class GetParameter < RTSPGenericRequest
+      def initialize(session_id, parameters)
+        super('GET_PARAMETER')
+        self['Content-Type'] = 'text/parameters'
+        self['Session']   = session_id
+        @body = parameters.join("\r\n") + "\r\n"
+      end
+    end
+
+    class Options < RTSPGenericRequest
+      def initialize
+        super('OPTIONS')
+      end
+
+      private
+      def write_header(sock, client_id, cseq, url = nil)
+        super(sock, client_id, cseq, '*')
+      end
+    end
+
     class Teardown < RTSPGenericRequest
       def initialize
         super('TEARDOWN')
       end
     end
 
+    class Flush < RTSPGenericRequest
+      def initialize(session_id, seq)
+        super('Flush')
+        self['Session']   = session_id
+        self['RTP-Info']  = "seq=0;rtptime=0"
+      end
+    end
+
     class SetParameter < RTSPGenericRequest
       def initialize(session_id, opts = {})
         super('SET_PARAMETER')
@@ -146,7 +174,7 @@ module Net
       def initialize(session_id)
         super('RECORD')
         self['Range']     = 'npt=0-'
-        self['RTP-Info']  = 'seq=0;rtptime=0'
+        self['RTP-Info']  = "seq=0;rtptime=0"
         self['Session']   = session_id
       end
     end
@@ -167,6 +195,7 @@ module Net
         self['Apple-Challenge'] = sac.gsub(/[=\s]/, '')
       end
 
+      private
       def write_header(sock, client_id, cseq)
         @body = sprintf(
                 "v=0\r\n" +

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: raop-client
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-06-14 00:00:00 -07:00
+  version: 0.1.1
+date: 2007-06-17 00:00:00 -07:00
 summary: Airport Express streaming music client
 require_paths: 
   - lib