0
@@ -6,11 +6,14 @@ module AutotestNotification
0
       end
0
 
0
       def play_sound(total, failures)
0
-        `#{File.expand_path(File.dirname(__FILE__) + "/../../bin/")}/playsound #{File.expand_path(File.dirname(__FILE__) + "/../../sounds/doom/")}/#{percent(total, failures)}.wav`
0
-      end
0
-
0
-      def mplayer_sound(total, failures)
0
-        system("/usr/bin/mplayer #{File.expand_path(File.dirname(__FILE__) + "../../../sounds/doom/")}/#{percent(total, failures)}.wav")
0
+        sound_file = "#{File.expand_path(File.dirname(__FILE__) + "/../../sounds/doom/")}/#{percent(total, failures)}.wav"
0
+        
0
+        case RUBY_PLATFORM
0
+        when /darwin/
0
+          `#{File.expand_path(File.dirname(__FILE__) + "/../../bin/")}/playsound #{sound_file}`
0
+        when /linux/
0
+          system("/usr/bin/mplayer #{sound_file}")
0
+        end
0
       end
0
 
0
       private

0
@@ -2,7 +2,7 @@ module AutotestNotification
0
   class Linux
0
     class << self
0
 
0
-      def notify(title, msg, img, total=1, failures=0)
0
+      def notify(title, msg, img, total = 1, failures = 0)
0
         if has_notify?
0
           notify_send(title, msg, img)
0
         elsif has_zenity?
0
@@ -11,10 +11,23 @@ module AutotestNotification
0
           kdialog(title, msg, img)
0
         end
0
 
0
-        talk(msg, total, failures) if SPEAKING
0
+        say(total, failures) if SPEAKING
0
       end
0
 
0
       protected
0
+
0
+        def has_notify?
0
+          system "which notify-send 2> /dev/null"
0
+        end
0
+      
0
+        def has_kdialog?
0
+          system "which kdialog 2> /dev/null"
0
+        end
0
+      
0
+        def has_zenity?
0
+          system "which zenity 2> /dev/null"
0
+        end
0
+        
0
         def notify_send(title, msg, img)
0
           system "notify-send -t #{EXPIRATION_IN_SECONDS * 1000} -i #{img} '#{title}' '#{msg}'"
0
         end
0
@@ -27,29 +40,16 @@ module AutotestNotification
0
           system "zenity --info --text='#{msg}' --title='#{title}'"
0
         end
0
 
0
-        def talk(msg, total, failures)
0
-          # TODO: check if user has espeak and mplayer installed
0
-          begin
0
-            if failures > 0
0
-              DOOM_EDITION ? Doom.mplayer_sound(total, failures) : system("/usr/bin/espeak '#{failures} test#{'s' unless failures == 1} failed'")
0
-            else
0
-              DOOM_EDITION ? Doom.mplayer_sound(total, failures) : system("/usr/bin/espeak 'All tests passed successfully'")
0
-            end
0
-          rescue
0
+        def say(total, failures)
0
+          if failures > 0
0
+            DOOM_EDITION ? Doom.play_sound(total, failures) : system("/usr/bin/espeak '#{failures} test#{'s' unless failures == 1} failed'")
0
+          else
0
+            DOOM_EDITION ? Doom.play_sound(total, failures) : system("/usr/bin/espeak 'All tests passed successfully'")
0
           end
0
+        rescue
0
+          puts "You need the #{DOOM_EDITION ? 'mplayer' : 'espeak'} installed to hear the sounds."
0
         end
0
-
0
-        def has_zenity?
0
-          system "which zenity 2> /dev/null"
0
-        end
0
-
0
-        def has_notify?
0
-          system "which notify-send 2> /dev/null"
0
-        end
0
-
0
-        def has_kdialog?
0
-          system "which kdialog 2> /dev/null"
0
-        end
0
+        
0
     end
0
   end
0
 end