Changeset 4644 for pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/endpoint.hpp

Timestamp:

Nov 6, 2013 8:05:11 AM (9 years ago)

Author:

bennylp

Message:

Re #1519: Added persistent API in pjsua2, with JSON as the format. The API is extensible to support more formats. All config structures are serializable now. Tested in Python.

File:

• pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/endpoint.hpp (modified) (10 diffs)

pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/endpoint.hpp

@@ -1 +1 @@
 /* $Id$ */
 /* 
- * Copyright (C) 2008-2012 Teluu Inc. (http://www.teluu.com)
+ * Copyright (C) 2013 Teluu Inc. (http://www.teluu.com)
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24 +24 @@
  * @brief PJSUA2 Base Agent Operation
  */
-#include <pjsua2/types.hpp>
+#include <pjsua2/persistent.hpp>
+#include <pjsua2/siptypes.hpp>
 
 /** PJSUA2 API is inside pj namespace */
@@ -162 +163 @@
 //////////////////////////////////////////////////////////////////////////////
 
-struct UaConfig
+struct UaConfig : public PersistentObject
 {
     /**
@@ -265 +266 @@
      */
     pjsua_config toPj() const;
+
+    /**
+     * Read this object from a container.
+     *
+     * @param node              Container to write values from.
+     */
+    virtual void readObject(const ContainerNode &node) throw(Error);
+
+    /**
+     * Write this object to a container.
+     *
+     * @param node              Container to write values to.
+     */
+    virtual void writeObject(ContainerNode &node) const throw(Error);
+
 };
 
@@ -307 +323 @@
  * Lib::init().
  */
-struct LogConfig
+struct LogConfig : public PersistentObject
 {
     /** Log incoming and outgoing SIP message? Yes!  */
@@ -350 +366 @@
     /** Generate pjsua_logging_config. */
     pjsua_logging_config toPj() const;
+
+    /**
+     * Read this object from a container.
+     *
+     * @param node              Container to write values from.
+     */
+    virtual void readObject(const ContainerNode &node) throw(Error);
+
+    /**
+     * Write this object to a container.
+     *
+     * @param node              Container to write values to.
+     */
+    virtual void writeObject(ContainerNode &node) const throw(Error);
 };
 
@@ -357 +387 @@
  * when calling Lib::init().
  */
-struct MediaConfig
+struct MediaConfig : public PersistentObject
 {
 public:
@@ -555 +585 @@
     /** Export */
     pjsua_media_config toPj() const;
+
+    /**
+     * Read this object from a container.
+     *
+     * @param node              Container to write values from.
+     */
+    virtual void readObject(const ContainerNode &node) throw(Error);
+
+    /**
+     * Write this object to a container.
+     *
+     * @param node              Container to write values to.
+     */
+    virtual void writeObject(ContainerNode &node) const throw(Error);
 };
 
@@ -561 +605 @@
  * Endpoint configuration
  */
-struct EpConfig
+struct EpConfig : public PersistentObject
 {
     /** UA config */
@@ -571 +615 @@
     /** Media config */
     MediaConfig         medConfig;
+
+    /**
+     * Read this object from a container.
+     *
+     * @param node              Container to write values from.
+     */
+    virtual void readObject(const ContainerNode &node) throw(Error);
+
+    /**
+     * Write this object to a container.
+     *
+     * @param node              Container to write values to.
+     */
+    virtual void writeObject(ContainerNode &node) const throw(Error);
+
 };