Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use hpp extension for headers #157

Merged
merged 1 commit into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define H264_STREAMERS_H_

#include <image_transport/image_transport.hpp>
#include "web_video_server/libav_streamer.h"
#include "web_video_server/libav_streamer.hpp"
#include "async_web_server_cpp/http_request.hpp"
#include "async_web_server_cpp/http_connection.hpp"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <image_transport/image_transport.hpp>
#include <image_transport/transport_hints.hpp>
#include <opencv2/opencv.hpp>
#include "web_video_server/utils.h"
#include "web_video_server/utils.hpp"
#include "async_web_server_cpp/http_server.hpp"
#include "async_web_server_cpp/http_request.hpp"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
#define JPEG_STREAMERS_H_

#include <image_transport/image_transport.hpp>
#include "web_video_server/image_streamer.h"
#include "web_video_server/image_streamer.hpp"
#include "async_web_server_cpp/http_request.hpp"
#include "async_web_server_cpp/http_connection.hpp"
#include "web_video_server/multipart_stream.h"
#include "web_video_server/multipart_stream.hpp"

namespace web_video_server
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define LIBAV_STREAMERS_H_

#include <image_transport/image_transport.hpp>
#include "web_video_server/image_streamer.h"
#include "web_video_server/image_streamer.hpp"
#include "async_web_server_cpp/http_request.hpp"
#include "async_web_server_cpp/http_connection.hpp"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
#define PNG_STREAMERS_H_

#include <image_transport/image_transport.hpp>
#include "web_video_server/image_streamer.h"
#include "web_video_server/image_streamer.hpp"
#include "async_web_server_cpp/http_request.hpp"
#include "async_web_server_cpp/http_connection.hpp"
#include "web_video_server/multipart_stream.h"
#include "web_video_server/multipart_stream.hpp"

namespace web_video_server
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
#define ROS_COMPRESSED_STREAMERS_H_

#include <sensor_msgs/msg/compressed_image.hpp>
#include "web_video_server/image_streamer.h"
#include "web_video_server/image_streamer.hpp"
#include "async_web_server_cpp/http_request.hpp"
#include "async_web_server_cpp/http_connection.hpp"
#include "web_video_server/multipart_stream.h"
#include "web_video_server/multipart_stream.hpp"

namespace web_video_server
{
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#define VP8_STREAMERS_H_

#include <image_transport/image_transport.hpp>
#include "web_video_server/libav_streamer.h"
#include "web_video_server/libav_streamer.hpp"
#include "async_web_server_cpp/http_request.hpp"
#include "async_web_server_cpp/http_connection.hpp"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define VP9_STREAMERS_H_

#include <image_transport/image_transport.hpp>
#include "web_video_server/libav_streamer.h"
#include "web_video_server/libav_streamer.hpp"
#include "async_web_server_cpp/http_request.hpp"
#include "async_web_server_cpp/http_connection.hpp"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#endif

#include <vector>
#include "web_video_server/image_streamer.h"
#include "web_video_server/image_streamer.hpp"
#include "async_web_server_cpp/http_server.hpp"
#include "async_web_server_cpp/http_request.hpp"
#include "async_web_server_cpp/http_connection.hpp"
Expand Down
2 changes: 1 addition & 1 deletion src/h264_streamer.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "web_video_server/h264_streamer.h"
#include "web_video_server/h264_streamer.hpp"

namespace web_video_server
{
Expand Down
2 changes: 1 addition & 1 deletion src/image_streamer.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "web_video_server/image_streamer.h"
#include "web_video_server/image_streamer.hpp"

#ifdef CV_BRIDGE_USES_OLD_HEADERS
#include <cv_bridge/cv_bridge.h>
Expand Down
2 changes: 1 addition & 1 deletion src/jpeg_streamers.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "web_video_server/jpeg_streamers.h"
#include "web_video_server/jpeg_streamers.hpp"
#include "async_web_server_cpp/http_reply.hpp"

namespace web_video_server
Expand Down
2 changes: 1 addition & 1 deletion src/libav_streamer.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "web_video_server/libav_streamer.h"
#include "web_video_server/libav_streamer.hpp"
#include "async_web_server_cpp/http_reply.hpp"

/*https://stackoverflow.com/questions/46884682/error-in-building-opencv-with-ffmpeg*/
Expand Down
2 changes: 1 addition & 1 deletion src/multipart_stream.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "web_video_server/multipart_stream.h"
#include "web_video_server/multipart_stream.hpp"
#include "async_web_server_cpp/http_reply.hpp"

namespace web_video_server
Expand Down
2 changes: 1 addition & 1 deletion src/png_streamers.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "web_video_server/png_streamers.h"
#include "web_video_server/png_streamers.hpp"
#include "async_web_server_cpp/http_reply.hpp"

namespace web_video_server
Expand Down
2 changes: 1 addition & 1 deletion src/ros_compressed_streamer.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "web_video_server/ros_compressed_streamer.h"
#include "web_video_server/ros_compressed_streamer.hpp"

namespace web_video_server
{
Expand Down
2 changes: 1 addition & 1 deletion src/utils.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "web_video_server/utils.h"
#include "web_video_server/utils.hpp"

namespace web_video_server
{
Expand Down
2 changes: 1 addition & 1 deletion src/vp8_streamer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
*
*********************************************************************/

#include "web_video_server/vp8_streamer.h"
#include "web_video_server/vp8_streamer.hpp"

namespace web_video_server
{
Expand Down
2 changes: 1 addition & 1 deletion src/vp9_streamer.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "web_video_server/vp9_streamer.h"
#include "web_video_server/vp9_streamer.hpp"

namespace web_video_server
{
Expand Down
14 changes: 7 additions & 7 deletions src/web_video_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
#include <sensor_msgs/image_encodings.hpp>
#include <opencv2/opencv.hpp>

#include "web_video_server/web_video_server.h"
#include "web_video_server/ros_compressed_streamer.h"
#include "web_video_server/jpeg_streamers.h"
#include "web_video_server/png_streamers.h"
#include "web_video_server/vp8_streamer.h"
#include "web_video_server/h264_streamer.h"
#include "web_video_server/vp9_streamer.h"
#include "web_video_server/web_video_server.hpp"
#include "web_video_server/ros_compressed_streamer.hpp"
#include "web_video_server/jpeg_streamers.hpp"
#include "web_video_server/png_streamers.hpp"
#include "web_video_server/vp8_streamer.hpp"
#include "web_video_server/h264_streamer.hpp"
#include "web_video_server/vp9_streamer.hpp"
#include "async_web_server_cpp/http_reply.hpp"

using namespace std::chrono_literals;
Expand Down