[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11994: Revert AMF.h mess.
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11994: Revert AMF.h mess. |
|
Date: |
Mon, 08 Mar 2010 07:59:16 +0100 |
|
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 11994 [merge]
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Mon 2010-03-08 07:59:16 +0100
message:
Revert AMF.h mess.
modified:
backend/Makefile.am
gui/Makefile.am
libbase/AMF.h
libcore/Makefile.am
libcore/asobj/Makefile.am
libcore/asobj/flash.am
libcore/fill_style.cpp
libcore/parser/Makefile.am
libcore/vm/Machine.cpp
libcore/vm/Makefile.am
plugin/win32/Makefile.am
=== modified file 'backend/Makefile.am'
--- a/backend/Makefile.am 2010-02-24 16:57:23 +0000
+++ b/backend/Makefile.am 2010-03-08 06:29:39 +0000
@@ -32,8 +32,6 @@
AM_CPPFLAGS = -I.. \
-I$(srcdir) \
-I$(top_srcdir) \
- -I$(top_srcdir)/libamf \
- -I$(top_srcdir)/libnet \
-I$(top_srcdir)/libcore \
-I$(top_srcdir)/libcore/parser \
-I$(top_srcdir)/libcore/swf \
=== modified file 'gui/Makefile.am'
--- a/gui/Makefile.am 2010-02-17 05:40:22 +0000
+++ b/gui/Makefile.am 2010-03-08 06:29:39 +0000
@@ -44,7 +44,6 @@
noinst_LTLIBRARIES = #libgnashgui.la
AM_CPPFLAGS = \
-I../.. \
- -I$(top_srcdir)/libamf \
-I$(top_srcdir)/libnet \
-I$(top_srcdir)/libcore \
-I$(top_srcdir)/libcore/swf \
@@ -108,7 +107,6 @@
$(NULL)
GNASH_LIBS = \
- $(top_builddir)/libamf/libgnashamf.la \
$(top_builddir)/libnet/libgnashnet.la \
$(top_builddir)/libmedia/libgnashmedia.la \
$(top_builddir)/libcore/libgnashcore.la \
=== modified file 'libbase/AMF.h'
--- a/libbase/AMF.h 2010-03-07 22:12:59 +0000
+++ b/libbase/AMF.h 2010-03-08 06:29:39 +0000
@@ -31,6 +31,9 @@
namespace gnash {
class SimpleBuffer;
+}
+
+namespace gnash {
/// Functions and classes for handling AMF.
//
@@ -38,34 +41,27 @@
/// 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.
//
=== modified file 'libcore/Makefile.am'
--- a/libcore/Makefile.am 2010-02-26 03:34:11 +0000
+++ b/libcore/Makefile.am 2010-03-08 06:29:39 +0000
@@ -29,7 +29,6 @@
# Only enable if we're configured with --enable-mp3
AM_CPPFLAGS = \
-I$(top_srcdir)/libnet \
- -I$(top_srcdir)/libamf \
-I$(top_srcdir)/backend \
-I$(top_srcdir)/libcore/swf \
-I$(top_srcdir)/libcore/abc \
=== modified file 'libcore/asobj/Makefile.am'
--- a/libcore/asobj/Makefile.am 2010-02-08 20:38:34 +0000
+++ b/libcore/asobj/Makefile.am 2010-03-08 06:29:39 +0000
@@ -35,7 +35,6 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/libnet \
- -I$(top_srcdir)/libamf \
-I$(top_srcdir)/backend \
-I$(top_srcdir)/libcore \
-I$(top_srcdir)/libcore/swf \
@@ -44,7 +43,6 @@
-I$(top_srcdir)/libcore/vm \
-I$(top_srcdir)/libcore/asobj/flash \
-I$(top_srcdir)/libbase \
- -I$(top_srcdir)/libamf \
-I$(top_srcdir)/libltdl \
-I$(top_srcdir)/libmedia \
-I$(top_srcdir)/libsound \
@@ -122,7 +120,6 @@
endif
libgnashasobjs_la_LIBADD = \
- $(top_builddir)/libamf/libgnashamf.la \
$(top_builddir)/libnet/libgnashmedia.la \
$(top_builddir)/libnet/libgnashnet.la \
$(top_builddir)/libbase/libgnashbase.la
=== modified file 'libcore/asobj/flash.am'
--- a/libcore/asobj/flash.am 2010-01-01 17:48:26 +0000
+++ b/libcore/asobj/flash.am 2010-03-08 06:29:39 +0000
@@ -75,7 +75,6 @@
$(NULL)
# libgnashasobjs_la_LIBADD = \
-# $(top_builddir)/libamf/libgnashamf.la \
# $(top_builddir)/libnet/libgnashnet.la \
# $(top_builddir)/libbase/libgnashbase.la
=== modified file 'libcore/fill_style.cpp'
--- a/libcore/fill_style.cpp 2010-01-20 10:36:15 +0000
+++ b/libcore/fill_style.cpp 2010-03-08 06:34:21 +0000
@@ -28,6 +28,7 @@
#include "GnashNumeric.h"
#include "Renderer.h"
#include "RunResources.h"
+#include "GnashImage.h"
#include <cmath> // sqrt, floor
#include <iostream> // for output operator
=== modified file 'libcore/parser/Makefile.am'
--- a/libcore/parser/Makefile.am 2010-01-01 17:48:26 +0000
+++ b/libcore/parser/Makefile.am 2010-03-08 06:29:39 +0000
@@ -26,7 +26,6 @@
# rendering calls from the parser (see https://savannah.gnu.org/task/?5837)
#
AM_CPPFLAGS = \
- -I$(top_srcdir)/libnet \
-I$(top_srcdir)/backend \
-I$(top_srcdir)/libcore \
-I$(top_srcdir)/libcore/swf \
@@ -38,7 +37,6 @@
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/libmedia \
-I$(top_srcdir)/libsound \
- -I$(top_srcdir)/libamf \
-I$(top_srcdir)/libltdl \
$(GLIB_CFLAGS) \
$(PTHREAD_CFLAGS) \
=== modified file 'libcore/vm/Machine.cpp'
--- a/libcore/vm/Machine.cpp 2010-01-18 18:24:16 +0000
+++ b/libcore/vm/Machine.cpp 2010-03-08 06:22:18 +0000
@@ -381,6 +381,8 @@
// This automatically switches back again when we leave this scope.
AVM2Switcher avm2(_vm);
+ assert(mStream);
+
for (;;) {
std::size_t opStart = mStream->tellg();
=== modified file 'libcore/vm/Makefile.am'
--- a/libcore/vm/Makefile.am 2010-01-01 17:48:26 +0000
+++ b/libcore/vm/Makefile.am 2010-03-08 06:29:39 +0000
@@ -30,7 +30,6 @@
-I$(top_srcdir)/libcore/abc \
-I$(top_srcdir)/libcore/parser \
-I$(top_srcdir)/libbase \
- -I$(top_srcdir)/libamf \
-I$(top_srcdir)/libmedia \
-I$(top_srcdir)/libsound \
-I$(top_srcdir)/libltdl \
=== modified file 'plugin/win32/Makefile.am'
--- a/plugin/win32/Makefile.am 2010-01-01 17:48:26 +0000
+++ b/plugin/win32/Makefile.am 2010-03-08 06:29:39 +0000
@@ -42,7 +42,6 @@
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/libmedia/libgnashmedia.la \
$(top_builddir)/libsound/libgnashsound.la \
- $(top_builddir)/libamf/libgnashamf.la \
$(top_builddir)/backend/libgnashagg.la \
$(top_builddir)/libcore/libgnashcore.la \
$(top_builddir)/plugin/mozilla-sdk/np_entry.lo \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r11994: Revert AMF.h mess.,
Benjamin Wolsey <=