pulseaudio 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/gui/choose_active_sink_gtk3/choose_active_sink.glade

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkAdjustment" id="adjustmentApplicationVolume">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkAdjustment" id="adjustmentSinkVolume">
     <property name="upper">100</property>
     <property name="step_increment">1</property>
@@ -301,6 +306,114 @@
             <property name="tab_fill">False</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkBox" id="box1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkFrame" id="frameApplicationSettings">
+                <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="alignment3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkHScale" id="hscaleApplicationVolume">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="adjustment">adjustmentApplicationVolume</property>
+                        <property name="draw_value">False</property>
+                        <signal name="change-value" handler="on_hscaleApplicationVolume_change_value" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label6">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Application settings&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFrame" id="frame4">
+                <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="alignment4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkViewport" id="viewport3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkScrolledWindow" id="scrolledwindow3">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="shadow_type">in</property>
+                            <child>
+                              <object class="GtkTreeView" id="tvApplications">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <child internal-child="selection">
+                                  <object class="GtkTreeSelection" id="treeview-selection3"/>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label7">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Choose application&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="label2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Applications</property>
+          </object>
+          <packing>
+            <property name="position">2</property>
+            <property name="tab_fill">False</property>
+          </packing>
+        </child>
       </object>
     </child>
   </object>

data/gui/choose_active_sink_gtk3/choose_active_sink_gtk3.rb

@@ -30,6 +30,22 @@ class PulseAudio::Gui::Choose_active_sink_gtk3
     @ui["tvSources"].get_column(0).visible = false
     self.reload_sources
     
+    @tv_applications = Gtk3assist::Treeview.new(
+      :tv => @ui["tvApplications"],
+      :model => :liststore,
+      :sort_col => :name,
+      :cols => [
+        {:id => :id, :title => _("ID")},
+        {:id => :name, :title => _("Name")}
+      ]
+    )
+    @ui["tvApplications"].get_column(0).visible = false
+    @ui["tvApplications"].selection.signal_connect("changed", &self.method(:on_tvApplications_selection_changed))
+    
+    self.reload_applications
+    self.update_application_info
+    @ui["frameApplicationSettings"].hide
+    
     PulseAudio::Sink::Input.auto_redirect_new_inputs_to_default_sink
     PulseAudio::Source::Output.auto_redirect_new_outputs_to_default_source
     
@@ -150,6 +166,11 @@ class PulseAudio::Gui::Choose_active_sink_gtk3
     @ui["adjustmentSourceVolume"].value = @source.vol_perc.to_f
   end
   
+  def update_application_info
+    return nil if !@input
+    @ui["adjustmentApplicationVolume"].value = @input.vol_perc.to_f
+  end
+  
   def on_hscaleSinkVolume_change_value
     GLib.source_remove(@timeout_sink_volume_change) if @timeout_sink_volume_change
     
@@ -178,7 +199,7 @@ class PulseAudio::Gui::Choose_active_sink_gtk3
   
   def on_sicon_activate(*args)
     if !@ui["window"].get_visible
-      @ui["window"].show_all
+      @ui["window"].show
     else
       @ui["window"].hide
     end
@@ -272,17 +293,8 @@ class PulseAudio::Gui::Choose_active_sink_gtk3
       sel = @tv_sources.sel
       return nil if !sel
       
-      source = nil
-      PulseAudio::Source.list do |source_i|
-        if source_i.source_id.to_i == sel[:data][:id].to_i
-          source = source_i
-          break
-        end
-      end
-      
-      raise "Could not find source." if !source
-      @source = source
-      source.default!
+      @source = PulseAudio::Source.by_id(sel[:data][:id].to_i)
+      @source.default!
       self.update_icon
       self.update_source_info
     rescue => e
@@ -290,6 +302,53 @@ class PulseAudio::Gui::Choose_active_sink_gtk3
     end
   end
   
