pulseaudio 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/gui/choose_active_sink/choose_active_sink.rb

@@ -17,6 +17,9 @@ class PulseAudio::Gui::Choose_active_sink
     @ui["tvSources"].columns[0].visible = false
     self.reload_sources
     
+    PulseAudio::Sink::Input.auto_redirect_new_inputs_to_default_sink
+    PulseAudio::Source::Output.auto_redirect_new_outputs_to_default_source
+    
     @ui["window"].show_all
   end
   

data/include/pulseaudio_events.rb

@@ -0,0 +1,110 @@
+#This class listens for PulseAudio events, which you are able to connect to.
+#===Examples
+# events = PulseAudio::Events.instance
+# events.connect(:event => :new, :element => "sink-input") do |data|
+#   print "New event: #{data}\n"
+# end
+class PulseAudio::Events
+  @@events_instance = nil
+  
+  #Returns the default instance of events - only one can exist!
+  def self.instance
+    @@events_instance = PulseAudio::Events.new if !@@events_instance
+    return @@events_instance
+  end
+  
+  def initialize(args = {})
+    raise "An instance already exists." if @@events_instance
+    
+    @args = args
+    @connects = {}
+    @connects_count = 0
+    @connects_mutex = Mutex.new
+    require "open3"
+    
+    @thread = Thread.new do
+      begin
+        #Has to be done via PTY, since "pactl subscribe" requires a tty to write to...
+        require "pty"
+        PTY.spawn("pactl subscribe") do |stdout, stdin, pid|
+          @pid = pid
+          
+          #Make sure destroy is called, when the process stops - else it might freeze.
+          Kernel.at_exit do
+            self.destroy
+          end
+          
+          stdout.sync = true
+          stdout.each_line do |line|
+            if match = line.match(/^Event '(.+)' on (.+) #(\d+)/)
+              event = match[1].to_sym
+              element = match[2]
+              element_id = match[3].to_i
+              
+              self.call(:event => event, :element => element, :element_id => element_id)
+            else
+              $stderr.puts "PulseAudio::Events thread could not unstand: '#{line}'."
+            end
+          end
+        end
+      rescue => e
+        if !@args
+          #ignore - this means the process has been killed.
+        else
+          $stderr.puts "An error occurred in the PulseAudio::Events thread!"
+          $stderr.puts e.inspect
+          $stderr.puts e.backtrace
+        end
+      end
+    end
+  end
+  
+  def destroy
+    @args = nil
+    @connects = nil
+    Process.kill("HUP", @pid) if @pid
+    @@events_instance = nil
+  end
+  
+  def connect(args, &block)
+    raise "'args' wasnt a hash." if !args.is_a?(Hash)
+    
+    @connects_mutex.synchronize do
+      id = @connects_count
+      @connects_count += 1
+      @connects[id] = {:args => args, :block => block}
+      
+      return {:connect_id => id}
+    end
+  end
+  
+  def unconnect(args)
+    @connects_mutex.synchronize do
+      raise "No connection by that ID: '#{args[:connect_id]}'." if !@connects.key?(args[:connect_id])
+      @connects.delete(args[:connect_id])
+    end
+  end
+  
+  def call(args)
+    @connects_mutex.synchronize do
+      @connects.each do |id, connect_data|
+        call = true
+        
+        connect_data[:args].each do |key, val|
+          if !args.key?(key) or args[key] != val
+            call = false
+            break
+          end
+        end
+        
+        if call
+          connect_data[:block].call(:args => args)
+        end
+      end
+    end
+  end
+  
+  def join
+    @thread.join if @thread
+  end
+end

data/include/pulseaudio_sink.rb

@@ -10,6 +10,15 @@ class PulseAudio::Sink
   
   @@sinks = Wref_map.new
   
+  #Used to look up IDs from names (like when getting default sink).
+  @@sink_name_to_id_ref = {}
+  
+  #Autoloader for subclasses.
+  def self.const_missing(name)
+    require "#{File.realpath(File.dirname(__FILE__))}/pulseaudio_sink_#{name.to_s.downcase}.rb"
+    return PulseAudio::Sink.const_get(name)
+  end
+  
   #Returns a list of sinks on the system. It also reloads information for all sinks if the information has been changed.
   #===Examples
   # sinks = PulseAudio::Sink.list
@@ -33,6 +42,7 @@ class PulseAudio::Sink
       if !sink
         sink = PulseAudio::Sink.new
         @@sinks[sink_id] = sink
+        @@sink_name_to_id_ref[props["name"]] = sink_id
       end
       
       sink.update(args)
@@ -51,6 +61,33 @@ class PulseAudio::Sink
     end
   end
   
+  #Returns the default sink by doing a smart lookup and using the 'name-to-id-ref'-cache.
+  def self.by_default
+    def_str = %x[pacmd info | grep "Default sink name"]
+    raise "Could not match default sink." if !match = def_str.match(/^Default sink name: (.+?)\s*$/)
+    sink_id = @@sink_name_to_id_ref[match[1]]
+    raise "Could not figure out sink-ID." if !sink_id
+    return PulseAudio::Sink.by_id(sink_id.to_i)
+  end
+  
+  #Returns a sink by its sink-ID.
+  #===Examples
+  # sink = PulseAudio::Sink.by_id(3)
+  def self.by_id(id)
+    #Return it from the weak-reference-map, if it already exists there.
+    if sink = @@sinks.get!(id)
+      return sink
+    end
+    
+    #Read the sinks one-by-one and return it when found.
+    PulseAudio::Sink.list do |sink|
+      return sink if sink.sink_id == id
+    end
+    
+    #Sink could not be found by the given ID - raise error.
+    raise NameError, "No sink by that ID: '#{id}' (#{id.class.name})."
+  end
+  
   #Updates the data on the object. This should not be called.
   def update(args)
     @args = args

data/include/pulseaudio_sink_input.rb

@@ -2,10 +2,34 @@
 class PulseAudio::Sink::Input
   @@inputs = Wref_map.new
   
+  #Starts automatically redirect new opened inputs to the default sink.
+  #===Examples
+  # PulseAudio::Sink::Input.auto_redirect_new_inputs_to_default_sink
+  def self.auto_redirect_new_inputs_to_default_sink
+    raise "Already redirecting!" if @auto_redirect_connect_id
+    
+    @auto_redirect_connect_id = PulseAudio::Events.instance.connect(:event => :new, :element => "sink-input") do |data|
+      begin
+        sink_input = PulseAudio::Sink::Input.by_id(data[:args][:element_id])
+        sink_input.sink = PulseAudio::Sink.by_default
+      rescue NameError
+        #sometimes sinks are killed instantly and we cant find them before that happens.
+      end
+    end
+  end
+  
+  #Stops automatically redirecting new opened inputs to the default sink.
+  #===Examples
+  # PulseAudio::Sink::Input.stop_auto_redirect_new_inputs_to_default_sink
+  def self.stop_auto_redirect_new_inputs_to_default_sink
+    raise "Not redirecting at the moment." if !@auto_redirect_connect_id
+    PulseAudio::Events.instance.unconnect(@auto_redirect_connect_id)
+    @auto_redirect_connect_id = nil
+  end
+  
   #Returns a list of sink-inputs.
   def self.list
     list = %x[pacmd list-sink-inputs]
-    
     inputs = [] unless block_given?
     
     list.scan(/index: (\d+)/) do |match|
@@ -34,6 +58,24 @@ class PulseAudio::Sink::Input
     end
   end
   
+  #Returns a sink-input by its input-ID.
+  #===Examples
+  # sink_input = PulseAudio::Sink::Input.by_id(53)
+  def self.by_id(id)
+    #Return it from the weak-reference-map, if it already exists there.
+    if input = @@inputs.get!(id)
+      return input
+    end
+    
+    #Read the inputs one-by-one and return it when found.
+    PulseAudio::Sink::Input.list do |input|
+      return input if input.input_id == id
+    end
+    
+    #Input could not be found by the given ID - raise error.
+    raise NameError, "No sink-input by that ID: '#{id}' (#{id.class.name})."
+  end
+  
   #Should not be called manually but through 'list'.
   def update(args)
     @args = args

data/include/pulseaudio_source.rb

@@ -3,6 +3,13 @@ class PulseAudio::Source
   attr_reader :args
   
   @@sources = Wref_map.new
+  @@sources_name_to_id_ref = {}
+  
+  #Autoloader for subclasses.
+  def self.const_missing(name)
+    require "#{File.realpath(File.dirname(__FILE__))}/pulseaudio_source_#{name.to_s.downcase}.rb"
+    return PulseAudio::Source.const_get(name)
+  end
   
   def self.list
     list = %x[pactl list sources]
@@ -21,6 +28,7 @@ class PulseAudio::Source
       if !source
         source = PulseAudio::Source.new
         @@sources[source_id] = source
+        @@sources_name_to_id_ref[props["name"]] = source_id
       end
       
       source.update(args)
@@ -39,6 +47,33 @@ class PulseAudio::Source
     end
   end
   
+  #Returns the default source by doing a smart lookup and using the 'name-to-id-ref'-cache.
+  def self.by_default
+    def_str = %x[pacmd info | grep "Default source name"]
+    raise "Could not match default source." if !match = def_str.match(/^Default source name: (.+?)\s*$/)
+    source_id = @@sources_name_to_id_ref[match[1]]
+    raise "Could not figure out source-ID." if !source_id
+    return PulseAudio::Source.by_id(source_id.to_i)
+  end
+  
+  #Returns a source by its source-ID.
+  #===Examples
+  # source = PulseAudio::Source.by_id(3)
+  def self.by_id(id)
+    #Return it from the weak-reference-map, if it already exists there.
+    if source = @@sources.get!(id)
+      return source
+    end
+    
+    #Read the sources one-by-one and return it when found.
+    PulseAudio::Source.list do |source|
+      return source if source.source_id == id
+    end
+    
+    #Source could not be found by the given ID - raise error.
+    raise NameError, "No source by that ID: '#{id}' (#{id.class.name})."
+  end
+  
   #Updates the data on the object. This should not be called.
   def update(args)
     @args = args

data/include/pulseaudio_source_output.rb

@@ -2,6 +2,31 @@
 class PulseAudio::Source::Output
   @@outputs = Wref_map.new
   
+  #Starts automatically redirect new opened outputs to the default source.
+  #===Examples
+  # PulseAudio::Source::Output.auto_redirect_new_outputs_to_default_source
+  def self.auto_redirect_new_outputs_to_default_source
+    raise "Already redirecting!" if @auto_redirect_connect_id
+    
+    @auto_redirect_connect_id = PulseAudio::Events.instance.connect(:event => :new, :element => "source-output") do |data|
+      begin
+        source_output = PulseAudio::Source::Output.by_id(data[:args][:element_id])
+        source_output.source = PulseAudio::Source.by_default
+      rescue NameError
+        #sometimes sources are killed instantly and we cant find them before that happens.
+      end
+    end
+  end
+  
+  #Stops automatically redirecting new opened outputs to the default source.
+  #===Examples
+  # PulseAudio::Source::Output.stop_auto_redirect_new_outputs_to_default_source
+  def self.stop_auto_redirect_new_outputs_to_default_source
+    raise "Not redirecting at the moment." if !@auto_redirect_connect_id
+    PulseAudio::Events.instance.unconnect(@auto_redirect_connect_id)
+    @auto_redirect_connect_id = nil
+  end
+  
   #Returns a list of source-outputs.
   def self.list
     list = %x[pacmd list-source-outputs]

data/lib/pulseaudio.rb

@@ -2,14 +2,9 @@ require "wref"
 
 #A framework for controlling various elements of PulseAudio in Ruby.
 class PulseAudio
-end
-
-dir = "#{File.dirname(__FILE__)}/../include"
-files = []
-Dir.foreach(dir) do |file|
-  files << "#{dir}/#{file}" if file.match(/\.rb$/)
-end
-
-files.sort.each do |file|
-  require file
+  #Autoloader for subclasses.
+  def self.const_missing(name)
+    require "#{File.realpath("#{File.dirname(__FILE__)}/../include")}/pulseaudio_#{name.to_s.downcase}.rb"
+    return PulseAudio.const_get(name)
+  end
 end

data/pulseaudio.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pulseaudio}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-06-07}
+  s.date = %q{2012-06-27}
   s.default_executable = %q{pulseaudio_volume.rb}
   s.description = %q{Ruby-library for controlling PulseAudio via 'pactl'.}
   s.email = %q{k@spernj.org}
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "bin/pulseaudio_volume.rb",
     "gui/choose_active_sink/choose_active_sink.glade",
     "gui/choose_active_sink/choose_active_sink.rb",
