split sound_play_msgs package

.github/workflows/ros2.yml

@@ -11,7 +11,7 @@ jobs:
   industrial_ci:
     strategy:
       matrix:
-        ROS_DISTRO: [humble, iron, rolling]
+        ROS_DISTRO: [humble, jazzy, kilted, rolling]
         ROS_REPO: [testing, main]
         CMAKE_ARGS: ['-DCMAKE_BUILD_TYPE=Debug', '-DCMAKE_BUILD_TYPE=Release']
     runs-on: ubuntu-latest

audio_common/package.xml

@@ -21,6 +21,7 @@
    <exec_depend>audio_capture</exec_depend>
    <exec_depend>audio_common_msgs</exec_depend>
    <exec_depend>audio_play</exec_depend>
+   <exec_depend>sound_play_msgs</exec_depend>
    <exec_depend>sound_play</exec_depend>
 
    <export>

sound_play/CMakeLists.txt

@@ -10,28 +10,8 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 endif()
 
 find_package(ament_cmake REQUIRED)
-find_package(rosidl_default_generators REQUIRED)
-find_package(audio_common_msgs REQUIRED)
-find_package(action_msgs REQUIRED)
-
-include_directories(rclcpp audio_common_msgs action_msgs builtin_interfaces)
-
-set(msg_files
-  "msg/SoundRequest.msg"
-)
-
-set(action_files
-  "action/SoundRequest.action"
-)
-
-rosidl_generate_interfaces(${PROJECT_NAME}
-  ${msg_files}
-  ${action_files}
-  DEPENDENCIES
-    action_msgs
-    audio_common_msgs
-    builtin_interfaces
-)
+find_package(ament_cmake_python REQUIRED)
+find_package(sound_play_msgs REQUIRED)
 
 ament_python_install_package(${PROJECT_NAME})
 
@@ -59,6 +39,4 @@ install(DIRECTORY sounds
   DESTINATION share/${PROJECT_NAME}
 )
 
-ament_export_dependencies(rosidl_default_runtime)
-
 ament_package()

sound_play/package.xml

@@ -18,22 +18,17 @@
 
    <buildtool_depend>ament_cmake</buildtool_depend>
    <buildtool_depend>ament_cmake_python</buildtool_depend>
-   <buildtool_depend>rosidl_default_generators</buildtool_depend>
-   <buildtool_depend>rosidl_generator_py</buildtool_depend>
    <buildtool_depend>python3-setuptools</buildtool_depend>
 
-   <build_depend>action_msgs</build_depend>
-   <build_depend>audio_common_msgs</build_depend>
    <build_depend>boost</build_depend>
-   <build_depend>builtin_interfaces</build_depend>
+   <build_depend>sound_play_msgs</build_depend>
 
    <exec_depend>action_msgs</exec_depend>
-   <exec_depend>audio_common_msgs</exec_depend>
-   <exec_depend>builtin_interfaces</exec_depend>
+   <exec_depend>ament_index_python</exec_depend>
    <exec_depend>festival</exec_depend>
    <exec_depend>launch_xml</exec_depend>
    <exec_depend>rclpy</exec_depend>
-   <exec_depend>rosidl_default_runtime</exec_depend>
+   <exec_depend>sound_play_msgs</exec_depend>
 
    <exec_depend>gstreamer1.0</exec_depend>
    <exec_depend>gstreamer1.0-alsa</exec_depend>
@@ -42,8 +37,6 @@
    <exec_depend>gstreamer1.0-plugins-good</exec_depend>
    <exec_depend>python3-gi</exec_depend>
 
-   <member_of_group>rosidl_interface_packages</member_of_group>
-
    <export>
       <build_type>ament_cmake</build_type>
    </export>

sound_play/scripts/soundclient_example.py

@@ -12,7 +12,7 @@
 
 from sound_play.libsoundplay import SoundClient
 
-from sound_play.msg import SoundRequest
+from sound_play_msgs.msg import SoundRequest
 
 
 def play_explicit(node):

sound_play/scripts/soundplay_node.py

