release me!

diff --git a/src/AS_DCP.h b/src/AS_DCP.h
index cd411c247cd844bf8955970e6656ee31ce5518d4..dfeae4a095f696262a9e98540c66718c8c9acea8 100755 (executable)
--- a/src/AS_DCP.h
+++ b/src/AS_DCP.h
@@ -1,5 +1,5 @@
 /*
 /*

-Copyright (c) 2003-2010, John Hurst
+Copyright (c) 2003-2011, John Hurst

 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without


@@ -34,20 +34,20 @@ D-Cinema Technology Committee 21DC. The file format, labeled AS-DCP,
 is described in series of separate documents which include but may not
 be be limited to:
 
 is described in series of separate documents which include but may not
 be be limited to:
 

- o SMPTE 429-2-2009 DCP Operational Constraints
- o SMPTE 429-3-2006 Track File Specification
- o SMPTE 429-4-2006 JPEG 2000 for D-Cinema
- o SMPTE 429-5-2009 Timed Text Track File
- o SMPTE 429-6-2006 Essence Encryption Specification
- o SMPTE 429-10-2008 Stereoscopic Image Track File
- o SMPTE 330M - UMID
- o SMPTE 336M - KLV
- o SMPTE 377M - MXF
- o SMPTE 390M - OP-Atom
- o SMPTE 379M - Generic Container
- o SMPTE 381M - MPEG2 picture
- o SMPTE 422M - JPEG 2000 picture
- o SMPTE 382M - WAV/PCM sound
+ o SMPTE ST 429-2:2009 DCP Operational Constraints
+ o SMPTE ST 429-3:2006 Track File Specification
+ o SMPTE ST 429-4:2006 JPEG 2000 for D-Cinema
+ o SMPTE ST 429-5:2009 Timed Text Track File
+ o SMPTE ST 429-6:2006 Essence Encryption
+ o SMPTE ST 429-10:2008 Stereoscopic Image Track File
+ o SMPTE ST 330:2004 - UMID
+ o SMPTE ST 336:2001 - KLV
+ o SMPTE ST 377:2000 - MXF
+ o SMPTE ST 390:2004 - MXF OP-Atom
+ o SMPTE ST 379:2004 - MXF Generic Container (GC)
+ o SMPTE ST 381:2005 - MPEG2 picture in GC
+ o SMPTE ST 422:2006 - JPEG 2000 picture in GC
+ o SMPTE ST 382:2007 - WAV/PCM sound in GC

  o IETF RFC 2104 - HMAC/SHA1
  o NIST FIPS 197 - AES (Rijndael)
 
  o IETF RFC 2104 - HMAC/SHA1
  o NIST FIPS 197 - AES (Rijndael)
 


@@ -79,7 +79,7 @@ This project depends upon the following libraries:
  - OpenSSL http://www.openssl.org/
  - Expat http://expat.sourceforge.net/  or
      Xerces-C http://xerces.apache.org/xerces-c/
  - OpenSSL http://www.openssl.org/
  - Expat http://expat.sourceforge.net/  or
      Xerces-C http://xerces.apache.org/xerces-c/

-   An XML library is not needed if you don't need support for SMPTE 429-5-2009.
+   An XML library is not needed if you don't need support for SMPTE ST 429-5:2009.

 */
 
 #ifndef _AS_DCP_H_
 */
 
 #ifndef _AS_DCP_H_


@@ -261,19 +261,19 @@ namespace ASDCP {
   };
 
   // common edit rates, use these instead of hard coded constants
   };
 
   // common edit rates, use these instead of hard coded constants

-  const Rational EditRate_24(24,1);
-  const Rational EditRate_23_98(24000,1001); // Not a DCI-compliant value!
-  const Rational EditRate_48(48,1);
-  const Rational SampleRate_48k(48000,1);
-  const Rational SampleRate_96k(96000,1);
+  const Rational EditRate_24 = Rational(24,1);
+  const Rational EditRate_23_98 = Rational(24000,1001); // Not a DCI-compliant value!
+  const Rational EditRate_48 = Rational(48,1);
+  const Rational SampleRate_48k = Rational(48000,1);
+  const Rational SampleRate_96k = Rational(96000,1);

 
 

