pulseaudio 0.0.8 → 0.0.9

data/Gemfile

@@ -3,6 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
+gem "autogc"
 gem "wref"
 gem "gir_ffi"
 gem "gtk3assist"

data/Gemfile.lock

@@ -1,40 +1,43 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    datet (0.0.20)
+    autogc (0.0.3)
+    datet (0.0.21)
     diff-lcs (1.1.3)
-    ffi (1.0.11)
-    gettext (2.3.1)
+    ffi (1.2.1)
+    gettext (2.3.7)
+      levenshtein
       locale
-    gir_ffi (0.4.1)
-      ffi (~> 1.0.8)
+    gir_ffi (0.5.0)
+      ffi (~> 1.2.0)
       indentation (~> 0.0.6)
-    gir_ffi-gtk (0.4.0)
-      gir_ffi (~> 0.4.0)
+    gir_ffi-gtk (0.5.0)
+      gir_ffi (~> 0.5.0)
     git (1.2.5)
-    gtk3assist (0.0.5)
+    gtk3assist (0.0.9)
       gir_ffi-gtk
       xml-simple
-    http2 (0.0.11)
-    indentation (0.0.6)
+    http2 (0.0.13)
+    indentation (0.0.7)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.5)
-    knjrbfw (0.0.99)
+    json (1.7.7)
+    knjrbfw (0.0.101)
       datet
       http2
       php4r
       tsafe
       wref
+    levenshtein (0.2.2)
     locale (2.0.8)
     php4r (0.0.3)
       datet
       http2
-    rake (0.9.2.2)
-    rdoc (3.12)
+    rake (10.0.3)
+    rdoc (3.12.1)
       json (~> 1.4)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
@@ -45,13 +48,14 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
     tsafe (0.0.11)
-    wref (0.0.5)
-    xml-simple (1.1.1)
+    wref (0.0.6)
+    xml-simple (1.1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  autogc
   bundler (>= 1.0.0)
   gettext
   gir_ffi

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/bin/pulseaudio_volume.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby1.9
 
 require "rubygems"
-require "pulseaudio"
+require "#{File.dirname(__FILE__)}/../lib/pulseaudio.rb"
 
 sinks = PulseAudio::Sink.list
 
@@ -18,4 +18,6 @@ elsif ARGV[0] == "mute"
   sinks.each do |sink|
     sink.mute_toggle if sink.active?
   end
+else
+  puts "Dont know what to do with argument: '#{ARGV[0]}'."
 end

data/gui/choose_active_sink_gtk3/choose_active_sink_gtk3.rb

@@ -146,14 +146,30 @@ class PulseAudio::Gui::Choose_active_sink_gtk3
     @sicon.set_from_file(icon_filepath)
   end
   
+  #Runs the given block and doesnt toggle the mute-functionality while it runs.
+  def no_mute_toggle
+    @no_toggle_event_count = 0 if @no_toggle_event_count == nil
+    @no_toggle_event_count += 1
+    
+    begin
+      yield
+    ensure
+      @no_toggle_event_count -= 1
+    end
+  end
+  
   def update_sink_info
-    if @sink.muted?
-      @ui["cbSinkMute"].active = true
-    else
-      @ui["cbSinkMute"].active = false
+    self.no_mute_toggle do
+      if @sink.muted?
+        puts "Mute is active - set."
+        @ui["cbSinkMute"].active = true
+      else
+        puts "Mute is not active - unset."
+        @ui["cbSinkMute"].active = false
+      end
+      
+      @ui["adjustmentSinkVolume"].value = @sink.vol_perc.to_f
     end
-    
-    @ui["adjustmentSinkVolume"].value = @sink.vol_perc.to_f
   end
   
   def update_source_info
@@ -190,7 +206,10 @@ class PulseAudio::Gui::Choose_active_sink_gtk3
   end
   
   def on_cbSinkMute_toggled
-    @sink.mute = @ui["cbSinkMute"].active
+    if !@no_toggle_event
+      puts "Mute toggle."
+      @sink.mute = @ui["cbSinkMute"].active
+    end
   end
   
   def on_cbSourceMute_toggled

data/include/pulseaudio_sink.rb

@@ -72,7 +72,7 @@ class PulseAudio::Sink
   
   #This automatically reloads a sink when a 'change'-event appears.
   PulseAudio::Events.instance.connect(:event => :change, :element => "sink") do |args|
-    if @@sinks.key?(args[:args][:element_id]) and sink = @@sinks.get(args[:args][:element_id])
+    if @@sinks.key?(args[:args][:element_id]) and sink = @@sinks.get!(args[:args][:element_id])
       sink.reload
     end
   end

data/include/pulseaudio_source.rb

@@ -76,7 +76,7 @@ class PulseAudio::Source
   
   #This automatically reloads a source when a 'change'-event appears.
   PulseAudio::Events.instance.connect(:event => :change, :element => "source") do |args|
-    if @@sources.key?(args[:args][:element_id]) and source = @@sources.get(args[:args][:element_id])
+    if @@sources.key?(args[:args][:element_id]) and source = @@sources.get!(args[:args][:element_id])
       source.reload
     end
   end

data/pulseaudio.gemspec

@@ -4,15 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{pulseaudio}
-  s.version = "0.0.8"
+  s.name = "pulseaudio"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  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.date = "2013-02-24"
+  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",
@@ -50,16 +49,17 @@ Gem::Specification.new do |s|
     "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.25"
+  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<autogc>, [">= 0"])
       s.add_runtime_dependency(%q<wref>, [">= 0"])
       s.add_runtime_dependency(%q<gir_ffi>, [">= 0"])
       s.add_runtime_dependency(%q<gtk3assist>, [">= 0"])
