Blame alexandria-0.6.8-nogst-support.patch
|
Mamoru Tasaka |
c52fe22 |
--- alexandria-0.6.8/lib/alexandria/ui/dialogs/acquire_dialog.rb.nogst 2011-11-16 02:37:09.000000000 +0900
|
|
Mamoru Tasaka |
c52fe22 |
+++ alexandria-0.6.8/lib/alexandria/ui/dialogs/acquire_dialog.rb 2011-12-25 02:22:12.000000000 +0900
|
|
Mamoru Tasaka |
c52fe22 |
@@ -20,7 +20,18 @@
|
|
Mamoru Tasaka |
c52fe22 |
require 'alexandria/scanners/cuecat'
|
|
Mamoru Tasaka |
c52fe22 |
require 'alexandria/scanners/keyboard'
|
|
Mamoru Tasaka |
c52fe22 |
|
|
Mamoru Tasaka |
c52fe22 |
-require 'alexandria/ui/sound'
|
|
Mamoru Tasaka |
c52fe22 |
+support_sound = true
|
|
Mamoru Tasaka |
c52fe22 |
+begin
|
|
Mamoru Tasaka |
c52fe22 |
+ require 'gst'
|
|
Mamoru Tasaka |
c52fe22 |
+rescue LoadError => e
|
|
Mamoru Tasaka |
c52fe22 |
+ Alexandria::log.warn { e.message }
|
|
Mamoru Tasaka |
c52fe22 |
+ Alexandria::log.warn { "Sound support is disabled" }
|
|
Mamoru Tasaka |
c52fe22 |
+ support_sound = false
|
|
Mamoru Tasaka |
c52fe22 |
+end
|
|
Mamoru Tasaka |
c52fe22 |
+
|
|
Mamoru Tasaka |
c52fe22 |
+if support_sound
|
|
Mamoru Tasaka |
c52fe22 |
+ require 'alexandria/ui/sound'
|
|
Mamoru Tasaka |
c52fe22 |
+end
|
|
Mamoru Tasaka |
c52fe22 |
require 'alexandria/ui/dialogs/barcode_animation'
|
|
Mamoru Tasaka |
c52fe22 |
|
|
Mamoru Tasaka |
c52fe22 |
module Alexandria
|
|
Mamoru Tasaka |
c52fe22 |
@@ -556,6 +567,7 @@
|
|
Mamoru Tasaka |
c52fe22 |
end
|
|
Mamoru Tasaka |
c52fe22 |
end
|
|
Mamoru Tasaka |
c52fe22 |
|
|
Mamoru Tasaka |
c52fe22 |
+ return unless support_sound
|
|
Mamoru Tasaka |
c52fe22 |
# @sound_player = SoundEffectsPlayer.new
|
|
Mamoru Tasaka |
c52fe22 |
@sound_players = {}
|
|
Mamoru Tasaka |
c52fe22 |
@sound_players["scanning"] = SoundEffectsPlayer.new
|
|
Mamoru Tasaka |
c52fe22 |
@@ -565,6 +577,7 @@
|
|
Mamoru Tasaka |
c52fe22 |
end
|
|
Mamoru Tasaka |
c52fe22 |
|
|
Mamoru Tasaka |
c52fe22 |
def play_sound(effect)
|
|
Mamoru Tasaka |
c52fe22 |
+ return unless support_sound
|
|
Mamoru Tasaka |
c52fe22 |
# HACK, do some thread waiting, if possible
|
|
Mamoru Tasaka |
c52fe22 |
puts "scanning sound : #{@prefs.play_scanning_sound}"
|
|
Mamoru Tasaka |
c52fe22 |
puts "scan sound: #{ @prefs.play_scan_sound}"
|