Rename from cameraserver to cscore.

This is primarily to avoid header naming conflicts with wpilib.
This commit is contained in:
Peter Johnson
2016-11-05 22:11:55 -07:00
parent 891ce06312
commit f83ff41e47
50 changed files with 164 additions and 313 deletions

View File

@@ -11,7 +11,7 @@
#include "opencv2/core/core.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "cameraserver_cpp.h"
#include "cscore_cpp.h"
#include "c_util.h"
#include "Handle.h"
#include "Log.h"

View File

@@ -5,8 +5,8 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#ifndef CAMERASERVER_CVSINKIMPL_H_
#define CAMERASERVER_CVSINKIMPL_H_
#ifndef CS_CVSINKIMPL_H_
#define CS_CVSINKIMPL_H_
#include <atomic>
#include <condition_variable>
@@ -50,4 +50,4 @@ class CvSinkImpl : public SinkImpl {
} // namespace cs
#endif // CAMERASERVER_CVSINKIMPL_H_
#endif // CS_CVSINKIMPL_H_

View File

@@ -12,7 +12,7 @@
#include "opencv2/highgui/highgui.hpp"
#include "support/timestamp.h"
#include "cameraserver_cpp.h"
#include "cscore_cpp.h"
#include "c_util.h"
#include "Handle.h"
#include "Log.h"

View File

@@ -5,8 +5,8 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#ifndef CAMERASERVER_CVSOURCEIMPL_H_
#define CAMERASERVER_CVSOURCEIMPL_H_
#ifndef CS_CVSOURCEIMPL_H_
#define CS_CVSOURCEIMPL_H_
#include <atomic>
#include <functional>
@@ -75,4 +75,4 @@ class CvSourceImpl : public SourceImpl {
} // namespace cs
#endif // CAMERASERVER_CVSOURCEIMPL_H_
#endif // CS_CVSOURCEIMPL_H_

View File