@@ -70,6 +70,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
     else
+      s.add_dependency(%q<autogc>, [">= 0"])
       s.add_dependency(%q<wref>, [">= 0"])
       s.add_dependency(%q<gir_ffi>, [">= 0"])
       s.add_dependency(%q<gtk3assist>, [">= 0"])
@@ -81,6 +82,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     end
   else
+    s.add_dependency(%q<autogc>, [">= 0"])
     s.add_dependency(%q<wref>, [">= 0"])
     s.add_dependency(%q<gir_ffi>, [">= 0"])
     s.add_dependency(%q<gtk3assist>, [">= 0"])

data/spec/pulseaudio_spec.rb

@@ -29,6 +29,14 @@ describe "Pulseaudio" do
     end
     
     PulseAudio::Sink::Input.auto_redirect_new_inputs_to_default_sink
-    PulseAudio::Events.instance.join
+    
+    require "timeout"
+    begin
+      Timeout.timeout(0.1) do
+        PulseAudio::Events.instance.join
+      end
+    rescue Timeout::Error
+      #expected.
+    end
   end
 end

data/test_scripts/choose_active_sink_gtk3.rb

@@ -1,23 +1,29 @@
 #!/usr/bin/env ruby
 
-require "#{File.realpath(File.dirname(__FILE__))}/../lib/pulseaudio.rb"
-
-require "rubygems"
-require "gir_ffi"
-require "gir_ffi-gtk3"
-require "gettext"
-
 #Try to load development-version of 'knjrbfw'.
 begin
   require "#{File.realpath(File.dirname(__FILE__))}/../../knjrbfw/lib/knjrbfw.rb"
+  puts "Loaded custom knjrbfw."
 rescue LoadError
   require "knjrbfw"
 end
 
-Knj.gem_require(:Gtk3assist, "gtk3assist")
+Knj.gem_require([:wref, :gtk3assist, :autogc])
+
+require "#{File.realpath(File.dirname(__FILE__))}/../lib/pulseaudio.rb"
+
+require "rubygems"
+require "gir_ffi"
+require "gir_ffi-gtk3"
+require "gettext"
+
+#Solves memory corruption problem in Ruby 1.9.3.
+Autogc.enable_for_known_buggy_env
 
-Gtk3assist::Threadding.enable_threadding
+#Solves threadding issues with Gir-GTK and MRI Ruby.
+Gtk3assist::Threadding.enable_threadding_if_necessary
 
+#Shortcut for GetText.
 def _(str)
   return GetText._(str)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulseaudio
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 +02:00
-default_executable: pulseaudio_volume.rb
+date: 2013-02-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: autogc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: wref
-  requirement: &22848460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22848460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gir_ffi
-  requirement: &22847680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22847680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gtk3assist
-  requirement: &22845380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22845380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gettext
-  requirement: &22844520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22844520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: knjrbfw
-  requirement: &22843640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +101,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22843640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &22842620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +117,15 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *22842620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &22841480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +133,15 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *22841480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &22840600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +149,15 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *22840600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &22839720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,7 +165,12 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *22839720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
 description: Ruby-library for controlling PulseAudio via 'pactl'.
 email: k@spernj.org
 executables:
@@ -150,7 +210,6 @@ 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:
 - MIT
@@ -166,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4386632661636528784
+      hash: -1739286250182430142
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -175,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby-library for controlling PulseAudio.