pulseaudio 0.0.4 → 0.0.5

data/Gemfile

@@ -2,7 +2,11 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
+
 gem "wref"
+gem "gir_ffi"
+gem "gtk3assist"
+gem "gettext"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -11,5 +15,4 @@ group :development do
   gem "rdoc", "~> 3.12"
   gem "bundler", ">= 1.0.0"
   gem "jeweler", "~> 1.8.3"
-  gem "rcov", ">= 0"
 end

data/Gemfile.lock

@@ -2,15 +2,27 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
+    ffi (1.0.11)
+    gettext (2.3.1)
+      locale
+    gir_ffi (0.4.1)
+      ffi (~> 1.0.8)
+      indentation (~> 0.0.6)
+    gir_ffi-gtk (0.4.0)
+      gir_ffi (~> 0.4.0)
     git (1.2.5)
-    jeweler (1.8.3)
+    gtk3assist (0.0.5)
+      gir_ffi-gtk
+      xml-simple
+    indentation (0.0.6)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.3)
+    json (1.7.5)
+    locale (2.0.8)
     rake (0.9.2.2)
-    rcov (0.9.11)
     rdoc (3.12)
       json (~> 1.4)
     rspec (2.8.0)
@@ -21,15 +33,18 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    wref (0.0.2)
+    wref (0.0.5)
+    xml-simple (1.1.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (>= 1.0.0)
+  gettext
+  gir_ffi
+  gtk3assist
   jeweler (~> 1.8.3)
-  rcov
   rdoc (~> 3.12)
   rspec (~> 2.8.0)
   wref

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/gui/choose_active_sink_gtk3/choose_active_sink.glade

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkListStore" id="liststore1"/>
+  <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>
+    <signal name="delete-event" handler="on_window_delete_event" swapped="no"/>
+    <child>
+      <object class="GtkVPaned" id="vpaned1">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="position">200</property>
+        <property name="position_set">True</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="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"/>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="treeview-selection1"/>
+                    </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="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"/>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="treeview-selection2"/>
+                        </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_gtk3/choose_active_sink_gtk3.rb

@@ -0,0 +1,160 @@
+class PulseAudio::Gui::Choose_active_sink_gtk3
+  attr_reader :ui
+  
+  def initialize
+    @ui = Gtk3assist::Builder.new.add_from_file("#{File.dirname(__FILE__)}/choose_active_sink.glade")
+    @ui.connect_signals{|h| method(h)}
+    
+    #Init treeviews.
+    @tv_sinks = Gtk3assist::Treeview.new(
+      :tv => @ui["tvSinks"],
+      :model => :liststore,
+      :cols => [
+        {:id => :id, :title => _("ID")},
+        {:id => :name, :title => _("Name")}
+      ]
+    )
+    @ui["tvSinks"].get_column(0).visible = false
+    self.reload_sinks
+    
+    @tv_sources = Gtk3assist::Treeview.new(
+      :tv => @ui["tvSources"],
+      :model => :liststore,
+      :cols => [_("ID"), _("Name")]
+    )
+    @ui["tvSources"].get_column(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
+    
+    @sicon = Gtk::StatusIcon.new
+    @sicon.signal_connect("activate", &self.method(:on_sicon_activate))
+    @sicon.signal_connect("popup-menu", &self.method(:on_sicon_popupmenu))
+    @sicon.signal_connect("scroll-event", &self.method(:on_sicon_scroll))
+    self.update_icon
+  end
+  
+  #Updates the statusicons icon based on the current sinks volume.
+  def update_icon
+    #Get the current active sink which should be manipulated.
+    sink_def = PulseAudio::Sink.by_default
+    return nil if !sink_def
+    
+    
+    #Evaluate which icon is the closest to the current volume.
+    vol_perc = sink_def.vol_perc
+    levels = [0, 33, 66, 100]
+    
+    vol_closest = levels.first
+    vol_closest_dif = 100
+    
+    levels.each do |level|
+      if !vol_closest or (vol_perc < level and diff = (level - vol_perc) and diff < vol_closest_dif) or (vol_perc >= level and diff = (vol_perc - level) and diff < vol_closest_dif)
+        vol_closest = level
+        vol_closest_dif = diff
+      end
+    end
+    
+    
+    #Set icon.
+    icon_filepath = File.realpath("#{File.dirname(__FILE__)}/../../gfx/volume_#{vol_closest}.png")
+    @sicon.set_from_file(icon_filepath)
+  end
+  
+  def on_sicon_activate(*args)
+    if !@ui["window"].get_visible
+      @ui["window"].show_all
+    else
+      @ui["window"].hide
+    end
+  end
+  
+  def on_sicon_scroll(sicon, scroll_e, temp)
+    direction = scroll_e.direction.to_s
+    return nil if direction == "smooth"
+    sink_def = PulseAudio::Sink.by_default
+    
+    if direction == "up"
+      sink_def.vol_incr
+    elsif direction == "down"
+      sink_def.vol_decr
+    end
+    
+    self.update_icon
+  end
+  
+  def on_sicon_popupmenu(*args)
+    Gtk.main_quit
+  end
+  
+  def reload_sinks
+    @reloading = true
+    @tv_sinks.model.clear
+    PulseAudio::Sink.list do |sink|
+      append_data = @tv_sinks.add_row(:data => {:id => sink.sink_id, :name => 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
+    
+    @tv_sources.model.clear
+    PulseAudio::Source.list do |source|
+      append_data = @tv_sources.add_row(:data => {:id => source.source_id, :name => 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(*args)
+    return nil if @reloading or !@tv_sinks
+    sel = @tv_sinks.sel
+    return nil if !sel
+    
+    sink = nil
+    PulseAudio::Sink.list do |sink_i|
+      if sink_i.sink_id.to_i == sel[:data][:id].to_i
+        sink = sink_i
+        break
+      end
+    end
+    
+    raise "Could not find sink." if !sink
+    sink.default!
+    self.update_icon
+  end
+  
+  def on_tvSources_cursor_changed(*args)
+    return nil if @reloading or !@tv_sources
+    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.default!
+    self.update_icon
+  end
+  
+  def on_window_delete_event(*args)
+    @ui["window"].hide
+    return true
+  end
+end

data/include/pulseaudio_sink.rb

@@ -156,6 +156,15 @@ class PulseAudio::Sink
     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."
+  end
+  
   #Returns true if this sink is the default one.
   def default?
     def_str = %x[pacmd info | grep "Default sink name"]

data/lib/pulseaudio.rb

@@ -1,4 +1,4 @@
-require "wref"
+require "wref" if !Kernel.const_defined?(:Wref)
 
 #A framework for controlling various elements of PulseAudio in Ruby.
 class PulseAudio

data/pulseaudio.gemspec

@@ -4,15 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{pulseaudio}
-  s.version = "0.0.4"
+  s.name = "pulseaudio"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  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}
+  s.date = "2012-09-19"
+  s.description = "Ruby-library for controlling PulseAudio via 'pactl'."
+  s.email = "k@spernj.org"
   s.executables = ["pulseaudio_volume.rb"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -28,8 +27,14 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/pulseaudio_volume.rb",
+    "gfx/volume_0.png",
+    "gfx/volume_100.png",
+    "gfx/volume_33.png",
+    "gfx/volume_66.png",
     "gui/choose_active_sink/choose_active_sink.glade",
     "gui/choose_active_sink/choose_active_sink.rb",
+    "gui/choose_active_sink_gtk3/choose_active_sink.glade",
+    "gui/choose_active_sink_gtk3/choose_active_sink_gtk3.rb",
     "include/pulseaudio_events.rb",
     "include/pulseaudio_gui.rb",
     "include/pulseaudio_sink.rb",
@@ -41,39 +46,46 @@ Gem::Specification.new do |s|
     "spec/pulseaudio_spec.rb",
     "spec/spec_helper.rb",
     "test_scripts/choose_active_sink.rb",
+    "test_scripts/choose_active_sink_gtk3.rb",
     "test_scripts/set_active.rb"
   ]
-  s.homepage = %q{http://github.com/kaspernj/pulseaudio}
+  s.homepage = "http://github.com/kaspernj/pulseaudio"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Ruby-library for controlling PulseAudio.}
+  s.rubygems_version = "1.8.24"
+  s.summary = "Ruby-library for controlling PulseAudio."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<wref>, [">= 0"])
+      s.add_runtime_dependency(%q<gir_ffi>, [">= 0"])
+      s.add_runtime_dependency(%q<gtk3assist>, [">= 0"])
+      s.add_runtime_dependency(%q<gettext>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<wref>, [">= 0"])
+      s.add_dependency(%q<gir_ffi>, [">= 0"])
+      s.add_dependency(%q<gtk3assist>, [">= 0"])
+      s.add_dependency(%q<gettext>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<wref>, [">= 0"])
+    s.add_dependency(%q<gir_ffi>, [">= 0"])
+    s.add_dependency(%q<gtk3assist>, [">= 0"])
+    s.add_dependency(%q<gettext>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-    s.add_dependency(%q<rcov>, [">= 0"])
   end
 end
 

data/test_scripts/choose_active_sink_gtk3.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+Dir.chdir(File.dirname(__FILE__))
+require "../lib/pulseaudio.rb"
+
+require "rubygems"
+require "gir_ffi"
+require "gir_ffi-gtk3"
+require "/home/kaspernj/Dev/Ruby/Gems/knjrbfw/lib/knjrbfw.rb"
+require "gettext"
+Knj.gem_require(:Gtk3assist, "gtk3assist")
+
+Gtk3assist.enable_threadding
+
+def _(str)
+  return GetText._(str)
+end
+
+Gtk.init
+
+cas = PulseAudio::Gui::Choose_active_sink_gtk3.new
+cas.ui["window"].signal_connect("destroy") do
+  Gtk.main_quit
+end
+
+Gtk.main

metadata

@@ -2,7 +2,7 @@
 name: pulseaudio
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-27 00:00:00 +02:00
-default_executable: pulseaudio_volume.rb
+date: 2012-09-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: wref
@@ -25,60 +24,82 @@ dependencies:
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: gir_ffi
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.8.0
-  type: :development
+        version: "0"
+  type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: gtk3assist
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: "3.12"
-  type: :development
+        version: "0"
+  type: :runtime
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: gettext
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
-  type: :development
+        version: "0"
+  type: :runtime
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: rspec
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.8.3
+        version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: rdoc
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "3.12"
   type: :development
   prerelease: false
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.8.3
+  type: :development
+  prerelease: false
+  version_requirements: *id008
 description: Ruby-library for controlling PulseAudio via 'pactl'.
 email: k@spernj.org
 executables: 
@@ -98,8 +119,14 @@ files:
 - Rakefile
 - VERSION
 - bin/pulseaudio_volume.rb
+- gfx/volume_0.png
+- gfx/volume_100.png
+- gfx/volume_33.png
+- gfx/volume_66.png
 - gui/choose_active_sink/choose_active_sink.glade
 - gui/choose_active_sink/choose_active_sink.rb
+- gui/choose_active_sink_gtk3/choose_active_sink.glade
+- gui/choose_active_sink_gtk3/choose_active_sink_gtk3.rb
 - include/pulseaudio_events.rb
 - include/pulseaudio_gui.rb
 - include/pulseaudio_sink.rb
@@ -111,8 +138,8 @@ files:
 - spec/pulseaudio_spec.rb
 - spec/spec_helper.rb
 - 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: 
 - MIT
@@ -126,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -248938999908362566
+      hash: -2237121306229402843
       segments: 
       - 0
       version: "0"
@@ -139,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby-library for controlling PulseAudio.