@@ -51,8 +51,8 @@
 from diagnostic_msgs.msg import DiagnosticArray
 from diagnostic_msgs.msg import DiagnosticStatus
 from diagnostic_msgs.msg import KeyValue
-from sound_play.action import SoundRequest as SoundRequestAction
-from sound_play.msg import SoundRequest
+from sound_play_msgs.action import SoundRequest as SoundRequestAction
+from sound_play_msgs.msg import SoundRequest
 
 
 try:

sound_play/scripts/test.py

@@ -41,7 +41,7 @@
 
 from sound_play.libsoundplay import SoundClient
 
-from sound_play.msg import SoundRequest
+from sound_play_msgs.msg import SoundRequest
 
 
 if __name__ == '__main__':

sound_play/scripts/test_actionlib_client.py

@@ -6,8 +6,8 @@
 import rclpy
 import rclpy.action
 
-from sound_play.action import SoundRequest as SoundRequestAction
-from sound_play.msg import SoundRequest
+from sound_play_msgs.action import SoundRequest as SoundRequestAction
+from sound_play_msgs.msg import SoundRequest
 
 
 def sound_play_client(node, volume=1.0):

sound_play/sound_play/libsoundplay.py

@@ -39,8 +39,8 @@
 import rclpy.action
 
 from action_msgs.msg import GoalStatusArray
-from sound_play.action import SoundRequest as SoundRequestAction
-from sound_play.msg import SoundRequest
+from sound_play_msgs.action import SoundRequest as SoundRequestAction
+from sound_play_msgs.msg import SoundRequest
 
 
 # \brief Class that publishes messages to the sound_play node.

sound_play_msgs/.gitignore

@@ -0,0 +1 @@
+build

sound_play_msgs/CMakeLists.txt

@@ -0,0 +1,34 @@
+cmake_minimum_required(VERSION 3.5)
+project(sound_play_msgs)
+
+if(NOT CMAKE_CXX_STANDARD)
+  set(CMAKE_CXX_STANDARD 14)
+endif()
+
+if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  add_compile_options(-Wall -Wextra -Wpedantic)
+endif()
+
+find_package(ament_cmake REQUIRED)
+find_package(rosidl_default_generators REQUIRED)
+find_package(action_msgs REQUIRED)
+
+set(msg_files
+  "msg/SoundRequest.msg"
+)
+
+set(action_files
+  "action/SoundRequest.action"
+)
+
+rosidl_generate_interfaces(${PROJECT_NAME}
+  ${msg_files}
+  ${action_files}
+  DEPENDENCIES
+    action_msgs
+    builtin_interfaces
+)
+
+ament_export_dependencies(rosidl_default_runtime)
+
+ament_package()

sound_play_msgs/mainpage.dox

@@ -0,0 +1,11 @@
+/**
+\mainpage
+\htmlinclude manifest.html
+
+\b sound_play_msgs contain messages for playing sound via ROS.
+
+
+\section codeapi Code API
+
+
+*/

sound_play_msgs/package.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<?xml-model
+  href="http://download.ros.org/schema/package_format3.xsd"
+  schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="3">
+   <name>sound_play_msgs</name>
+   <version>0.3.12</version>
+   <description>
+      Messages for transmitting sound via ROS with sound_play
+   </description>
+   <maintainer email="shingogo.5511@gmail.com">Shingo Kitagawa</maintainer>
+   <author>Shingo Kitagawa</author>
+   <license>BSD</license>
+   <url type="website">http://ros.org/wiki/sound_play_msgs</url>
+   <url type="repository">https://github.com/ros-drivers/audio_common</url>
+   <url type="bugtracker">https://github.com/ros-drivers/audio_common/issues</url>
+
+   <buildtool_depend>ament_cmake</buildtool_depend>
+   <buildtool_depend>rosidl_default_generators</buildtool_depend>
+
+   <depend>action_msgs</depend>
+   <depend>builtin_interfaces</depend>
+
+   <exec_depend>rosidl_default_runtime</exec_depend>
+
+   <member_of_group>rosidl_interface_packages</member_of_group>
+
+   <export>
+     <build_type>ament_cmake</build_type>
+   </export>
+</package>