Uncommented support for [producer] layers in PSD producer.

[casparcg] / modules / psd / descriptor.h

diff --git a/modules/psd/descriptor.h b/modules/psd/descriptor.h
index fb2d0f4ca73265480af9316f5e087cd9aa6d2ed8..c48963787f99edb6f6f9e95b588053496aa713bb 100644 (file)
--- a/modules/psd/descriptor.h
+++ b/modules/psd/descriptor.h
@@ -21,39 +21,67 @@
 
 #pragma once
 
+#include "util/bigendian_file_input_stream.h"
+
+#include <boost/property_tree/ptree.hpp>
+
 #include <vector>
 #include <map>
 #include <string>
 #include <memory>
-#include "util\bigendian_file_input_stream.h"
 
 namespace caspar { namespace psd {
 
-       struct descriptor_item
-       {
-               unsigned long type;
+       //struct descriptor_item
+       //{
+       //      unsigned long type;
 
-               std::wstring enum_key;
-               std::wstring enum_val;
+       //      std::wstring enum_key;
+       //      std::wstring enum_val;
 
-               std::wstring text_text;
+       //      std::wstring text_text;
 
-               unsigned long long_value;
-               
-               std::vector<char> rawdata_data;
-       };
+       //      unsigned long long_value;
+       //      
+       //      std::vector<char> rawdata_data;
+       //};
 
 class descriptor
 {
-       typedef std::map<std::wstring, descriptor_item> items_map;
+       typedef boost::property_tree::wptree Ptree;
+       struct context
+       {
+               typedef std::shared_ptr<context> ptr_type;
+
+               Ptree root;
+               std::vector<Ptree *> stack;
+               std::wstring debug_name;
+
+               friend descriptor;
+               friend class scoped_holder;
+               class scoped_holder;
+
+               context(const std::wstring& debug_name)
+                       : debug_name(debug_name)
+               {
+               }
+       };
+       friend class context::scoped_holder;
+
+       descriptor(const descriptor&);
+       const descriptor& operator=(const descriptor&);
+       explicit descriptor(const std::wstring& key, context::ptr_type context);
 
 public:
-       bool populate(BEFileInputStream& stream);
-       const descriptor_item& get_item(const std::wstring& key) const;
-       bool has_item(const std::wstring& key) const;
+       descriptor(const std::wstring& debug_name);
+       ~descriptor();
+
+       void populate(bigendian_file_input_stream& stream);
+       Ptree& items() const { return context_->root; }
 private:
-       items_map items_;
+       void read_value(const std::wstring& key, bigendian_file_input_stream& stream);
+       context::ptr_type context_;
 };
 
 }      //namespace psd
-}      //namespace caspar
\ No newline at end of file
+}      //namespace caspar