Merge pull request #98 from christiankerl/refactor_data_received_callback

moved DataReceivedCallback from TransferPool to separate header

Author: christiankerl

examples/protonect/include/libfreenect2/data_callback.h

@@ -0,0 +1,44 @@
+/*
+ * This file is part of the OpenKinect Project. http://www.openkinect.org
+ *
+ * Copyright (c) 2014 individual OpenKinect contributors. See the CONTRIB file
+ * for details.
+ *
+ * This code is licensed to you under the terms of the Apache License, version
+ * 2.0, or, at your option, the terms of the GNU General Public License,
+ * version 2.0. See the APACHE20 and GPL2 files for the text of the licenses,
+ * or the following URLs:
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.gnu.org/licenses/gpl-2.0.txt
+ *
+ * If you redistribute this file in source form, modified or unmodified, you
+ * may:
+ *   1) Leave this header intact and distribute it under the same terms,
+ *      accompanying it with the APACHE20 and GPL20 files, or
+ *   2) Delete the Apache 2.0 clause and accompany it with the GPL2 file, or
+ *   3) Delete the GPL v2 clause and accompany it with the APACHE20 file
+ * In all cases you must keep the copyright notice intact and include a copy
+ * of the CONTRIB file.
+ *
+ * Binary distributions must follow the binary distribution requirements of
+ * either License.
+ */
+ 
+ 
+#ifndef DATA_CALLBACK_H_
+#define DATA_CALLBACK_H_
+
+#include <stddef.h>
+
+namespace libfreenect2
+{
+
+class DataCallback
+{
+public:
+  virtual void onDataReceived(unsigned char *buffer, size_t n) = 0;
+};
+
+} // namespace libfreenect2
+
+#endif // DATA_CALLBACK_H_

examples/protonect/include/libfreenect2/depth_packet_stream_parser.h

@@ -33,7 +33,7 @@
 #include <libfreenect2/double_buffer.h>
 #include <libfreenect2/depth_packet_processor.h>
 
-#include <libfreenect2/usb/transfer_pool.h>
+#include <libfreenect2/data_callback.h>
 
 #include <libfreenect2/common.h>
 
@@ -51,7 +51,7 @@ PACK(struct DepthSubPacketFooter
   uint32_t fields[32];
 });
 
-class DepthPacketStreamParser : public libfreenect2::usb::TransferPool::DataReceivedCallback
+class DepthPacketStreamParser : public DataCallback
 {
 public:
   DepthPacketStreamParser();

examples/protonect/include/libfreenect2/packet_pipeline.h

@@ -27,7 +27,7 @@
 #ifndef PACKET_PIPELINE_H_
 #define PACKET_PIPELINE_H_
 
-#include <libfreenect2/usb/transfer_pool.h>
+#include <libfreenect2/data_callback.h>
 #include <libfreenect2/rgb_packet_stream_parser.h>
 #include <libfreenect2/depth_packet_stream_parser.h>
 #include <libfreenect2/depth_packet_processor.h>
@@ -39,7 +39,7 @@ namespace libfreenect2
 class PacketPipeline
 {
 public:
-  typedef libfreenect2::usb::TransferPool::DataReceivedCallback PacketParser;
+  typedef DataCallback PacketParser;
   virtual ~PacketPipeline();
 
   virtual PacketParser *getRgbPacketParser() const = 0;

examples/protonect/include/libfreenect2/rgb_packet_stream_parser.h

@@ -32,12 +32,12 @@
 #include <libfreenect2/double_buffer.h>
 #include <libfreenect2/rgb_packet_processor.h>
 
-#include <libfreenect2/usb/transfer_pool.h>
+#include <libfreenect2/data_callback.h>
 
 namespace libfreenect2
 {
 
-class RgbPacketStreamParser : public libfreenect2::usb::TransferPool::DataReceivedCallback
+class RgbPacketStreamParser : public DataCallback
 {
 public:
   RgbPacketStreamParser();

examples/protonect/include/libfreenect2/usb/transfer_pool.h

@@ -27,9 +27,10 @@
 #ifndef TRANSFER_POOL_H_
 #define TRANSFER_POOL_H_
 
+#include <deque>
 #include <libusb.h>
 
-#include <deque>
+#include <libfreenect2/data_callback.h>
 
 namespace libfreenect2
 {
@@ -40,11 +41,6 @@ namespace usb
 class TransferPool
 {
 public:
-  struct DataReceivedCallback
-  {
-    virtual void onDataReceived(unsigned char *buffer, size_t n) = 0;
-  };
-
   TransferPool(libusb_device_handle *device_handle, unsigned char device_endpoint);
   virtual ~TransferPool();
 
@@ -58,7 +54,7 @@ class TransferPool
 
   void cancel();
 
-  void setCallback(DataReceivedCallback *callback);
+  void setCallback(DataCallback *callback);
 protected:
   void allocateTransfers(size_t num_transfers, size_t transfer_size);
 
@@ -67,7 +63,7 @@ class TransferPool
 
   virtual void processTransfer(libusb_transfer *transfer) = 0;
 
-  DataReceivedCallback *callback_;
+  DataCallback *callback_;
 private:
   typedef std::deque<libusb_transfer *> TransferQueue;
 

examples/protonect/src/transfer_pool.cpp

@@ -122,7 +122,7 @@ void TransferPool::cancel()
   //idle_transfers_.insert(idle_transfers_.end(), pending_transfers_.begin(), pending_transfers_.end());
 }
 
-void TransferPool::setCallback(TransferPool::DataReceivedCallback *callback)
+void TransferPool::setCallback(DataCallback *callback)
 {
   callback_ = callback;
 }