pulseaudio 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/gui/choose_active_sink/choose_active_sink.glade

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.24"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkWindow" id="window">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Choose active sink</property>
+    <property name="window_position">center</property>
+    <property name="default_width">440</property>
+    <property name="default_height">400</property>
+    <child>
+      <object class="GtkVPaned" id="vpaned1">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="position">200</property>
+        <child>
+          <object class="GtkFrame" id="frame1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <object class="GtkAlignment" id="alignment1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkViewport" id="viewport1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkScrolledWindow" id="scrolledwindow2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
+                        <child>
+                          <object class="GtkTreeView" id="tvSinks">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <signal name="cursor-changed" handler="on_tvSinks_cursor_changed" swapped="no"/>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;b&gt;Choose active sink&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="resize">False</property>
+            <property name="shrink">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkFrame" id="frame2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <object class="GtkAlignment" id="alignment2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkViewport" id="viewport2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkScrolledWindow" id="scrolledwindow1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
+                        <child>
+                          <object class="GtkTreeView" id="tvSources">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <signal name="cursor-changed" handler="on_tvSources_cursor_changed" swapped="no"/>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;b&gt;Choose default source&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="resize">True</property>
+            <property name="shrink">True</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

data/gui/choose_active_sink/choose_active_sink.rb

@@ -0,0 +1,85 @@
+class PulseAudio::Gui::Choose_active_sink
+  attr_reader :ui
+  
+  def initialize
+    require "gtk2"
+    require "knjrbfw"
+    
+    @ui = Gtk::Builder.new.add("#{File.dirname(__FILE__)}/choose_active_sink.glade")
+    @ui.connect_signals{|h| method(h)}
+    
+    #Init treeviews.
+    Knj::Gtk2::Tv.init(@ui["tvSinks"], ["ID", "Name"])
+    @ui["tvSinks"].columns[0].visible = false
+    self.reload_sinks
+    
+    Knj::Gtk2::Tv.init(@ui["tvSources"], ["ID", "Name"])
+    @ui["tvSources"].columns[0].visible = false
+    self.reload_sources
+    
+    @ui["window"].show_all
+  end
+  
+  def reload_sinks
+    @reloading = true
+    @ui["tvSinks"].model.clear
+    PulseAudio::Sink.list do |sink|
+      append_data = @ui["tvSinks"].append([sink.sink_id, sink.args[:props]["description"]])
+      
+      if sink.default?
+        @ui["tvSinks"].selection.select_iter(append_data[:iter])
+      end
+    end
+    
+    @reloading = false
+  end
+  
+  def reload_sources
+    @reloading = true
+    
+    @ui["tvSources"].model.clear
+    PulseAudio::Source.list do |source|
+      append_data = @ui["tvSources"].append([source.source_id, source.args[:props]["description"]])
+      
+      if source.default?
+        @ui["tvSources"].selection.select_iter(append_data[:iter])
+      end
+    end
+    
+    @reloading = false
+  end
+  
+  def on_tvSinks_cursor_changed
+    return nil if @reloading
+    sel = @ui["tvSinks"].sel
+    return nil if !sel
+    
+    sink = nil
+    PulseAudio::Sink.list do |sink_i|
+      if sink_i.sink_id.to_i == sel[0].to_i
+        sink = sink_i
+        break
+      end
+    end
+    
+    raise "Could not find sink." if !sink
+    sink.default!
+  end
+  
+  def on_tvSources_cursor_changed
+    return nil if @reloading
+    sel = @ui["tvSources"].sel
+    return nil if !sel
+    
+    source = nil
+    PulseAudio::Source.list do |source_i|
+      if source_i.source_id.to_i == sel[0].to_i
+        source = source_i
+        break
+      end
+    end
+    
+    raise "Could not find source." if !source
+    source.default!
+  end
+end

data/include/pulseaudio_gui.rb

@@ -0,0 +1,8 @@
+#Subclass for gui elements.
+class PulseAudio::Gui
+  #Autoloader for subclasses.
+  def self.const_missing(name)
+    require "#{File.dirname(__FILE__)}/../gui/#{name.to_s.downcase}/#{name.to_s.downcase}.rb"
+    return PulseAudio::Gui.const_get(name)
+  end
+end

data/include/pulseaudio_sink.rb

