api: Remove the abstract class PacketPipeline

It is a useless duplicate of BasePacketPipeline.

Author: xlz

include/libfreenect2/libfreenect2.hpp

@@ -31,13 +31,12 @@
 
 #include <libfreenect2/config.h>
 #include <libfreenect2/frame_listener.hpp>
+#include <libfreenect2/packet_pipeline.h>
 #include <string>
 
 namespace libfreenect2
 {
 
-class PacketPipeline;
-
 /** Device class. */
 class LIBFREENECT2_API Freenect2Device
 {

include/libfreenect2/packet_pipeline.h

@@ -37,41 +37,28 @@ namespace libfreenect2
 class DataCallback;
 class RgbPacketProcessor;
 class DepthPacketProcessor;
+class PacketPipelineComponents;
 
-/** Packet pipeline for data processing of the device. */
+/** Front of the pipeline, RGB and Depth parsing and processing. */
 class LIBFREENECT2_API PacketPipeline
 {
 public:
   typedef DataCallback PacketParser;
-  virtual ~PacketPipeline();
-
-  virtual PacketParser *getRgbPacketParser() const = 0;
-  virtual PacketParser *getIrPacketParser() const = 0;
-
-  virtual RgbPacketProcessor *getRgbPacketProcessor() const = 0;
-  virtual DepthPacketProcessor *getDepthPacketProcessor() const = 0;
-};
 
-class BasePacketPipelineComponents;
-
-/** Front of the pipeline, RGB and Depth parsing and processing. */
-class LIBFREENECT2_API BasePacketPipeline : public PacketPipeline
-{
-public:
-  BasePacketPipeline();
-  virtual ~BasePacketPipeline();
+  PacketPipeline();
+  virtual ~PacketPipeline();
 
   virtual PacketParser *getRgbPacketParser() const;
   virtual PacketParser *getIrPacketParser() const;
 
   virtual RgbPacketProcessor *getRgbPacketProcessor() const;
   virtual DepthPacketProcessor *getDepthPacketProcessor() const;
 protected:
-  BasePacketPipelineComponents *comp_;
+  PacketPipelineComponents *comp_;
 };
 
 /** Complete pipe line with depth processing by the CPU. */
-class LIBFREENECT2_API CpuPacketPipeline : public BasePacketPipeline
+class LIBFREENECT2_API CpuPacketPipeline : public PacketPipeline
 {
 public:
   CpuPacketPipeline();
@@ -80,7 +67,7 @@ class LIBFREENECT2_API CpuPacketPipeline : public BasePacketPipeline
 
 #ifdef LIBFREENECT2_WITH_OPENGL_SUPPORT
 /** Complete pipe line with depth processing with OpenGL. */
-class LIBFREENECT2_API OpenGLPacketPipeline : public BasePacketPipeline
+class LIBFREENECT2_API OpenGLPacketPipeline : public PacketPipeline
 {
 protected:
   void *parent_opengl_context_;
@@ -93,7 +80,7 @@ class LIBFREENECT2_API OpenGLPacketPipeline : public BasePacketPipeline
 
 #ifdef LIBFREENECT2_WITH_OPENCL_SUPPORT
 /** Complete pipe line with depth processing with OpenCL. */
-class LIBFREENECT2_API OpenCLPacketPipeline : public BasePacketPipeline
+class LIBFREENECT2_API OpenCLPacketPipeline : public PacketPipeline
 {
 protected:
   const int deviceId;

src/libfreenect2.cpp

@@ -38,7 +38,6 @@
 
 #include <libfreenect2/usb/event_loop.h>
 #include <libfreenect2/usb/transfer_pool.h>
-#include <libfreenect2/packet_pipeline.h>
 #include <libfreenect2/depth_packet_processor.h>
 #include <libfreenect2/rgb_packet_processor.h>
 #include <libfreenect2/protocol/usb_control.h>

src/packet_pipeline.cpp

@@ -35,11 +35,7 @@
 namespace libfreenect2
 {
 
-PacketPipeline::~PacketPipeline()
-{
-}
-
-class BasePacketPipelineComponents
+class PacketPipelineComponents
 {
 public:
   RgbPacketStreamParser *rgb_parser_;
@@ -50,11 +46,11 @@ class BasePacketPipelineComponents
   DepthPacketProcessor *depth_processor_;
   BaseDepthPacketProcessor *async_depth_processor_;
 
-  ~BasePacketPipelineComponents();
+  ~PacketPipelineComponents();
   void initialize(RgbPacketProcessor *rgb, DepthPacketProcessor *depth);
 };
 
-void BasePacketPipelineComponents::initialize(RgbPacketProcessor *rgb, DepthPacketProcessor *depth)
+void PacketPipelineComponents::initialize(RgbPacketProcessor *rgb, DepthPacketProcessor *depth)
 {
   rgb_parser_ = new RgbPacketStreamParser();
   depth_parser_ = new DepthPacketStreamParser();
@@ -69,7 +65,7 @@ void BasePacketPipelineComponents::initialize(RgbPacketProcessor *rgb, DepthPack
   depth_parser_->setPacketProcessor(async_depth_processor_);
 }
 
-BasePacketPipelineComponents::~BasePacketPipelineComponents()
+PacketPipelineComponents::~PacketPipelineComponents()
 {
   delete async_rgb_processor_;
   delete async_depth_processor_;
@@ -79,29 +75,29 @@ BasePacketPipelineComponents::~BasePacketPipelineComponents()
   delete depth_parser_;
 }
 
-BasePacketPipeline::BasePacketPipeline(): comp_(new BasePacketPipelineComponents()) {}
+PacketPipeline::PacketPipeline(): comp_(new PacketPipelineComponents()) {}
 
-BasePacketPipeline::~BasePacketPipeline()
+PacketPipeline::~PacketPipeline()
 {
   delete comp_;
 }
 
-BasePacketPipeline::PacketParser *BasePacketPipeline::getRgbPacketParser() const
+PacketPipeline::PacketParser *PacketPipeline::getRgbPacketParser() const
 {
   return comp_->rgb_parser_;
 }
 
-BasePacketPipeline::PacketParser *BasePacketPipeline::getIrPacketParser() const
+PacketPipeline::PacketParser *PacketPipeline::getIrPacketParser() const
 {
   return comp_->depth_parser_;
 }
 
-RgbPacketProcessor *BasePacketPipeline::getRgbPacketProcessor() const
+RgbPacketProcessor *PacketPipeline::getRgbPacketProcessor() const
 {
   return comp_->rgb_processor_;
 }
 
-DepthPacketProcessor *BasePacketPipeline::getDepthPacketProcessor() const
+DepthPacketProcessor *PacketPipeline::getDepthPacketProcessor() const
 {
   return comp_->depth_processor_;
 }