+  def add_input(input)
+    append_data = @tv_applications.add_row(:data => {:id => input.input_id, :name => input.name})
+    return append_data
+  end
+  
+  def reload_applications
+    begin
+      @reloading = true
+      
+      @tv_applications.model.clear
+      PulseAudio::Sink::Input.list do |input|
+        append_data = self.add_input(input)
+      end
+    ensure
+      @reloading = false
+    end
+  end
+  
+  def on_tvApplications_selection_changed(*args)
+    begin
+      return nil if @reloading or !@tv_applications
+      sel = @tv_applications.sel
+      
+      if !sel
+        @ui["frameApplicationSettings"].hide
+        @input = nil
+      else
+        @ui["frameApplicationSettings"].show
+        @input = PulseAudio::Sink::Input.by_id(sel[:data][:id].to_i)
+        self.update_application_info
+      end
+    rescue => e
+      raise e
+    end
+  end
+  
+  def on_hscaleApplicationVolume_change_value
+    return nil if !@input
+    GLib.source_remove(@timeout_input_volume_change) if @timeout_input_volume_change
+    
+    @timeout_input_volume_change = GLib.timeout_add(GLib::PRIORITY_DEFAULT_IDLE, 50, proc{
+      @timeout_input_volume_change = nil
+      @input.vol_perc = @ui["adjustmentApplicationVolume"].value
+      false
+    }, nil, nil)
+  end
+  
   def on_window_delete_event(*args)
     @ui["window"].hide
     return true

data/include/pulseaudio_sink_input.rb

@@ -1,5 +1,8 @@
 #Class for controlling inputs.
 class PulseAudio::Sink::Input
+  #The arguments-hash. Contains various data for the input.
+  attr_reader :args
+  
   @@inputs = Wref_map.new
   
   #Starts automatically redirect new opened inputs to the default sink.
@@ -29,21 +32,30 @@ class PulseAudio::Sink::Input
   
   #Returns a list of sink-inputs.
   def self.list
-    list = %x[pacmd list-sink-inputs]
+    list = %x[pactl list sink-inputs]
     inputs = [] unless block_given?
     
