[Gnash-commit] /srv/bzr/gnash/trunk r11990: Following element.h's typedfing of enums

[Markus Gothe]

------------------------------------------------------------
revno: 11990
committer: Markus Gothe <address@hidden>
branch nick: trunk
timestamp: Sun 2010-03-07 23:12:59 +0100
message:
  Following element.h's typedfing of enums
modified:
  libbase/AMF.h

=== modified file 'libbase/AMF.h'
--- a/libbase/AMF.h     2010-03-07 20:38:17 +0000
+++ b/libbase/AMF.h     2010-03-07 22:12:59 +0000
@@ -31,9 +31,6 @@
 
 namespace gnash {
     class SimpleBuffer;
-}
-
-namespace gnash {
 
 /// Functions and classes for handling AMF.
 //
@@ -41,27 +38,34 @@
 /// allowing them to be stored and transmitted. The AMF namespace provides
 /// both low-level and high-level conversion to and from AMF buffers.
 namespace AMF {
+     /// \enum Element::Type
+    ///                The following data types are defined within AMF0.
+    typedef enum {
+               NOTYPE            = -1,
+        NUMBER_AMF0       = 0x00,
+        BOOLEAN_AMF0      = 0x01,
+        STRING_AMF0       = 0x02,
+        OBJECT_AMF0       = 0x03,
+        MOVIECLIP_AMF0    = 0x04,
+        NULL_AMF0         = 0x05,
+        UNDEFINED_AMF0    = 0x06,
+        REFERENCE_AMF0    = 0x07,
+        ECMA_ARRAY_AMF0   = 0x08,
+        OBJECT_END_AMF0   = 0x09,
+        STRICT_ARRAY_AMF0 = 0x0a,
+        DATE_AMF0         = 0x0b,
+        LONG_STRING_AMF0  = 0x0c,
+        UNSUPPORTED_AMF0  = 0x0d,
+        RECORD_SET_AMF0   = 0x0e,
+        XML_OBJECT_AMF0   = 0x0f,
+        TYPED_OBJECT_AMF0 = 0x10,
+               AMF3_DATA         = 0x11,
+//     
+// these aren't part of the AMF spec, they're used internally
+               RTMP_HEADER       = 0x20
+//             FUNCTION                  = 0x12
+    } Type;
 
-enum Type {
-    NOTYPE            = -1,
-    NUMBER_AMF0       = 0x00,
-    BOOLEAN_AMF0      = 0x01,
-    STRING_AMF0       = 0x02,
-    OBJECT_AMF0       = 0x03,
-    MOVIECLIP_AMF0    = 0x04,
-    NULL_AMF0         = 0x05,
-    UNDEFINED_AMF0    = 0x06,
-    REFERENCE_AMF0    = 0x07,
-    ECMA_ARRAY_AMF0   = 0x08,
-    OBJECT_END_AMF0   = 0x09,
-    STRICT_ARRAY_AMF0 = 0x0a,
-    DATE_AMF0         = 0x0b,
-    LONG_STRING_AMF0  = 0x0c,
-    UNSUPPORTED_AMF0  = 0x0d,
-    RECORD_SET_AMF0   = 0x0e,
-    XML_OBJECT_AMF0   = 0x0f,
-    TYPED_OBJECT_AMF0 = 0x10
-};
 
 /// Exception for handling malformed buffers.
 //