[scene] Fixed element name in XML Schema

[casparcg] / modules / psd / channel.h

diff --git a/modules/psd/channel.h b/modules/psd/channel.h
index 4f8fc97a35ce352c372e4ee5a5bef4363a5e7901..ae930adaae78ac8014517b15906fbac3b0b0bb73 100644 (file)
--- a/modules/psd/channel.h
+++ b/modules/psd/channel.h
@@ -19,39 +19,23 @@
 * Author: Niklas P Andersson, niklas.p.andersson@svt.se
 */
 
-#ifndef _PSDCHANNEL_H__
-#define _PSDCHANNEL_H__
-
 #pragma once
 
-#include "util\bigendian_file_input_stream.h"
+#include "util/bigendian_file_input_stream.h"
+
 #include <memory>
+#include <cstdint>
 
 namespace caspar { namespace psd {
 
-class Channel
+struct channel
 {
 public:
-       Channel(short id, unsigned long len) : id_(id), data_length_(len)
-       {}
-
-       short id() const
-       {
-               return id_;
-       }
-       unsigned long data_length() const
-       {
-               return data_length_;
-       }
+       channel(int id1, int len) : id(id1), data_length(len) {}
 
-private:
-       unsigned long data_length_;
-       short id_;
+       int id;
+       int data_length;
 };
 
-typedef std::shared_ptr<Channel> channel_ptr;
-
 }      //namespace psd
 }      //namespace caspar
-
-#endif //_PSDCHANNEL_H__
\ No newline at end of file