@@ -24,9 +24,6 @@ You need these gems mongrel dnssd -# If you haven't already... -$ export RUBYOPT=rrubygems - === = The performance README @@ -1,9 +1,9 @@ +require 'rubygems' require 'rack' require 'midiator' require 'mongrel' require 'dnssd' - class Curlophone include MIDIator::Notes @@ -46,12 +46,7 @@ end port = (ARGV[0] || 4321).to_i unless Kernel.const_defined?("DNSSD_BROADCAST") - tr = DNSSD::TextRecord.new - tr['description'] = "Curlophone!" - tr['curlophone'] = 'true' # distinguish from other servers - - name = 'curlophone' - DNSSD.register(name, "_http._tcp", 'local', port, tr.encode) do |rr| + DNSSD.register('curlophone', "_curlophone._tcp", 'local', port) do |rr| puts "Curlophone in tune, listening on port #{port}" end DNSSD_BROADCAST = true curlophone.rb @@ -1,3 +1,4 @@ +require 'rubygems' require 'midiator' require 'net/http' require 'dnssd' @@ -11,18 +12,16 @@ end def discover(timeout=1) waiting_thread = Thread.current - dns = DNSSD.browse "_http._tcp" do |reply| + dns = DNSSD.browse "_curlophone._tcp" do |reply| DNSSD.resolve reply.name, reply.type, reply.domain do |resolve_reply| - if resolve_reply.text_record['curlophone'] - service = Service.new(reply.name, - resolve_reply.target, - resolve_reply.port, - resolve_reply.text_record['description'].to_s) - begin - yield service - rescue Done - waiting_thread.run - end + service = Service.new(reply.name, + resolve_reply.target, + resolve_reply.port, + "Curlophone!") + begin + yield service + rescue Done + waiting_thread.run end end end ode.rb 573ac822f25801760af6468185ea0f0921a32cf3 Xavier Shay xavier@rhnh.net http://github.com/xaviershay/curlophone-orchestra/commit/a78e1b8d557529f089ce0983c12b911695ef6493 a78e1b8d557529f089ce0983c12b911695ef6493 2009-09-04T00:41:11-07:00 2009-09-04T00:41:11-07:00 Explicitly require rubygems, announce DNSSD on _curlophone._tcp, needed to get working on latest versions of everything 7f62ed4c0809df52f6a70cd96794f2fe19d0dffd Xavier Shay xavier@rhnh.net