-    list.scan(/index: (\d+)/) do |match|
-      input_id = match[0].to_i
-      args = {:input_id => input_id}
-      
+    list.scan(/(\n|^)Sink Input #(\d+)\s+([\s\S]+?)(\n\n|\Z)/) do |match|
+      props = {}
+      match[2].scan(/(\s+|^)([A-z]+?): (.+?)\n/) do |match_prop|
+        props[match_prop[1].downcase] = match_prop[2]
+      end
+
+      match[2].scan(/(\t\t|^)([A-z\.]+?) = (.+?)\n/) do |match_prop|
+        props[match_prop[1].downcase.gsub(/\./, "_")] = match_prop[2].gsub(/\"/, "")
+      end
+
+      input_id = match[1].to_i
+      args = {:input_id => input_id, :props => props}
+
       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
@@ -81,6 +93,15 @@ class PulseAudio::Sink::Input
     @args = args
   end
   
+  #Returns the name of the input as a string.
+  def name
+    if app_name = @args[:props]["application_name"].to_s.strip and !app_name.empty?
+      return app_name
+    else
+      raise "Could not figure out the input-name."
+    end
+  end
+  
   #Returns the input-ID.
   def input_id
     return @args[:input_id]
@@ -91,4 +112,76 @@ class PulseAudio::Sink::Input
     %x[pacmd move-sink-input #{self.input_id} #{newsink.sink_id}]
     return nil
   end
+  
+  #Returns true if the sink is muted. Otherwise false.
+  #===Examples
+  # sink.muted? #=> false
+  def muted?
+    @args[:props]["mute"] == "yes"
+  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-input-mute #{self.input_id} 1]
+      @args[:props]["mute"] = "yes"
+    else
+      %x[pactl set-sink-input-mute #{self.input_id} 0]
+      @args[:props]["mute"] = "no"
+    end
+    
+    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-input-volume #{self.input_id} -- +5%]
+    new_vol = vol_perc + 5
+    new_vol = 100 if new_vol > 100
+    @args[:props]["volume"] = "0:  #{new_vol}% 1:  #{new_vol}%"
+    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-input-volume #{self.input_id} -- -5%]
+    new_vol = vol_perc - 5
+    new_vol = 0 if new_vol < 0
+    @args[:props]["volume"] = "0:  #{new_vol}% 1:  #{new_vol}%"
+    return nil
+  end
+  
+  def vol_perc=(newval)
+    newval = newval.to_i
+    %x[pactl set-sink-input-volume #{self.input_id} #{newval}%]
+    @args[:props]["volume"] = "0:  #{newval}% 1:  #{newval}%"
+    return nil
+  end
+  
+  #Returns the current percent of the volume.
+  def vol_perc
+    if match = @args[:props]["volume"].to_s.match(/(\d+):\s*([\d\.]+)%/)
+      return match[2].to_i
+    end
+    
+    raise "Could not figure out the volume from properties: '#{@args[:props]}'."
+  end
+
+  def method_missing(meth, *args, &block)
+    @args[:props][meth.to_s]
+  end
 end

data/pulseaudio.gemspec

@@ -4,14 +4,15 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "pulseaudio"
-  s.version = "0.0.7"
+  s.name = %q{pulseaudio}
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = "2012-10-03"
-  s.description = "Ruby-library for controlling PulseAudio via 'pactl'."
-  s.email = "k@spernj.org"
+  s.date = %q{2012-10-19}
+  s.default_executable = %q{pulseaudio_volume.rb}
+  s.description = %q{Ruby-library for controlling PulseAudio via 'pactl'.}
+  s.email = %q{k@spernj.org}
   s.executables = ["pulseaudio_volume.rb"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -49,11 +50,11 @@ Gem::Specification.new do |s|
     "test_scripts/choose_active_sink_gtk3.rb",
     "test_scripts/set_active.rb"
   ]
-  s.homepage = "http://github.com/kaspernj/pulseaudio"
+  s.homepage = %q{http://github.com/kaspernj/pulseaudio}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "Ruby-library for controlling PulseAudio."
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{Ruby-library for controlling PulseAudio.}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/spec/pulseaudio_spec.rb

@@ -9,6 +9,15 @@ describe "Pulseaudio" do
       sink.mute_toggle
     end
   end
+
+  it "should spawn sink inputs and manipulate them" do
+    PulseAudio::Sink::Input.list do |input|
+      input.vol_decr
+      input.vol_incr
+      input.mute_toggle
+      input.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

metadata

@@ -1,126 +1,125 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pulseaudio
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.8
   prerelease: 
-  version: 0.0.7
 platform: ruby
-authors: 
+authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-19 00:00:00.000000000 +02:00
+default_executable: pulseaudio_volume.rb
+dependencies:
+- !ruby/object:Gem::Dependency
   name: wref
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &22848460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *22848460
+- !ruby/object:Gem::Dependency
   name: gir_ffi
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &22847680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *22847680
+- !ruby/object:Gem::Dependency
   name: gtk3assist
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &22845380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *22845380
+- !ruby/object:Gem::Dependency
   name: gettext
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &22844520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *22844520
+- !ruby/object:Gem::Dependency
   name: knjrbfw
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &22843640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *22843640
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &22842620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *22842620
+- !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &22841480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.12"
+      - !ruby/object:Gem::Version
+        version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *22841480
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &22840600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *22840600
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &22839720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *22839720
 description: Ruby-library for controlling PulseAudio via 'pactl'.
 email: k@spernj.org
-executables: 
+executables:
 - pulseaudio_volume.rb
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -151,35 +150,33 @@ files:
 - test_scripts/choose_active_sink.rb
 - test_scripts/choose_active_sink_gtk3.rb
 - test_scripts/set_active.rb
+has_rdoc: true
 homepage: http://github.com/kaspernj/pulseaudio
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 1285424623138543590
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4386632661636528784
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby-library for controlling PulseAudio.
 test_files: []
-