-  // Additional frame rates, see ST 428-11
+  // Additional frame rates, see ST 428-11, ST 429-13

   // These rates are new and not supported by all systems. Do not assume that
   // These rates are new and not supported by all systems. Do not assume that

-  // a package made using on of these rates will work just anywhere!
-  const Rational EditRate_25(25,1);
-  const Rational EditRate_30(30,1);
-  const Rational EditRate_50(50,1);
-  const Rational EditRate_60(60,1);
+  // a package made using one of these rates will work just anywhere!
+  const Rational EditRate_25 = Rational(25,1);
+  const Rational EditRate_30 = Rational(30,1);
+  const Rational EditRate_50 = Rational(50,1);
+  const Rational EditRate_60 = Rational(60,1);

 
   // Non-reference counting container for internal member objects.
   // Please do not use this class for any other purpose.
 
   // Non-reference counting container for internal member objects.
   // Please do not use this class for any other purpose.

diff --git a/src/AS_DCP_PCM.cpp b/src/AS_DCP_PCM.cpp
index f93815bad1a6a89013173e6f566f0d9cb4c2e0ed..1f4e004aad5631020959a545fb6db3e1c90bbad5 100755 (executable)
--- a/src/AS_DCP_PCM.cpp
+++ b/src/AS_DCP_PCM.cpp
@@ -1,5 +1,5 @@
 /*
 /*

-Copyright (c) 2004-2010, John Hurst
+Copyright (c) 2004-2011, John Hurst

 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/src/KLV.h b/src/KLV.h
index 1b378f0da13cd8215ed1dd31d32c1076146e878f..edc8f9d1b7af2d380f74e747f3b2f6e8a52a1657 100755 (executable)
--- a/src/KLV.h
+++ b/src/KLV.h
@@ -1,5 +1,5 @@
 /*
 /*

-Copyright (c) 2005-2009, John Hurst
+Copyright (c) 2005-2011, John Hurst

 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/src/KM_error.h b/src/KM_error.h
index 3a3880395c1c881977a5bfaa543a0f1284169150..c0305e88db1f839d1493ee38f0f59a3d42100de2 100755 (executable)
--- a/src/KM_error.h
+++ b/src/KM_error.h
@@ -1,5 +1,5 @@
 /*
 /*

-Copyright (c) 2004-2010, John Hurst
+Copyright (c) 2004-2011, John Hurst

 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without


@@ -34,7 +34,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef _KM_ERROR_H_
 #define _KM_ERROR_H_
 
 #ifndef _KM_ERROR_H_
 #define _KM_ERROR_H_
 

-#define KM_DECLARE_RESULT(sym, i, l) const Result_t RESULT_##sym(i, #sym, l);
+#define KM_DECLARE_RESULT(sym, i, l) const Result_t RESULT_##sym = Result_t(i, #sym, l);

 
 namespace Kumu
 {
 
 namespace Kumu
 {

diff --git a/src/MDD.cpp b/src/MDD.cpp
index e8e5b7df50f75add89410792cea04cb817be91e3..d0f96ed17d6c7ad085d0fa5b67f9266e3da8cd21 100644 (file)
--- a/src/MDD.cpp
+++ b/src/MDD.cpp
@@ -1,5 +1,5 @@
 /*
 /*

-Copyright (c) 2006-2010, John Hurst
+Copyright (c) 2006-2011, John Hurst

 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/src/MXFTypes.cpp b/src/MXFTypes.cpp
index a76957fe5f3d5e0b7d23044e70e2eda2358d9d46..a1b0f8b12fdd8f3bc0dd76d8975faaf95205c195 100755 (executable)
--- a/src/MXFTypes.cpp
+++ b/src/MXFTypes.cpp
@@ -1,5 +1,5 @@
 /*
 /*

-Copyright (c) 2005-2009, John Hurst
+Copyright (c) 2005-2011, John Hurst

 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/src/Makefile.am b/src/Makefile.am
index c8f18e7992666d80b243f6652bc7b21dce0fb634..9e4c11edf7428c651e6478526122f9e2a1226cc4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am -- Process this file with automake to produce Makefile.in
 #
 # $Id$
 ## Makefile.am -- Process this file with automake to produce Makefile.in
 #
 # $Id$

-# Copyright (c) 2007-2009 John Hurst. All rights reserved.
+# Copyright (c) 2007-2011 John Hurst. All rights reserved.

 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions