pulseaudio 0.0.5 → 0.0.6

data/Gemfile

@@ -7,6 +7,7 @@ gem "wref"
 gem "gir_ffi"
 gem "gtk3assist"
 gem "gettext"
+gem "knjrbfw"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    datet (0.0.20)
     diff-lcs (1.1.3)
     ffi (1.0.11)
     gettext (2.3.1)
@@ -14,6 +15,7 @@ GEM
     gtk3assist (0.0.5)
       gir_ffi-gtk
       xml-simple
+    http2 (0.0.11)
     indentation (0.0.6)
     jeweler (1.8.4)
       bundler (~> 1.0)
@@ -21,7 +23,16 @@ GEM
       rake
       rdoc
     json (1.7.5)
+    knjrbfw (0.0.99)
+      datet
+      http2
+      php4r
+      tsafe
+      wref
     locale (2.0.8)
+    php4r (0.0.3)
+      datet
+      http2
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -33,6 +44,7 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
+    tsafe (0.0.11)
     wref (0.0.5)
     xml-simple (1.1.1)
 
@@ -45,6 +57,7 @@ DEPENDENCIES
   gir_ffi
   gtk3assist
   jeweler (~> 1.8.3)
+  knjrbfw
   rdoc (~> 3.12)
   rspec (~> 2.8.0)
   wref

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/gui/choose_active_sink_gtk3/choose_active_sink.glade

@@ -27,12 +27,25 @@
                 <property name="can_focus">False</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <object class="GtkTreeView" id="tvSinks">
+                  <object class="GtkViewport" id="viewport1">
                     <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"/>
+                    <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="shadow_type">in</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>
                   </object>
                 </child>
@@ -68,12 +81,19 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkTreeView" id="tvSources">
+                      <object class="GtkScrolledWindow" id="scrolledwindow1">
                         <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"/>
+                        <property name="shadow_type">in</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-selection"/>
+                            </child>
+                          </object>
                         </child>
                       </object>
                     </child>

data/gui/choose_active_sink_gtk3/choose_active_sink_gtk3.rb

