Skip to content

Commit 77b24fe

Browse files
committed
video_stream: simplify callbacks
1 parent 8a0d6e8 commit 77b24fe

File tree

1 file changed

+4
-20
lines changed

1 file changed

+4
-20
lines changed

src/video_stream.cpp

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -373,22 +373,6 @@ virtual void disconnectionCallbackImpl() {
373373
}
374374
}
375375

376-
virtual void connectionCallback(const image_transport::SingleSubscriberPublisher&) {
377-
connectionCallbackImpl();
378-
}
379-
380-
virtual void infoConnectionCallback(const ros::SingleSubscriberPublisher&) {
381-
connectionCallbackImpl();
382-
}
383-
384-
virtual void disconnectionCallback(const image_transport::SingleSubscriberPublisher&) {
385-
disconnectionCallbackImpl();
386-
}
387-
388-
virtual void infoDisconnectionCallback(const ros::SingleSubscriberPublisher&) {
389-
disconnectionCallbackImpl();
390-
}
391-
392376
virtual void configCallback(VideoStreamConfig& new_config, uint32_t level) {
393377
NODELET_DEBUG("configCallback");
394378

@@ -477,13 +461,13 @@ virtual void onInit() {
477461
dyn_srv->setCallback(f);
478462

479463
image_transport::SubscriberStatusCallback connect_cb =
480-
boost::bind(&VideoStreamNodelet::connectionCallback, this, _1);
464+
boost::bind(&VideoStreamNodelet::connectionCallbackImpl, this);
481465
ros::SubscriberStatusCallback info_connect_cb =
482-
boost::bind(&VideoStreamNodelet::infoConnectionCallback, this, _1);
466+
boost::bind(&VideoStreamNodelet::connectionCallbackImpl, this);
483467
image_transport::SubscriberStatusCallback disconnect_cb =
484-
boost::bind(&VideoStreamNodelet::disconnectionCallback, this, _1);
468+
boost::bind(&VideoStreamNodelet::disconnectionCallbackImpl, this);
485469
ros::SubscriberStatusCallback info_disconnect_cb =
486-
boost::bind(&VideoStreamNodelet::infoDisconnectionCallback, this, _1);
470+
boost::bind(&VideoStreamNodelet::disconnectionCallbackImpl, this);
487471
pub = image_transport::ImageTransport(*nh).advertiseCamera(
488472
"image_raw", 1,
489473
connect_cb, disconnect_cb,

0 commit comments

Comments
 (0)