@@ -0,0 +1,140 @@
+#Class for controlling sinks. The sinks on the sytem can be gotten by running the list-method.
+#===Examples
+# sinks = PulseAudio::Sink.list
+# sinks.each do |sink|
+#   sink.vol_decr if sink.active?
+# end
+class PulseAudio::Sink
+  #The arguments-hash. Contains various data for the sink.
+  attr_reader :args
+  
+  @@sinks = Wref_map.new
+  
+  #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
+  # sinks.each do |sink|
+  #   sink.vol_decr if sink.active?
+  # end
+  def self.list
+    list = %x[pactl list sinks]
+    sinks = [] unless block_given?
+    
+    list.scan(/(\n|^)Sink #(\d+)\s+([\s\S]+?)Formats:\s+(.+?)\n/) do |match|
+      props = {}
+      match[2].scan(/(\t|^)([A-z]+?): (.+?)\n/) do |match_prop|
+        props[match_prop[1].downcase] = match_prop[2]
+      end
+      
+      sink_id = match[1].to_i
+      args = {:sink_id => sink_id, :props => props}
+      
+      sink = @@sinks.get!(sink_id)
+      if !sink
+        sink = PulseAudio::Sink.new
+        @@sinks[sink_id] = sink
+      end
+      
+      sink.update(args)
+      
+      if block_given?
+        yield(sink)
+      else
+        sinks << sink
+      end
+    end
+    
+    if block_given?
+      return nil
+    else
+      return sinks
+    end
+  end
+  
+  #Updates the data on the object. This should not be called.
+  def update(args)
+    @args = args
+  end
+  
+  #Returns the ID of the sink.
+  #===Examples
+  # sink.sink_id #=> 2
+  def sink_id
+    return @args[:sink_id].to_i
+  end
+  
+  #Returns true if the sink is active. Otherwise false.
+  #===Examples
+  # sink.active? #=> true
+  def active?
+    return true if @args[:props]["state"].to_s.downcase == "running"
+    return false
+  end
+  
+  #Returns true if the sink is muted. Otherwise false.
+  #===Examples
+  # sink.muted? #=> false
+  def muted?
+    return true if @args[:props]["mute"] == "yes"
+    return false
+  end
+  
+  #Toggles the mute-functionality of the sink. If it is muted: unmutes. If it isnt muted: mutes.
+  #===Examples
+  # sink.mute_toggle #=> nil
+  def mute_toggle
+    self.mute = !self.muted?
+    return nil
+  end
+  
+  #Sets the mute to something specific.
+  #===Examples
+  # sink.mute = true #=> nil
+  def mute=(val)
+    if val
+      %x[pactl set-sink-mute #{self.sink_id} 1]
+    else
+      %x[pactl set-sink-mute #{self.sink_id} 0]
+    end
+    
+    PulseAudio::Sink.list #reload info.
+    return nil
+  end
+  
+  #Increases the volume of the sink by 5%.
+  #===Examples
+  # sink.vol_incr if sink.active? #=> nil
+  def vol_incr
+    %x[pactl set-sink-volume #{self.sink_id} -- +5%]
+    PulseAudio::Sink.list #reload info.
+    return nil
+  end
+  
+  #Decreases the volume of the sink by 5%.
+  #===Examples
+  # sink.vol_decr if sink.active? #=> nil
+  def vol_decr
+    %x[pactl set-sink-volume #{self.sink_id} -- -5%]
+    PulseAudio::Sink.list #reload info.
+    return nil
+  end
+  
+  #Returns true if this sink is the default one.
+  def 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*$/)
+    return true if @args[:props]["name"] == match[1]
+  end
+  
+  #Sets this sink to be the default one. Also moves all inputs to this sink.
+  #===Examples
+  # sink.default!
+  def default!
+    PulseAudio::Sink::Input.list do |input|
+      input.sink = self
+    end
+    
+    %x[pacmd set-default-sink #{self.sink_id}]
+    return nil
+  end
+end

data/include/pulseaudio_sink_input.rb

@@ -0,0 +1,52 @@
+#Class for controlling inputs.
+class PulseAudio::Sink::Input
+  @@inputs = Wref_map.new
+  
+  #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|
+      input_id = match[0].to_i
+      args = {:input_id => input_id}
+      
+      input = @@inputs.get!(input_id)
+      if !input
+        input = PulseAudio::Sink::Input.new
+        @@inputs[input_id] = input
+      end
+      
+      input.update(args)
+      
+      if block_given?
+        yield(input)
+      else
+        inputs << input
+      end
+    end
+    
+    if block_given?
+      return nil
+    else
+      return inputs
+    end
+  end
+  
+  #Should not be called manually but through 'list'.
+  def update(args)
+    @args = args
+  end
+  
+  #Returns the input-ID.
+  def input_id
+    return @args[:input_id]
+  end
+  
+  #Moves the output to a new sink.
+  def sink=(newsink)
+    %x[pacmd move-sink-input #{self.input_id} #{newsink.sink_id}]
+    return nil
+  end
+end

data/include/pulseaudio_source.rb

@@ -0,0 +1,72 @@
+class PulseAudio::Source
+  #The arguments-hash. Contains various data for the source.
+  attr_reader :args
+  
+  @@sources = Wref_map.new
+  
+  def self.list
+    list = %x[pactl list sources]
+    sources = [] unless block_given?
+    
+    list.scan(/(\n|^)Source #(\d+)\s+([\s\S]+?)Formats:\s+(.+?)\n/) do |match|
+      props = {}
+      match[2].scan(/(\t|^)([A-z]+?): (.+?)\n/) do |match_prop|
+        props[match_prop[1].downcase] = match_prop[2]
+      end
+      
+      source_id = match[1].to_i
+      args = {:source_id => source_id, :props => props}
+      
+      source = @@sources.get!(source_id)
+      if !source
+        source = PulseAudio::Source.new
+        @@sources[source_id] = source
+      end
+      
+      source.update(args)
+      
+      if block_given?
+        yield(source)
+      else
+        sources << source
+      end
+    end
+    
+    if block_given?
+      return nil
+    else
+      return sources
+    end
+  end
+  
+  #Updates the data on the object. This should not be called.
+  def update(args)
+    @args = args
+  end
+  
+  #Returns the ID of the source.
+  #===Examples
+  # source.source_id #=> 2
+  def source_id
+    return @args[:source_id].to_i
+  end
+  
+  #Returns true if this source is the default one.
+  def 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*$/)
+    return true if @args[:props]["name"] == match[1]
+  end
+  
+  #Sets this source to be the default one. Also moves all outputs to this source.
+  #===Examples
+  # source.default!
+  def default!
+    PulseAudio::Source::Output.list do |output|
+      output.source = self
+    end
+    
+    %x[pacmd set-default-source #{self.source_id}]
+    return nil
+  end
+end

data/include/pulseaudio_source_output.rb

@@ -0,0 +1,52 @@
+#Class for controlling outputs.
+class PulseAudio::Source::Output
+  @@outputs = Wref_map.new
+  
+  #Returns a list of source-outputs.
+  def self.list
+    list = %x[pacmd list-source-outputs]
+    
+    outputs = [] unless block_given?
+    
+    list.scan(/index: (\d+)/) do |match|
+      output_id = match[0].to_i
+      args = {:output_id => output_id}
+      
+      output = @@outputs.get!(output_id)
+      if !output
+        output = PulseAudio::Source::Output.new
+        @@outputs[output_id] = output
+      end
+      
+      output.update(args)
+      
+      if block_given?
+        yield(output)
+      else
+        outputs << output
+      end
+    end
+    
+    if block_given?
+      return nil
+    else
+      return outputs
+    end
+  end
+  
+  #Should not be called manually but through 'list'.
+  def update(args)
+    @args = args
+  end
+  
+  #Returns the output-ID.
+  def output_id
+    return @args[:output_id]
+  end
+  
+  #Moves the output to a new source.
+  def source=(newsource)
+    %x[pacmd move-source-output #{self.output_id} #{newsource.source_id}]
+    return nil
+  end
+end

data/lib/pulseaudio.rb

@@ -1,120 +1,15 @@
+require "wref"
+
 #A framework for controlling various elements of PulseAudio in Ruby.
 class PulseAudio
-  #Class for controlling sinks. The sinks on the sytem can be gotten by running the list-method.
-  #===Examples
-  # sinks = PulseAudio::Sink.list
-  # sinks.each do |sink|
-  #   sink.vol_decr if sink.active?
-  # end
-  class Sink
-    #The arguments-hash. Contains various data for the sink.
-    attr_reader :args
-    
-    require "wref"
-    @@sinks = Wref_map.new
-    
-    #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
-    # sinks.each do |sink|
-    #   sink.vol_decr if sink.active?
-    # end
-    def self.list
-      list = %x[pactl list sinks]
-      sinks = [] unless block_given?
-      
-      list.scan(/(\n|^)Sink #(\d+)\s+([\s\S]+?)Formats:\s+(.+?)\n/) do |match|
-        props = {}
-        match[2].scan(/(\t|^)([A-z]+?): (.+?)\n/) do |match_prop|
-          props[match_prop[1].downcase] = match_prop[2]
-        end
-        
-        sink_id = match[1].to_i
-        args = {:sink_id => sink_id, :props => props}
-        
-        sink = @@sinks.get!(sink_id)
-        if !sink
-          sink = PulseAudio::Sink.new
-          @@sinks[sink_id] = sink
-        end
-        
-        sink.update(args)
-        
-        if block_given?
-          yield(sink)
-        else
-          sinks << sink
-        end
-      end
-      
-      return sinks if !block_given?
-    end
-    
-    def update(args)
-      @args = args
-    end
-    
-    #Returns the ID of the sink.
-    #===Examples
-    # sink.sink_id #=> 2
-    def sink_id
-      return @args[:sink_id].to_i
-    end
-    
-    #Returns true if the sink is active. Otherwise false.
-    #===Examples
-    # sink.active? #=> true
-    def active?
-      return true if @args[:props]["state"].to_s.downcase == "running"
-      return false
-    end
-    
-    #Returns true if the sink is muted. Otherwise false.
-    #===Examples
-    # sink.muted? #=> false
-    def muted?
-      return true if @args[:props]["mute"] == "yes"
-      return false
-    end
-    
-    #Toggles the mute-functionality of the sink. If it is muted: unmutes. If it isnt muted: mutes.
-    #===Examples
-    # sink.mute_toggle #=> nil
-    def mute_toggle
-      self.mute = !self.muted?
-      return nil
-    end
-    
-    #Sets the mute to something specific.
-    #===Examples
-    # sink.mute = true #=> nil
-    def mute=(val)
-      if val
-        %x[pactl set-sink-mute #{self.sink_id} 1]
-      else
-        %x[pactl set-sink-mute #{self.sink_id} 0]
-      end
-      
-      PulseAudio::Sink.list #reload info.
-      return nil
-    end
-    
-    #Increases the volume of the sink by 5%.
-    #===Examples
-    # sink.vol_incr if sink.active? #=> nil
-    def vol_incr
-      %x[pactl set-sink-volume #{self.sink_id} -- +5%]
-      PulseAudio::Sink.list #reload info.
-      return nil
-    end
-    
-    #Decreases the volume of the sink by 5%.
-    #===Examples
-    # sink.vol_decr if sink.active? #=> nil
-    def vol_decr
-      %x[pactl set-sink-volume #{self.sink_id} -- -5%]
-      PulseAudio::Sink.list #reload info.
-      return nil
-    end
-  end
+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
 end

data/pulseaudio.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pulseaudio}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-05-21}
+  s.date = %q{2012-06-07}
   s.default_executable = %q{pulseaudio_volume.rb}
   s.description = %q{Ruby-library for controlling PulseAudio via 'pactl'.}
   s.email = %q{k@spernj.org}
@@ -28,10 +28,19 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/pulseaudio_volume.rb",
+    "gui/choose_active_sink/choose_active_sink.glade",
+    "gui/choose_active_sink/choose_active_sink.rb",
+    "include/pulseaudio_gui.rb",
+    "include/pulseaudio_sink.rb",
+    "include/pulseaudio_sink_input.rb",
+    "include/pulseaudio_source.rb",
+    "include/pulseaudio_source_output.rb",
     "lib/pulseaudio.rb",
     "pulseaudio.gemspec",
     "spec/pulseaudio_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "test_scripts/choose_active_sink.rb",
+    "test_scripts/set_active.rb"
   ]
   s.homepage = %q{http://github.com/kaspernj/pulseaudio}
   s.licenses = ["MIT"]

data/test_scripts/choose_active_sink.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require "#{File.dirname(__FILE__)}/../lib/pulseaudio.rb"
+
+cas = PulseAudio::Gui::Choose_active_sink.new
+cas.ui["window"].signal_connect("destroy") do
+  Gtk.main_quit
+end
+
+Gtk.main

data/test_scripts/set_active.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+require "#{File.dirname(__FILE__)}/../lib/pulseaudio.rb"
+
+look_for = nil
+ARGV.each do |arg|
+  if match = arg.match(/^--look_for=(.+)$/)
+    look_for = match[1]
+  end
+end
+
+raise "No '--look_for=[SOMETHING]' was given." if !look_for
+
+sink = nil
+PulseAudio::Sink.list do |sink_i|
+  if sink_i.args[:props]["description"].index(look_for) != nil
+    sink = sink_i
+    break
+  end
+end
+
+raise "Could not find the sink by: '#{look_for}'." if !sink
+
+print "Setting '#{sink.args[:props]["description"]}'.\n"
+sink.default!

metadata

@@ -2,7 +2,7 @@
 name: pulseaudio
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-21 00:00:00 +02:00
+date: 2012-06-07 00:00:00 +02:00
 default_executable: pulseaudio_volume.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,10 +98,19 @@ files:
 - Rakefile
 - VERSION
 - bin/pulseaudio_volume.rb
+- gui/choose_active_sink/choose_active_sink.glade
+- gui/choose_active_sink/choose_active_sink.rb
+- include/pulseaudio_gui.rb
+- include/pulseaudio_sink.rb
+- include/pulseaudio_sink_input.rb
+- include/pulseaudio_source.rb
+- include/pulseaudio_source_output.rb
 - lib/pulseaudio.rb
 - pulseaudio.gemspec
 - spec/pulseaudio_spec.rb
 - spec/spec_helper.rb
+- test_scripts/choose_active_sink.rb
+- test_scripts/set_active.rb
 has_rdoc: true
 homepage: http://github.com/kaspernj/pulseaudio
 licenses: 
@@ -116,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -253030965202706745
+      hash: -1013676805268999016
       segments: 
       - 0
       version: "0"