@@ -9,6 +9,7 @@ class PulseAudio::Gui::Choose_active_sink_gtk3
     @tv_sinks = Gtk3assist::Treeview.new(
       :tv => @ui["tvSinks"],
       :model => :liststore,
+      :sort_col => :name,
       :cols => [
         {:id => :id, :title => _("ID")},
         {:id => :name, :title => _("Name")}
@@ -20,7 +21,11 @@ class PulseAudio::Gui::Choose_active_sink_gtk3
     @tv_sources = Gtk3assist::Treeview.new(
       :tv => @ui["tvSources"],
       :model => :liststore,
-      :cols => [_("ID"), _("Name")]
+      :sort_col => :name,
+      :cols => [
+        {:id => :id, :title => _("ID")},
+        {:id => :name, :title => _("Name")}
+      ]
     )
     @ui["tvSources"].get_column(0).visible = false
     self.reload_sources
@@ -28,6 +33,10 @@ class PulseAudio::Gui::Choose_active_sink_gtk3
     PulseAudio::Sink::Input.auto_redirect_new_inputs_to_default_sink
     PulseAudio::Source::Output.auto_redirect_new_outputs_to_default_source
     
+    events = PulseAudio::Events.instance
+    events.connect(:event => :remove, &self.method(:on_remove))
+    events.connect(:event => :new, &self.method(:on_new))
+    
     @sicon = Gtk::StatusIcon.new
     @sicon.signal_connect("activate", &self.method(:on_sicon_activate))
     @sicon.signal_connect("popup-menu", &self.method(:on_sicon_popupmenu))
@@ -35,6 +44,42 @@ class PulseAudio::Gui::Choose_active_sink_gtk3
     self.update_icon
   end
   
+  #Called when something is removed from PulseAudio. Removes items from the treeviews automatically.
+  def on_remove(args)
+    event, ele, ele_id = args[:args][:event].to_sym, args[:args][:element].to_s, args[:args][:element_id].to_i
+    
+    if ele == "sink"
+      tv = @tv_sinks
+    elsif ele == "source"
+      tv = @tv_sources
+    else
+      return nil
+    end
+    
+    tv.rows_remove do |data|
+      if data[:data][:id].to_i == ele_id
+        true
+      else
+        false
+      end
+    end
+  end
+  
+  #Called when something is added to PulseAudio. Adds new items to the treeviews automatically.
+  def on_new(args)
+    event, ele, ele_id = args[:args][:event].to_sym, args[:args][:element].to_s, args[:args][:element_id].to_i
+    
+    if ele == "sink"
+      sink = PulseAudio::Sink.by_id(ele_id.to_i)
+      self.add_sink(sink)
+    elsif ele == "source"
+      source = PulseAudio::Source.by_id(ele_id.to_i)
+      self.add_source(source)
+    else
+      return nil
+    end
+  end
+  
   #Updates the statusicons icon based on the current sinks volume.
   def update_icon
     #Get the current active sink which should be manipulated.
@@ -88,11 +133,16 @@ class PulseAudio::Gui::Choose_active_sink_gtk3
     Gtk.main_quit
   end
   
+  def add_sink(sink)
+    append_data = @tv_sinks.add_row(:data => {:id => sink.sink_id, :name => sink.args[:props]["description"]})
+    return append_data
+  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"]})
+      append_data = self.add_sink(sink)
       
       if sink.default?
         @ui["tvSinks"].selection.select_iter(append_data[:iter])
@@ -102,12 +152,17 @@ class PulseAudio::Gui::Choose_active_sink_gtk3
     @reloading = false
   end
   
+  def add_source(source)
+    append_data = @tv_sources.add_row(:data => {:id => source.source_id, :name => source.args[:props]["description"]})
+    return append_data
+  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"]})
+      append_data = self.add_source(source)
       
       if source.default?
         @ui["tvSources"].selection.select_iter(append_data[:iter])
@@ -118,39 +173,48 @@ class PulseAudio::Gui::Choose_active_sink_gtk3
   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
+    begin
+      return nil if @reloading or !@tv_sinks
+      sel = @tv_sinks.sel
+      return nil if !sel
+      puts 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
+    rescue => e
+      Gtk3assist::Msgbox.error(e)
     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
+    begin
+      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
+    rescue => e
+      Gtk3assist::Msgbox.error(e)
     end
-    
-    raise "Could not find source." if !source
-    source.default!
-    self.update_icon
   end
   
   def on_window_delete_event(*args)

data/include/pulseaudio_gui.rb

@@ -1,4 +1,4 @@
-#Subclass for gui elements.
+#Subclass for GUI elements.
 class PulseAudio::Gui
   #Autoloader for subclasses.
   def self.const_missing(name)

data/pulseaudio.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "pulseaudio"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = "2012-09-19"
+  s.date = "2012-09-30"
   s.description = "Ruby-library for controlling PulseAudio via 'pactl'."
   s.email = "k@spernj.org"
   s.executables = ["pulseaudio_volume.rb"]
@@ -63,6 +63,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<gir_ffi>, [">= 0"])
       s.add_runtime_dependency(%q<gtk3assist>, [">= 0"])
       s.add_runtime_dependency(%q<gettext>, [">= 0"])
+      s.add_runtime_dependency(%q<knjrbfw>, [">= 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"])
@@ -72,6 +73,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<gir_ffi>, [">= 0"])
       s.add_dependency(%q<gtk3assist>, [">= 0"])
       s.add_dependency(%q<gettext>, [">= 0"])
+      s.add_dependency(%q<knjrbfw>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -82,6 +84,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<gir_ffi>, [">= 0"])
     s.add_dependency(%q<gtk3assist>, [">= 0"])
     s.add_dependency(%q<gettext>, [">= 0"])
+    s.add_dependency(%q<knjrbfw>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

data/test_scripts/choose_active_sink_gtk3.rb

@@ -1,16 +1,22 @@
 #!/usr/bin/env ruby
 
-Dir.chdir(File.dirname(__FILE__))
-require "../lib/pulseaudio.rb"
+require "#{File.realpath(File.dirname(__FILE__))}/../lib/pulseaudio.rb"
 
 require "rubygems"
 require "gir_ffi"
 require "gir_ffi-gtk3"
-require "/home/kaspernj/Dev/Ruby/Gems/knjrbfw/lib/knjrbfw.rb"
 require "gettext"
+
+#Try to load development-version of 'knjrbfw'.
+begin
+  require "#{File.realpath(File.dirname(__FILE__))}/../../knjrbfw/lib/knjrbfw.rb"
+rescue LoadError
+  require "knjrbfw"
+end
+
 Knj.gem_require(:Gtk3assist, "gtk3assist")
 
-Gtk3assist.enable_threadding
+Gtk3assist::Threadding.enable_threadding
 
 def _(str)
   return GetText._(str)

metadata

@@ -2,7 +2,7 @@
 name: pulseaudio
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-19 00:00:00 Z
+date: 2012-09-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: wref
@@ -57,8 +57,19 @@ dependencies:
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: knjrbfw
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -66,10 +77,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,10 +88,10 @@ dependencies:
         version: "3.12"
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -88,10 +99,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -99,7 +110,7 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 description: Ruby-library for controlling PulseAudio via 'pactl'.
 email: k@spernj.org
 executables: 
@@ -153,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2237121306229402843
+      hash: -1301824168619278043
       segments: 
       - 0
       version: "0"