TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 15:53:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

recorder: fix reading multiple recorders from bam file

Browse Source 
Closes #1564
Fixes #1561
This commit is contained in:
jb 2024-01-04 16:31:18 +01:00 committed by rdb
parent 9145b6c729
commit 384a0d1238
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/putil/bamReaderParam.I
View File

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

6
panda/src/putil/bamReaderParam.h
View File

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

2
panda/src/recorder/mouseRecorder.cxx
View File

@ -230,7 +230,7 @@ make_recorder(const FactoryParams &params) {
MouseRecorder *node = new MouseRecorder(""); MouseRecorder *node = new MouseRecorder("");
BamReaderParam *param = DCAST(BamReaderParam, params.get_param(0)); 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; return node;
} }

2
panda/src/recorder/socketStreamRecorder.cxx
View File

@ -115,7 +115,7 @@ make_recorder(const FactoryParams &params) {
SocketStreamRecorder *node = new SocketStreamRecorder; SocketStreamRecorder *node = new SocketStreamRecorder;
BamReaderParam *param = DCAST(BamReaderParam, params.get_param(0)); 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; return node;
} }