Merge pull request #472 from sktometometo/PR/use-sound-themes-freedes…

…ktop

Pr/use sound themes freedesktop

julius_ros/package.xml

@@ -19,6 +19,7 @@
   <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</exec_depend>
   <exec_depend>rospy</exec_depend>
   <exec_depend>sound_play</exec_depend>
+  <exec_depend>sound-theme-freedesktop</exec_depend>
   <exec_depend>speech_recognition_msgs</exec_depend>
   <exec_depend>std_srvs</exec_depend>
 

julius_ros/scripts/julius_client.py

@@ -24,9 +24,9 @@
 
 
 class JuliusClient(object):
-    start_signal = "/usr/share/sounds/ubuntu/stereo/bell.ogg"
-    success_signal = "/usr/share/sounds/ubuntu/stereo/message-new-instant.ogg"
-    timeout_signal = "/usr/share/sounds/ubuntu/stereo/window-slide.ogg"
+    start_signal = "/usr/share/sounds/freedesktop/stereo/bell.ogg"
+    success_signal = "/usr/share/sounds/freedesktop/stereo/message-new-instant.ogg"
+    timeout_signal = "/usr/share/sounds/freedesktop/stereo/network-connectivity-lost.ogg"
 
     def __init__(self):
         # load parameters

ros_speech_recognition/README.md

@@ -159,19 +159,19 @@ roslaunch ros_speech_recognition parrotry.launch language:=ja-JP
 
   Maximum buffer size to store audio data for speech recognition
 
-* `~start_signal` (`String`, default: `/usr/share/sounds/ubuntu/stereo/bell.ogg`)
+* `~start_signal` (`String`, default: `/usr/share/sounds/freedesktop/stereo/bell.ogg`)
 
   Path to sound file for bell on the start of audio caption
 
-* `~recognized_signal` (`String`, default: `/usr/share/sounds/ubuntu/stereo/button-toggle-on.ogg`)
+* `~recognized_signal` (`String`, default: `/usr/share/sounds/freedesktop/stereo/message.ogg`)
 
   Path to sound file for bell on the end of audio caption
 
-* `~success_signal` (`String`, default: `/usr/share/sounds/ubuntu/stereo/message-new-instant.ogg`)
+* `~success_signal` (`String`, default: `/usr/share/sounds/freedesktop/stereo/message-new-instant.ogg`)
 
   Path to sound file for bell on getting successful recognition result
 
-* `~timeout_signal` (`String`, default: `/usr/share/sounds/ubuntu/stereo/window-slide.ogg`)
+* `~timeout_signal` (`String`, default: `/usr/share/sounds/freedesktop/stereo/network-connectivity-lost.ogg`)
 
   Path to sound file for bell on timeout for recognition
 

ros_speech_recognition/package.xml

@@ -21,8 +21,8 @@
   <run_depend>dynamic_reconfigure</run_depend>
   <run_depend>flac</run_depend>
   <run_depend>sound_play</run_depend>
+  <run_depend>sound-theme-freedesktop</run_depend>
   <run_depend>speech_recognition_msgs</run_depend>
-  <run_depend>ubuntu-sounds</run_depend>
 
   <test_depend>rostest</test_depend>
   <test_depend>roslaunch</test_depend>

ros_speech_recognition/scripts/speech_recognition_node.py

@@ -135,13 +135,13 @@ def __init__(self):
             self.act_sound = None
         self.signals = {
             "start": rospy.get_param("~start_signal",
-                                     "/usr/share/sounds/ubuntu/stereo/bell.ogg"),
+                                     "/usr/share/sounds/freedesktop/stereo/bell.ogg"),
             "recognized": rospy.get_param("~recognized_signal",
-                                          "/usr/share/sounds/ubuntu/stereo/button-toggle-on.ogg"),
+                                          "/usr/share/sounds/freedesktop/stereo/message.ogg"),
             "success": rospy.get_param("~success_signal",
-                                       "/usr/share/sounds/ubuntu/stereo/message-new-instant.ogg"),
+                                       "/usr/share/sounds/freedesktop/stereo/message-new-instant.ogg"),
             "timeout": rospy.get_param("~timeout_signal",
-                                       "/usr/share/sounds/ubuntu/stereo/window-slide.ogg"),
+                                       "/usr/share/sounds/freedesktop/stereo/network-connectivity-lost.ogg"),
         }