From 4348b22d07ba04a975848c38dd2c32467a85cfd3 Mon Sep 17 00:00:00 2001 From: Michael Orlov Date: Sun, 18 Jun 2023 00:45:30 -0700 Subject: [PATCH] Remove `in_recording_` variable for ABI compatibility Signed-off-by: Michael Orlov --- rosbag2_transport/include/rosbag2_transport/recorder.hpp | 2 +- rosbag2_transport/src/rosbag2_transport/recorder.cpp | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/rosbag2_transport/include/rosbag2_transport/recorder.hpp b/rosbag2_transport/include/rosbag2_transport/recorder.hpp index 8071f1e40c..0ce39ca1b2 100644 --- a/rosbag2_transport/include/rosbag2_transport/recorder.hpp +++ b/rosbag2_transport/include/rosbag2_transport/recorder.hpp @@ -164,7 +164,7 @@ class Recorder : public rclcpp::Node std::unordered_set topic_unknown_types_; rclcpp::Service::SharedPtr srv_snapshot_; std::atomic paused_ = false; - std::atomic in_recording_ = false; + // Keyboard handler std::shared_ptr keyboard_handler_; // Toogle paused key callback handle diff --git a/rosbag2_transport/src/rosbag2_transport/recorder.cpp b/rosbag2_transport/src/rosbag2_transport/recorder.cpp index 3b2fc77275..4d0c2649a1 100644 --- a/rosbag2_transport/src/rosbag2_transport/recorder.cpp +++ b/rosbag2_transport/src/rosbag2_transport/recorder.cpp @@ -141,18 +141,11 @@ void Recorder::stop() if (event_publisher_thread_.joinable()) { event_publisher_thread_.join(); } - in_recording_ = false; RCLCPP_INFO(get_logger(), "Recording stopped"); } void Recorder::record() { - if (in_recording_.exchange(true)) { - RCLCPP_WARN_STREAM( - get_logger(), - "Called Recorder::record() while already in recording, dismissing request."); - return; - } stop_discovery_ = record_options_.is_discovery_disabled; paused_ = record_options_.start_paused; topic_qos_profile_overrides_ = record_options_.topic_qos_profile_overrides;