rename: Rename package name to ipcamera_driver

alireza-hosseini · Aug 6, 2018 · e85ad06 · e85ad06
1 parent 37f6e6c
commit e85ad06
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8.3)
-project(mrl_ipcamera)
+project(ipcamera_driver)
 
 
 find_package(catkin REQUIRED COMPONENTS

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# mrl_ipcamera
+# ipcamera_driver
 Simple node to publish regular IP camera video streams to a ros topic.
 
 ## Nodes

diff --git a/include/mrl_ipcamera/mrl_ipcamera.hpp → include/ipcamera_driver/ipcamera_driver.hpp b/include/mrl_ipcamera/mrl_ipcamera.hpp → include/ipcamera_driver/ipcamera_driver.hpp
@@ -29,8 +29,8 @@
 
 /* Author: Alireza Hosseini */
 
-#ifndef MRL_IPCAMERA
-#define MRL_IPCAMERA
+#ifndef IPCAMERA_DRIVER_HPP
+#define IPCAMERA_DRIVER_HPP
 
 #include <camera_info_manager/camera_info_manager.h>
 #include <cv_bridge/cv_bridge.h>
@@ -40,10 +40,10 @@
 #include <std_srvs/Empty.h>
 #include <opencv2/highgui/highgui.hpp>
 
-class MrlIpCamera
+class IpCameraDriver
 {
 public:
-  explicit MrlIpCamera();
+  explicit IpCameraDriver();
   bool publish();
   bool refreshSrvCallback(std_srvs::Empty::Request &req, std_srvs::Empty::Response &res);
 

diff --git a/launch/example.launch b/launch/example.launch
@@ -1,5 +1,5 @@
 <launch>
-    <node pkg="mrl_ipcamera" type="mrl_ipcamera" name="ipcam" output="screen">
+    <node pkg="ipcamera_driver" type="ipcamera_driver" name="ipcam" output="screen">
         <param name="video_url" type="string" value="rtsp://184.72.239.149/vod/mp4:BigBuckBunny_175k.mov" />
         <param name="camera_info_url" type="string" value="package://mrl_ipcamera/launch/example_parameters.yaml" />
         <param name="frame_id" type="string" value="cam0_link" />

diff --git a/package.xml b/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
-  <name>mrl_ipcamera</name>
-  <version>2.6.0</version>
+  <name>ipcamera_driver</name>
+  <version>0.1.0</version>
 
   <description>
     Simple node to publish regular IP camera video streams to a ros topic.

diff --git a/src/mrl_ipcamera.cpp → src/ipcamera_driver.cpp b/src/mrl_ipcamera.cpp → src/ipcamera_driver.cpp
@@ -29,19 +29,19 @@
 
 /* Author: Alireza Hosseini */
 
-#include "mrl_ipcamera/mrl_ipcamera.hpp"
+#include "ipcamera_driver/ipcamera_driver.hpp"
 #include <sensor_msgs/image_encodings.h>
 #include <opencv2/video/video.hpp>
 
-MrlIpCamera::MrlIpCamera() : pnh_("~"), image_transport_(pnh_), camera_info_manager_(pnh_)
+IpCameraDriver::IpCameraDriver() : pnh_("~"), image_transport_(pnh_), camera_info_manager_(pnh_)
 {
   camera_pub_ = image_transport_.advertiseCamera("/camera/image", 10);
 
   pnh_.param<std::string>("video_url", video_url_, "rtsp://admin:A123456789@192.168.1.64/live.sdp?:network-cache=300");
   pnh_.getParam("camera_info_url", camera_info_url_);
   pnh_.param<std::string>("frame_id", frame_id_, "cam_link");
 
-  refresh_service_server_ = pnh_.advertiseService("refresh", &MrlIpCamera::refreshSrvCallback, this);
+  refresh_service_server_ = pnh_.advertiseService("refresh", &IpCameraDriver::refreshSrvCallback, this);
 
   camera_info_manager_.setCameraName("camera");
 
@@ -65,7 +65,7 @@ MrlIpCamera::MrlIpCamera() : pnh_("~"), image_transport_(pnh_), camera_info_mana
   cap_.open(video_url_);
 }
 
-bool MrlIpCamera::publish()
+bool IpCameraDriver::publish()
 {
   cv::Mat frame;
   ros::Rate loop(33);
@@ -108,7 +108,7 @@ bool MrlIpCamera::publish()
   return true;
 }
 
-bool MrlIpCamera::refreshSrvCallback(std_srvs::Empty::Request &req, std_srvs::Empty::Response &res)
+bool IpCameraDriver::refreshSrvCallback(std_srvs::Empty::Request &req, std_srvs::Empty::Response &res)
 {
   ROS_INFO("refreshing");
   cap_.release();
@@ -122,7 +122,7 @@ bool MrlIpCamera::refreshSrvCallback(std_srvs::Empty::Request &req, std_srvs::Em
 int main(int argc, char **argv)
 {
   ros::init(argc, argv, "mrl_ip_camera");
-  MrlIpCamera ipCamera;
+  IpCameraDriver ipCamera;
   ipCamera.publish();
   return 0;
 }