Expose DatagramOutputFile to Python, add props to DatagramSink

panda3d · Sep 16, 2017 · 35349b6 · 35349b6
1 parent b8cb517
commit 35349b6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/panda/src/express/datagramSink.h b/panda/src/express/datagramSink.h
@@ -40,6 +40,10 @@ class EXPCL_PANDAEXPRESS DatagramSink {
   virtual const Filename &get_filename();
   virtual const FileReference *get_file();
   virtual streampos get_file_pos();
+
+  MAKE_PROPERTY(filename, get_filename);
+  MAKE_PROPERTY(file, get_file);
+  MAKE_PROPERTY(file_pos, get_file_pos);
 };
 
 #include "datagramSink.I"

diff --git a/panda/src/putil/datagramOutputFile.h b/panda/src/putil/datagramOutputFile.h
@@ -28,14 +28,13 @@
  * header followed by a number of datagrams.
  */
 class EXPCL_PANDA_PUTIL DatagramOutputFile : public DatagramSink {
-public:
+PUBLISHED:
   INLINE DatagramOutputFile();
   INLINE ~DatagramOutputFile();
 
   bool open(const FileReference *file);
   INLINE bool open(const Filename &filename);
   bool open(ostream &out, const Filename &filename = Filename());
-  INLINE ostream &get_stream();
 
   void close();
 
@@ -46,10 +45,16 @@ class EXPCL_PANDA_PUTIL DatagramOutputFile : public DatagramSink {
   virtual bool is_error();
   virtual void flush();
 
+public:
   virtual const Filename &get_filename();
   virtual const FileReference *get_file();
   virtual streampos get_file_pos();
 
+  INLINE ostream &get_stream();
+
+PUBLISHED:
+  MAKE_PROPERTY(stream, get_stream);
+
 private:
   bool _wrote_first_datagram;
   bool _error;