[RosPublisher] Revise the nns_ros_publisher's parameters

This patch revises the nns_rclcpp_publisher's parameters to get the instance of nns_ros_publisher as the first argument. Signed-off-by: Wook Song <[email protected]>
nnstreamer · Oct 28, 2020 · 1308c5b · 1308c5b
1 parent cb42c7a
commit 1308c5b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/gst/tensor_ros_sink/tensor_ros_sink.c b/gst/tensor_ros_sink/tensor_ros_sink.c
@@ -479,7 +479,8 @@ gst_tensor_ros_sink_finalize (GObject *object)
 
   g_mutex_clear (&self->mutex);
   g_free (self->location);
-  nns_ros_publisher_close_bag (self->rosbag_to_save);
+  nns_ros_publisher_close_bag (self->nns_ros_bind_instance,
+      self->rosbag_to_save);
   nns_ros_publisher_finalize (self->nns_ros_bind_instance);
 
   self->location = NULL;

diff --git a/include/nns_ros_publisher.h b/include/nns_ros_publisher.h
@@ -132,7 +132,7 @@ gboolean nns_ros_publisher_set_pub_topic (void *instance,
     const GstTensorsConfig *conf);
 const gchar *nns_ros_publisher_get_pub_topic_name (void *instance);
 void *nns_ros_publisher_open_writable_bag (void *instance, const char *name);
-void nns_ros_publisher_close_bag (void *bag);
+void nns_ros_publisher_close_bag (void *instance, void *bag);
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

diff --git a/ros/node/nns_roscpp_publisher.cc b/ros/node/nns_roscpp_publisher.cc
@@ -225,7 +225,8 @@ void *nns_ros_publisher_open_writable_bag (void *instance, const char *name)
   return (void *) bag;
 }
 
-void nns_ros_publisher_close_bag(void *bag)
+void nns_ros_publisher_close_bag(void * instance __attribute__((unused)),
+    void *bag)
 {
   rosbag::Bag *rosbag = (rosbag::Bag *) bag;
 

diff --git a/ros2/node/nns_rclcpp_publisher.cc b/ros2/node/nns_rclcpp_publisher.cc
@@ -187,7 +187,7 @@ nns_ros_publisher_open_writable_bag (void * instance __attribute__((unused)), co
 }
 
 void
-nns_ros_publisher_close_bag (void *bag __attribute__((unused)))
+nns_ros_publisher_close_bag (void * instance __attribute__((unused)), void *bag __attribute__((unused)))
 {
   ;
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     void
-    nns_ros_publisher_close_bag (void *bag __attribute__((unused)))
+    nns_ros_publisher_close_bag (void * instance __attribute__((unused)), void *bag __attribute__((unused)))
     {
       ;
     }