+    "include/pulseaudio_events.rb",
     "include/pulseaudio_gui.rb",
     "include/pulseaudio_sink.rb",
     "include/pulseaudio_sink_input.rb",

data/spec/pulseaudio_spec.rb

@@ -9,4 +9,17 @@ describe "Pulseaudio" do
       sink.mute_toggle
     end
   end
+  
+  it "should be able to listen for events and redirect all new inputs to the default sink" do
+    def_sink = nil
+    PulseAudio::Sink.list do |sink|
+      if sink.default?
+        def_sink = sink
+        break
+      end
+    end
+    
+    PulseAudio::Sink::Input.auto_redirect_new_inputs_to_default_sink
+    PulseAudio::Events.instance.join
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: pulseaudio
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-07 00:00:00 +02:00
+date: 2012-06-27 00:00:00 +02:00
 default_executable: pulseaudio_volume.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,6 +100,7 @@ files:
 - bin/pulseaudio_volume.rb
 - gui/choose_active_sink/choose_active_sink.glade
 - gui/choose_active_sink/choose_active_sink.rb
+- include/pulseaudio_events.rb
 - include/pulseaudio_gui.rb
 - include/pulseaudio_sink.rb
 - include/pulseaudio_sink_input.rb
@@ -125,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1013676805268999016
+      hash: -248938999908362566
       segments: 
       - 0
       version: "0"