@@ -5,15 +5,15 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#ifndef CAMERASERVER_FRAME_H_
#define CAMERASERVER_FRAME_H_
#ifndef CS_FRAME_H_
#define CS_FRAME_H_
#include <atomic>
#include <memory>
#include "llvm/StringRef.h"
#include "cameraserver_cpp.h"
#include "cscore_cpp.h"
namespace cs {
@@ -109,4 +109,4 @@ class Frame {
} // namespace cs
#endif // CAMERASERVER_FRAME_H_
#endif // CS_FRAME_H_

View File

@@ -5,14 +5,14 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#ifndef CAMERASERVER_HANDLE_H_
#define CAMERASERVER_HANDLE_H_
#ifndef CS_HANDLE_H_
#define CS_HANDLE_H_
#include <atomic>
#include "llvm/StringRef.h"
#include "cameraserver_c.h"
#include "cscore_c.h"
#include "UnlimitedHandleResource.h"
namespace cs {
@@ -107,4 +107,4 @@ typedef StaticUnlimitedHandleResource<Handle, SinkData, Handle::kSink> Sinks;
} // namespace cs
#endif // CAMERASERVER_HANDLE_H_
#endif // CS_HANDLE_H_

View File

@@ -5,8 +5,8 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#ifndef CAMERASERVER_LOG_H_
#define CAMERASERVER_LOG_H_
#ifndef CS_LOG_H_
#define CS_LOG_H_
#include "support/atomic_static.h"
#include "support/Logger.h"
@@ -42,4 +42,4 @@ class Logger : public wpi::Logger {
} // namespace cs
#endif // CAMERASERVER_LOG_H_
#endif // CS_LOG_H_

View File

@@ -15,7 +15,7 @@
#include "support/raw_socket_ostream.h"
#include "tcpsockets/TCPAcceptor.h"
#include "cameraserver_cpp.h"
#include "cscore_cpp.h"
#include "Handle.h"
#include "Log.h"
#include "SourceImpl.h"

View File

@@ -5,8 +5,8 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#ifndef CAMERASERVER_MJPEGSERVERIMPL_H_
#define CAMERASERVER_MJPEGSERVERIMPL_H_
#ifndef CS_MJPEGSERVERIMPL_H_
#define CS_MJPEGSERVERIMPL_H_
#include <atomic>
#include <memory>
@@ -64,4 +64,4 @@ class MJPEGServerImpl : public SinkImpl {
} // namespace cs
#endif // CAMERASERVER_MJPEGSERVERIMPL_H_
#endif // CS_MJPEGSERVERIMPL_H_

View File

@@ -5,14 +5,14 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#ifndef CAMERASERVER_NOTIFIER_H_
#define CAMERASERVER_NOTIFIER_H_
#ifndef CS_NOTIFIER_H_
#define CS_NOTIFIER_H_
#include <functional>
#include "support/atomic_static.h"
#include "support/SafeThread.h"
#include "cameraserver_cpp.h"
#include "cscore_cpp.h"
namespace cs {
@@ -64,4 +64,4 @@ class Notifier {
} // namespace cs
#endif // CAMERASERVER_NOTIFIER_H_
#endif // CS_NOTIFIER_H_

View File

@@ -5,8 +5,8 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#ifndef CAMERASERVER_SINKIMPL_H_
#define CAMERASERVER_SINKIMPL_H_
#ifndef CS_SINKIMPL_H_
#define CS_SINKIMPL_H_
#include <memory>
#include <mutex>
@@ -77,4 +77,4 @@ class SinkImpl {
} // namespace cs
#endif // CAMERASERVER_SINKIMPL_H_
#endif // CS_SINKIMPL_H_

View File

@@ -5,8 +5,8 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#ifndef CAMERASERVER_SOURCEIMPL_H_
#define CAMERASERVER_SOURCEIMPL_H_
#ifndef CS_SOURCEIMPL_H_
#define CS_SOURCEIMPL_H_
#include <condition_variable>
#include <cstddef>
@@ -18,7 +18,7 @@
#include "llvm/ArrayRef.h"
#include "llvm/StringMap.h"
#include "llvm/StringRef.h"
#include "cameraserver_cpp.h"
#include "cscore_cpp.h"
#include "Frame.h"
namespace cs {
@@ -209,4 +209,4 @@ class SourceImpl {
} // namespace cs
#endif // CAMERASERVER_SOURCEIMPL_H_
#endif // CS_SOURCEIMPL_H_

View File

@@ -5,8 +5,8 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#ifndef CAMERASERVER_USBCAMERABUFFER_H_
#define CAMERASERVER_USBCAMERABUFFER_H_
#ifndef CS_USBCAMERABUFFER_H_
#define CS_USBCAMERABUFFER_H_
#ifdef __linux__
#include <sys/mman.h>
@@ -55,4 +55,4 @@ class USBCameraBuffer {
} // namespace cs
#endif // CAMERASERVER_USBCAMERABUFFER_H_
#endif // CS_USBCAMERABUFFER_H_

View File

@@ -33,7 +33,7 @@
#include "llvm/SmallString.h"
#include "support/timestamp.h"
#include "cameraserver_cpp.h"
#include "cscore_cpp.h"
#include "c_util.h"
#include "Handle.h"
#include "Log.h"

View File

@@ -5,8 +5,8 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#ifndef CAMERASERVER_USBCAMERAIMPL_H_
#define CAMERASERVER_USBCAMERAIMPL_H_
#ifndef CS_USBCAMERAIMPL_H_
#define CS_USBCAMERAIMPL_H_
#include <atomic>
#include <thread>
@@ -171,4 +171,4 @@ class USBCameraImpl : public SourceImpl {
} // namespace cs
#endif // CAMERASERVER_USBCAMERAIMPL_H_
#endif // CS_USBCAMERAIMPL_H_

View File

@@ -5,8 +5,8 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#ifndef CAMERASERVER_UNLIMITEDHANDLERESOURCE_H_
#define CAMERASERVER_UNLIMITEDHANDLERESOURCE_H_
#ifndef CS_UNLIMITEDHANDLERESOURCE_H_
#define CS_UNLIMITEDHANDLERESOURCE_H_
#include <memory>
#include <mutex>
@@ -154,4 +154,4 @@ class StaticUnlimitedHandleResource
} // namespace cs
#endif // CAMERASERVER_UNLIMITEDHANDLERESOURCE_H_
#endif // CS_UNLIMITEDHANDLERESOURCE_H_

View File

@@ -5,8 +5,8 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#ifndef CAMERASERVER_C_UTIL_H_
#define CAMERASERVER_C_UTIL_H_
#ifndef CS_C_UTIL_H_
#define CS_C_UTIL_H_
namespace cs {
@@ -19,4 +19,4 @@ inline char* ConvertToC(llvm::StringRef in) {
} // namespace cs
#endif // CAMERASERVER_C_UTIL_H_
#endif // CS_C_UTIL_H_

View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "cameraserver_c.h"
#include "cscore_c.h"
#include <cstddef>
#include <cstdlib>
@@ -13,7 +13,7 @@
#include "opencv2/core/core.hpp"
#include "llvm/SmallString.h"
#include "cameraserver_cpp.h"
#include "cscore_cpp.h"
#include "c_util.h"
extern "C" {

View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "cameraserver_cpp.h"
#include "cscore_cpp.h"
#include "llvm/SmallString.h"

View File

@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include "cameraserver_oo.h"
#include "cscore_oo.h"
using namespace cs;