Browse Source

recorder: fix reading multiple recorders from bam file

Closes #1564
Fixes #1561
jb 1 year ago
parent
commit
384a0d1238

+ 2 - 2
panda/src/putil/bamReaderParam.I

@@ -14,7 +14,7 @@
 /**
  *
  */
-INLINE const DatagramIterator &BamReaderParam::
+INLINE DatagramIterator &BamReaderParam::
 get_iterator() {
   return _iterator;
 }
@@ -32,7 +32,7 @@ get_manager() {
  *
  */
 INLINE BamReaderParam::
-BamReaderParam(const DatagramIterator &dgi, BamReader *manager) :
+BamReaderParam(DatagramIterator &dgi, BamReader *manager) :
   _iterator(dgi),
   _manager(manager)
 {

+ 3 - 3
panda/src/putil/bamReaderParam.h

@@ -27,15 +27,15 @@ class DatagramIterator;
  */
 class EXPCL_PANDA_PUTIL BamReaderParam : public FactoryParam {
 public:
-  INLINE const DatagramIterator &get_iterator();
+  INLINE DatagramIterator &get_iterator();
   INLINE BamReader *get_manager();
 
 private:
-  const DatagramIterator &_iterator;
+  DatagramIterator &_iterator;
   BamReader *_manager;
 
 public:
-  INLINE BamReaderParam(const DatagramIterator &dgi, BamReader *manager);
+  INLINE BamReaderParam(DatagramIterator &dgi, BamReader *manager);
   INLINE ~BamReaderParam();
 
 public:

+ 1 - 1
panda/src/recorder/mouseRecorder.cxx

@@ -230,7 +230,7 @@ make_recorder(const FactoryParams &params) {
   MouseRecorder *node = new MouseRecorder("");
   BamReaderParam *param = DCAST(BamReaderParam, params.get_param(0));
 
-  node->fillin_recorder((DatagramIterator &)param->get_iterator(), param->get_manager());
+  node->fillin_recorder(param->get_iterator(), param->get_manager());
 
   return node;
 }

+ 1 - 1
panda/src/recorder/socketStreamRecorder.cxx

@@ -115,7 +115,7 @@ make_recorder(const FactoryParams &params) {
   SocketStreamRecorder *node = new SocketStreamRecorder;
   BamReaderParam *param = DCAST(BamReaderParam, params.get_param(0));
 
-  node->fillin_recorder((DatagramIterator &)param->get_iterator(), param->get_manager());
+  node->fillin_recorder(param->get_iterator(), param->get_manager());
 
   return node;
 }