[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-214-g93c3171 |
|
Date: |
Fri, 08 Apr 2011 12:52:19 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 93c31711dc5e88a307cb7b9c4c995fb717bc5dab (commit)
via 4b6d8ae427ae022ec99cde338c34d378cd6b80d2 (commit)
from a8a4b8193eb99010dd378bff0484840ba7243546 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=93c31711dc5e88a307cb7b9c4c995fb717bc5dab
commit 93c31711dc5e88a307cb7b9c4c995fb717bc5dab
Author: Benjamin Wolsey <address@hidden>
Date: Fri Apr 8 13:50:55 2011 +0200
Put intrusive functions in ref_counted.h
This saves including two headers to use ref_counteds. Remove the
now-useless smart_ptr.h.
diff --git a/cygnal/cvm.cpp b/cygnal/cvm.cpp
index efd2a9f..db19f89 100644
--- a/cygnal/cvm.cpp
+++ b/cygnal/cvm.cpp
@@ -52,7 +52,6 @@
#include "noseek_fd_adapter.h"
#include "ManualClock.h"
#include "StringPredicates.h"
-#include "smart_ptr.h"
#include "IOChannel.h" // for proper dtor call
#include "GnashSleep.h" // for usleep comptibility.
#include "MovieFactory.h"
diff --git a/gui/pythonmod/gnash-view.cpp b/gui/pythonmod/gnash-view.cpp
index 1908250..d6e7ddf 100644
--- a/gui/pythonmod/gnash-view.cpp
+++ b/gui/pythonmod/gnash-view.cpp
@@ -36,7 +36,6 @@
#include "RunResources.h" // for passing handlers and other data to the core.
#include "VirtualClock.h"
#include "SystemClock.h"
-#include "smart_ptr.h"
#include "DisplayObject.h"
#include "Global_as.h"
#include "NamingPolicy.h"
diff --git a/gui/qt/Qt4Gui.cpp b/gui/qt/Qt4Gui.cpp
index 94c0986..70c1d96 100644
--- a/gui/qt/Qt4Gui.cpp
+++ b/gui/qt/Qt4Gui.cpp
@@ -59,7 +59,6 @@
#include "Range2d.h"
-#include "smart_ptr.h"
#include "movie_definition.h"
#include "log.h"
diff --git a/libbase/Makefile.am b/libbase/Makefile.am
index 3893236..3748516 100644
--- a/libbase/Makefile.am
+++ b/libbase/Makefile.am
@@ -197,7 +197,6 @@ EXTENSIONS_API = \
StringPredicates.h \
Stats.h \
GnashEnums.h \
- smart_ptr.h \
string_table.h \
ref_counted.h \
GC.h \
diff --git a/libbase/ref_counted.h b/libbase/ref_counted.h
index 8cac89e..6fa2036 100644
--- a/libbase/ref_counted.h
+++ b/libbase/ref_counted.h
@@ -84,6 +84,18 @@ public:
long get_ref_count() const { return m_ref_count; }
};
+inline void
+intrusive_ptr_add_ref(const ref_counted* o)
+{
+ o->add_ref();
+}
+
+inline void
+intrusive_ptr_release(const ref_counted* o)
+{
+ o->drop_ref();
+}
+
} // namespace gnash
#endif // GNASH_REF_COUNTED_H
diff --git a/libbase/smart_ptr.h b/libbase/smart_ptr.h
deleted file mode 100644
index ee07174..0000000
--- a/libbase/smart_ptr.h
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010,
-// 2011 Free Software Foundation, Inc
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-// Smart (ref-counting) pointer classes. Uses "intrusive" approach:
-// the types pointed to must have add_ref() and drop_ref() methods.
-// Typically this is done by inheriting from a ref_counted class,
-// although the nice thing about templates is that no particular
-// ref-counted class is mandated.
-
-
-#ifndef SMART_PTR_H
-#define SMART_PTR_H
-
-#include "ref_counted.h"
-
-// TODO: drop all users of this macro, we _are_ using GC now
-#define GNASH_USE_GC 1
-
-namespace gnash {
- class GcResource;
-}
-
-
-namespace gnash {
-
-inline void
-intrusive_ptr_add_ref(const ref_counted* o)
-{
- o->add_ref();
-}
-
-inline void
-intrusive_ptr_release(const ref_counted* o)
-{
- o->drop_ref();
-}
-
-} // namespace boost||gnash
-
-
-#endif // SMART_PTR_H
-
-
-// Local Variables:
-// mode: C++
-// c-basic-offset: 8
-// tab-width: 8
-// indent-tabs-mode: t
-// End:
diff --git a/libcore/Button.cpp b/libcore/Button.cpp
index 30c1d31..92435bb 100644
--- a/libcore/Button.cpp
+++ b/libcore/Button.cpp
@@ -27,7 +27,6 @@
#include <boost/bind.hpp>
#include <utility>
-#include "smart_ptr.h"
#include "DefineButtonTag.h"
#include "as_value.h"
#include "Button.h"
diff --git a/libcore/Button.h b/libcore/Button.h
index 292e8df..20b6ea7 100644
--- a/libcore/Button.h
+++ b/libcore/Button.h
@@ -23,7 +23,6 @@
#ifndef GNASH_BUTTON_H
#define GNASH_BUTTON_H
-#include "smart_ptr.h"
#include "InteractiveObject.h" // for inheritance
#include <boost/intrusive_ptr.hpp>
diff --git a/libcore/CharacterProxy.cpp b/libcore/CharacterProxy.cpp
index e777c96..88f8976 100644
--- a/libcore/CharacterProxy.cpp
+++ b/libcore/CharacterProxy.cpp
@@ -23,7 +23,6 @@
#include "DisplayObject.h"
#include "VM.h"
#include "movie_root.h"
-#include "smart_ptr.h"
#include <string>
diff --git a/libcore/DisplayList.cpp b/libcore/DisplayList.cpp
index c9c4536..9936f97 100644
--- a/libcore/DisplayList.cpp
+++ b/libcore/DisplayList.cpp
@@ -28,7 +28,6 @@
#include <boost/bind.hpp>
#include <boost/format.hpp>
-#include "smart_ptr.h"
#include "log.h"
#include "Renderer.h"
#include "StringPredicates.h"
diff --git a/libcore/DisplayObject.cpp b/libcore/DisplayObject.cpp
index d4b3764..736691a 100644
--- a/libcore/DisplayObject.cpp
+++ b/libcore/DisplayObject.cpp
@@ -30,7 +30,6 @@
#include <boost/assign/list_of.hpp>
#include <boost/bind.hpp>
-#include "smart_ptr.h"
#include "movie_root.h"
#include "MovieClip.h"
#include "VM.h"
diff --git a/libcore/DynamicShape.cpp b/libcore/DynamicShape.cpp
index 99e64fd..4324120 100644
--- a/libcore/DynamicShape.cpp
+++ b/libcore/DynamicShape.cpp
@@ -15,7 +15,6 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#include "smart_ptr.h"
#include "DynamicShape.h"
#include "FillStyle.h"
#include "Renderer.h"
diff --git a/libcore/ExternalInterface.cpp b/libcore/ExternalInterface.cpp
index 57b2d00..0a8d55f 100644
--- a/libcore/ExternalInterface.cpp
+++ b/libcore/ExternalInterface.cpp
@@ -34,7 +34,6 @@
#include "StringPredicates.h"
#include "fn_call.h"
#include "Global_as.h"
-#include "smart_ptr.h" // for boost intrusive_ptr
#include "VM.h"
#include "rc.h"
#include "as_value.h"
diff --git a/libcore/FillStyle.cpp b/libcore/FillStyle.cpp
index 99e0202..62f84b0 100644
--- a/libcore/FillStyle.cpp
+++ b/libcore/FillStyle.cpp
@@ -22,7 +22,6 @@
#include <ostream>
#include <boost/variant.hpp>
-#include "smart_ptr.h"
#include "CachedBitmap.h"
#include "movie_definition.h"
#include "SWF.h"
diff --git a/libcore/Font.cpp b/libcore/Font.cpp
index 431d090..eb1d2b0 100644
--- a/libcore/Font.cpp
+++ b/libcore/Font.cpp
@@ -26,7 +26,6 @@
#include <utility>
#include <memory>
-#include "smart_ptr.h"
#include "log.h"
#include "ShapeRecord.h"
#include "DefineFontTag.h"
diff --git a/libcore/FreetypeGlyphsProvider.cpp
b/libcore/FreetypeGlyphsProvider.cpp
index effb094..babf8e8 100644
--- a/libcore/FreetypeGlyphsProvider.cpp
+++ b/libcore/FreetypeGlyphsProvider.cpp
@@ -28,7 +28,6 @@
#include <boost/cstdint.hpp>
#include <boost/format.hpp>
-#include "smart_ptr.h" // for intrusive_ptr
#include "GnashException.h"
#include "ShapeRecord.h"
#include "log.h"
diff --git a/libcore/LineStyle.cpp b/libcore/LineStyle.cpp
index 837d0bc..3b68f14 100644
--- a/libcore/LineStyle.cpp
+++ b/libcore/LineStyle.cpp
@@ -26,7 +26,6 @@
#include "RunResources.h"
#include "log.h"
#include "SWFStream.h"
-#include "smart_ptr.h"
#include "movie_definition.h"
#include "SWF.h"
#include "GnashException.h"
diff --git a/libcore/MorphShape.h b/libcore/MorphShape.h
index 577b62f..0c8abc6 100644
--- a/libcore/MorphShape.h
+++ b/libcore/MorphShape.h
@@ -20,7 +20,6 @@
#ifndef GNASH_MORPH_SHAPE_H
#define GNASH_MORPH_SHAPE_H
-#include "smart_ptr.h"
#include "DisplayObject.h"
#include "swf/DefineMorphShapeTag.h"
#include <boost/intrusive_ptr.hpp>
diff --git a/libcore/MovieClip.cpp b/libcore/MovieClip.cpp
index 51a8dea..fe047e0 100644
--- a/libcore/MovieClip.cpp
+++ b/libcore/MovieClip.cpp
@@ -42,7 +42,6 @@
#include "swf_event.h"
#include "sprite_definition.h"
#include "ActionExec.h"
-#include "smart_ptr.h"
#include "VM.h"
#include "Range2d.h" // for getBounds
#include "GnashException.h"
diff --git a/libcore/MovieFactory.cpp b/libcore/MovieFactory.cpp
index f4c6e1b..16db8c0 100644
--- a/libcore/MovieFactory.cpp
+++ b/libcore/MovieFactory.cpp
@@ -26,7 +26,6 @@
#include "GnashEnums.h"
#include "GnashImage.h"
-#include "smart_ptr.h"
#include "IOChannel.h"
#include "utility.h"
#include "log.h"
diff --git a/libcore/MovieLoader.h b/libcore/MovieLoader.h
index c8f54f3..a830769 100644
--- a/libcore/MovieLoader.h
+++ b/libcore/MovieLoader.h
@@ -30,7 +30,6 @@
#include "URL.h"
#include "MovieClip.h"
-#include "smart_ptr.h"
// Forward declarations
namespace gnash {
diff --git a/libcore/Relay.cpp b/libcore/Relay.cpp
index 804a582..e38e0a0 100644
--- a/libcore/Relay.cpp
+++ b/libcore/Relay.cpp
@@ -19,7 +19,6 @@
#include "movie_root.h"
#include "as_object.h"
#include "Relay.h"
-#include "smart_ptr.h"
namespace gnash {
diff --git a/libcore/Shape.cpp b/libcore/Shape.cpp
index 5204edd..f756066 100644
--- a/libcore/Shape.cpp
+++ b/libcore/Shape.cpp
@@ -18,7 +18,6 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#include "smart_ptr.h"
#include "Shape.h"
#include "Transform.h"
diff --git a/libcore/StaticText.h b/libcore/StaticText.h
index 49f1c66..55691fd 100644
--- a/libcore/StaticText.h
+++ b/libcore/StaticText.h
@@ -20,7 +20,6 @@
#ifndef GNASH_STATIC_TEXT_H
#define GNASH_STATIC_TEXT_H
-#include "smart_ptr.h"
#include "DisplayObject.h" // for inheritance
#include "swf/DefineTextTag.h"
diff --git a/libcore/Video.cpp b/libcore/Video.cpp
index 2314239..0872a9f 100644
--- a/libcore/Video.cpp
+++ b/libcore/Video.cpp
@@ -32,7 +32,6 @@
#include "Renderer.h"
#include "RunResources.h"
#include "Transform.h"
-#include "smart_ptr.h"
// Define this to get debug logging during embedded video decoding
//#define DEBUG_EMBEDDED_VIDEO_DECODING
diff --git a/libcore/as_environment.cpp b/libcore/as_environment.cpp
index 6a0eccc..526bb9f 100644
--- a/libcore/as_environment.cpp
+++ b/libcore/as_environment.cpp
@@ -25,7 +25,6 @@
#include <boost/algorithm/string/case_conv.hpp>
#include <boost/format.hpp>
-#include "smart_ptr.h"
#include "MovieClip.h"
#include "movie_root.h"
#include "as_value.h"
diff --git a/libcore/as_function.cpp b/libcore/as_function.cpp
index ce0fec0..3e6437a 100644
--- a/libcore/as_function.cpp
+++ b/libcore/as_function.cpp
@@ -22,7 +22,6 @@
#include <string>
-#include "smart_ptr.h"
#include "log.h"
#include "as_value.h"
#include "fn_call.h"
diff --git a/libcore/as_object.cpp b/libcore/as_object.cpp
index 45b8c62..2eeaea7 100644
--- a/libcore/as_object.cpp
+++ b/libcore/as_object.cpp
@@ -26,7 +26,6 @@
#include "RunResources.h"
#include "log.h"
-#include "smart_ptr.h"
#include "as_function.h"
#include "as_environment.h"
#include "movie_root.h"
diff --git a/libcore/as_value.cpp b/libcore/as_value.cpp
index 5d5f3bc..e7aa254 100644
--- a/libcore/as_value.cpp
+++ b/libcore/as_value.cpp
@@ -18,7 +18,6 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#include "smart_ptr.h"
#include "as_value.h"
#include "as_object.h"
#include "as_function.h" // for as_function
diff --git a/libcore/asobj/Accessibility_as.cpp
b/libcore/asobj/Accessibility_as.cpp
index bb10b53..98fda00 100644
--- a/libcore/asobj/Accessibility_as.cpp
+++ b/libcore/asobj/Accessibility_as.cpp
@@ -23,7 +23,6 @@
#include "log.h"
#include "fn_call.h"
#include "Global_as.h"
-#include "smart_ptr.h" // for boost intrusive_ptr
#include "NativeFunction.h"
namespace gnash {
diff --git a/libcore/asobj/Array_as.cpp b/libcore/asobj/Array_as.cpp
index 55351be..4371568 100644
--- a/libcore/asobj/Array_as.cpp
+++ b/libcore/asobj/Array_as.cpp
@@ -26,7 +26,6 @@
#include <boost/algorithm/string/case_conv.hpp>
#include <boost/lexical_cast.hpp>
-#include "smart_ptr.h"
#include "as_value.h"
#include "log.h"
#include "NativeFunction.h"
diff --git a/libcore/asobj/Boolean_as.cpp b/libcore/asobj/Boolean_as.cpp
index a8be10e..42cb56b 100644
--- a/libcore/asobj/Boolean_as.cpp
+++ b/libcore/asobj/Boolean_as.cpp
@@ -23,7 +23,6 @@
#include "log.h"
#include "fn_call.h"
#include "Global_as.h"
-#include "smart_ptr.h" // for boost intrusive_ptr
#include "NativeFunction.h"
#include "GnashException.h"
#include "VM.h"
diff --git a/libcore/asobj/Camera_as.cpp b/libcore/asobj/Camera_as.cpp
index 7852a11..8ea8b1d 100644
--- a/libcore/asobj/Camera_as.cpp
+++ b/libcore/asobj/Camera_as.cpp
@@ -27,7 +27,6 @@
#include "log.h"
#include "fn_call.h"
#include "Global_as.h"
-#include "smart_ptr.h"
#include "NativeFunction.h"
#include "MediaHandler.h"
#include "VideoInput.h"
diff --git a/libcore/asobj/Color_as.cpp b/libcore/asobj/Color_as.cpp
index 63b036b..b4ad8bf 100644
--- a/libcore/asobj/Color_as.cpp
+++ b/libcore/asobj/Color_as.cpp
@@ -26,7 +26,6 @@
#include "log.h"
#include "fn_call.h"
#include "Global_as.h"
-#include "smart_ptr.h" // for boost intrusive_ptr
#include "NativeFunction.h"
#include "SWFCxForm.h" // for composition
#include "VM.h"
diff --git a/libcore/asobj/ContextMenu_as.cpp b/libcore/asobj/ContextMenu_as.cpp
index 2656bbf..bfe7c26 100644
--- a/libcore/asobj/ContextMenu_as.cpp
+++ b/libcore/asobj/ContextMenu_as.cpp
@@ -24,7 +24,6 @@
#include "log.h"
#include "fn_call.h"
#include "Global_as.h"
-#include "smart_ptr.h"
#include "namedStrings.h"
#include "Array_as.h"
diff --git a/libcore/asobj/Key_as.cpp b/libcore/asobj/Key_as.cpp
index 0a2b2d7..219bf83 100644
--- a/libcore/asobj/Key_as.cpp
+++ b/libcore/asobj/Key_as.cpp
@@ -18,7 +18,6 @@
//
-#include "smart_ptr.h"
#include "Key_as.h"
#include "log.h"
#include "fn_call.h"
diff --git a/libcore/asobj/LoadVars_as.cpp b/libcore/asobj/LoadVars_as.cpp
index f106d40..2d1d7dc 100644
--- a/libcore/asobj/LoadVars_as.cpp
+++ b/libcore/asobj/LoadVars_as.cpp
@@ -24,7 +24,6 @@
#include "log.h"
#include "fn_call.h"
#include "Global_as.h"
-#include "smart_ptr.h"
#include "NativeFunction.h" // need builtin_function
#include "as_function.h" // for calling event handlers
#include "as_value.h" // for setting up a fn_call
diff --git a/libcore/asobj/Microphone_as.cpp b/libcore/asobj/Microphone_as.cpp
index 141dc63..b5a29cf 100644
--- a/libcore/asobj/Microphone_as.cpp
+++ b/libcore/asobj/Microphone_as.cpp
@@ -28,7 +28,6 @@
#include "log.h"
#include "fn_call.h"
#include "Global_as.h"
-#include "smart_ptr.h" // for boost intrusive_ptr
#include "NativeFunction.h"
#include "Object.h"
#include "GnashNumeric.h"
diff --git a/libcore/asobj/Mouse_as.cpp b/libcore/asobj/Mouse_as.cpp
index 406b8f6..c14d288 100644
--- a/libcore/asobj/Mouse_as.cpp
+++ b/libcore/asobj/Mouse_as.cpp
@@ -24,7 +24,6 @@
#include "log.h"
#include "fn_call.h"
#include "Global_as.h"
-#include "smart_ptr.h" // for boost intrusive_ptr
#include "NativeFunction.h"
#include "VM.h" // for registerNative
#include "AsBroadcaster.h" // for initializing self as a broadcaster
diff --git a/libcore/asobj/MovieClipLoader.cpp
b/libcore/asobj/MovieClipLoader.cpp
index f4e717d..49067bc 100644
--- a/libcore/asobj/MovieClipLoader.cpp
+++ b/libcore/asobj/MovieClipLoader.cpp
@@ -22,7 +22,6 @@
#include <string>
-#include "smart_ptr.h"
#include "as_value.h"
#include "as_object.h" // for inheritance
#include "movie_root.h"
diff --git a/libcore/asobj/MovieClip_as.cpp b/libcore/asobj/MovieClip_as.cpp
index 5aa6244..e2e2c35 100644
--- a/libcore/asobj/MovieClip_as.cpp
+++ b/libcore/asobj/MovieClip_as.cpp
@@ -31,7 +31,6 @@
#include "log.h"
#include "fn_call.h"
#include "Global_as.h"
-#include "smart_ptr.h"
#include "NativeFunction.h"
#include "Bitmap.h"
#include "Array_as.h"
diff --git a/libcore/asobj/NetStream_as.cpp b/libcore/asobj/NetStream_as.cpp
index 615b37d..1599ce1 100644
--- a/libcore/asobj/NetStream_as.cpp
+++ b/libcore/asobj/NetStream_as.cpp
@@ -27,7 +27,6 @@
#include "RunResources.h"
#include "CharacterProxy.h"
-#include "smart_ptr.h"
#include "log.h"
#include "fn_call.h"
#include "Global_as.h"
diff --git a/libcore/asobj/Number_as.cpp b/libcore/asobj/Number_as.cpp
index e286e60..ef768d2 100644
--- a/libcore/asobj/Number_as.cpp
+++ b/libcore/asobj/Number_as.cpp
@@ -21,7 +21,6 @@
#include "log.h"
#include "Number_as.h"
-#include "smart_ptr.h"
#include "fn_call.h"
#include "Global_as.h"
#include "as_object.h" // for inheritance
diff --git a/libcore/asobj/Object.cpp b/libcore/asobj/Object.cpp
index d8df268..89c8dd8 100644
--- a/libcore/asobj/Object.cpp
+++ b/libcore/asobj/Object.cpp
@@ -20,7 +20,6 @@
#include "Movie.h"
#include "DisplayObject.h"
-#include "smart_ptr.h"
#include "fn_call.h"
#include "as_object.h" // for inheritance
#include "NativeFunction.h"
diff --git a/libcore/asobj/Selection_as.cpp b/libcore/asobj/Selection_as.cpp
index 1261876..875b548 100644
--- a/libcore/asobj/Selection_as.cpp
+++ b/libcore/asobj/Selection_as.cpp
@@ -24,7 +24,6 @@
#include "log.h"
#include "fn_call.h"
#include "Global_as.h"
-#include "smart_ptr.h" // for boost intrusive_ptr
#include "NativeFunction.h"
#include "AsBroadcaster.h"
#include "TextField.h"
diff --git a/libcore/asobj/SharedObject_as.cpp
b/libcore/asobj/SharedObject_as.cpp
index 9238940..4a6b58a 100644
--- a/libcore/asobj/SharedObject_as.cpp
+++ b/libcore/asobj/SharedObject_as.cpp
@@ -28,7 +28,6 @@
#include <boost/shared_ptr.hpp>
#include <cstdio>
-#include "smart_ptr.h"
#include "movie_root.h"
#include "GnashSystemNetHeaders.h"
#include "GnashFileUtilities.h" // stat
diff --git a/libcore/asobj/Sound_as.cpp b/libcore/asobj/Sound_as.cpp
index 4efb51b..a70f62f 100644
--- a/libcore/asobj/Sound_as.cpp
+++ b/libcore/asobj/Sound_as.cpp
@@ -37,7 +37,6 @@
#include "Global_as.h"
#include "GnashException.h" // for ActionException
#include "NativeFunction.h" // need builtin_function
-#include "smart_ptr.h" // for boost intrusive_ptr
#include "VM.h"
#include "namedStrings.h"
#include "StreamProvider.h"
diff --git a/libcore/asobj/Stage_as.cpp b/libcore/asobj/Stage_as.cpp
index 4dcf6f7..30c64ed 100644
--- a/libcore/asobj/Stage_as.cpp
+++ b/libcore/asobj/Stage_as.cpp
@@ -24,7 +24,6 @@
#include "log.h"
#include "fn_call.h"
#include "Global_as.h"
-#include "smart_ptr.h" // for boost intrusive_ptr
#include "NativeFunction.h" // for ActionException
#include "VM.h"
#include "AsBroadcaster.h" // for initializing self as a broadcaster
diff --git a/libcore/asobj/String_as.cpp b/libcore/asobj/String_as.cpp
index 00fec14..5299c2e 100644
--- a/libcore/asobj/String_as.cpp
+++ b/libcore/asobj/String_as.cpp
@@ -25,7 +25,6 @@
#include <stdexcept>
#include "SWFCtype.h"
-#include "smart_ptr.h"
#include "fn_call.h"
#include "Global_as.h"
#include "as_object.h"
diff --git a/libcore/asobj/System_as.cpp b/libcore/asobj/System_as.cpp
index 04d073a..56a7ec3 100644
--- a/libcore/asobj/System_as.cpp
+++ b/libcore/asobj/System_as.cpp
@@ -28,7 +28,6 @@
#include "movie_root.h" // interface callback
#include "log.h"
#include "fn_call.h"
-#include "smart_ptr.h" // for boost intrusive_ptr
#include "Global_as.h"
#include "NativeFunction.h"
#include "VM.h" // for getPlayerVersion()
diff --git a/libcore/asobj/TextField_as.cpp b/libcore/asobj/TextField_as.cpp
index c5b1997..25ffdba 100644
--- a/libcore/asobj/TextField_as.cpp
+++ b/libcore/asobj/TextField_as.cpp
@@ -24,7 +24,6 @@
#include "log.h"
#include "fn_call.h"
#include "Global_as.h"
-#include "smart_ptr.h" // for boost intrusive_ptr
#include "AsBroadcaster.h" // for initializing self as a broadcaster
#include "TextFormat_as.h"
#include "MovieClip.h"
diff --git a/libcore/asobj/TextFormat_as.cpp b/libcore/asobj/TextFormat_as.cpp
index 760aee6..fa8d844 100644
--- a/libcore/asobj/TextFormat_as.cpp
+++ b/libcore/asobj/TextFormat_as.cpp
@@ -30,7 +30,6 @@
#include "VM.h"
#include "RGBA.h"
#include "StringPredicates.h"
-#include "smart_ptr.h"
#include "GnashNumeric.h"
#include "Array_as.h"
#include "fontlib.h"
diff --git a/libcore/asobj/TextSnapshot_as.cpp
b/libcore/asobj/TextSnapshot_as.cpp
index 0d1b9a7..f3957a4 100644
--- a/libcore/asobj/TextSnapshot_as.cpp
+++ b/libcore/asobj/TextSnapshot_as.cpp
@@ -28,7 +28,6 @@
#include "log.h"
#include "fn_call.h"
#include "Global_as.h"
-#include "smart_ptr.h" // for boost intrusive_ptr
#include "NativeFunction.h"
#include "StaticText.h"
#include "DisplayList.h"
diff --git a/libcore/asobj/XMLNode_as.cpp b/libcore/asobj/XMLNode_as.cpp
index 32a90f1..b821c7b 100644
--- a/libcore/asobj/XMLNode_as.cpp
+++ b/libcore/asobj/XMLNode_as.cpp
@@ -30,7 +30,6 @@
#include "log.h"
#include "fn_call.h"
#include "Global_as.h"
-#include "smart_ptr.h" // for boost intrusive_ptr
#include "NativeFunction.h"
#include "PropertyList.h"
#include "Global_as.h"
diff --git a/libcore/asobj/XML_as.cpp b/libcore/asobj/XML_as.cpp
index 58cc767..c43948a 100644
--- a/libcore/asobj/XML_as.cpp
+++ b/libcore/asobj/XML_as.cpp
@@ -30,7 +30,6 @@
#include "VM.h"
#include "namedStrings.h"
#include "StringPredicates.h"
-#include "smart_ptr.h" // for boost intrusive_ptr
#include "GnashException.h" // for ActionException
#include "Object.h"
diff --git a/libcore/asobj/flash/display/BitmapData_as.cpp
b/libcore/asobj/flash/display/BitmapData_as.cpp
index 1bdc8d3..d3dd6f0 100644
--- a/libcore/asobj/flash/display/BitmapData_as.cpp
+++ b/libcore/asobj/flash/display/BitmapData_as.cpp
@@ -35,7 +35,6 @@
#include "log.h"
#include "fn_call.h"
#include "Global_as.h"
-#include "smart_ptr.h"
#include "GnashException.h"
#include "VM.h"
#include "Renderer.h"
diff --git a/libcore/asobj/flash/display/BitmapData_as.h
b/libcore/asobj/flash/display/BitmapData_as.h
index 97c4327..364d146 100644
--- a/libcore/asobj/flash/display/BitmapData_as.h
+++ b/libcore/asobj/flash/display/BitmapData_as.h
@@ -25,7 +25,6 @@
#include <boost/cstdint.hpp>
#include <boost/scoped_ptr.hpp>
#include <cassert>
-#include "smart_ptr.h"
#include <boost/intrusive_ptr.hpp>
#include <memory>
diff --git a/libcore/asobj/flash/external/ExternalInterface_as.cpp
b/libcore/asobj/flash/external/ExternalInterface_as.cpp
index 32d02e5..7ca5dd5 100644
--- a/libcore/asobj/flash/external/ExternalInterface_as.cpp
+++ b/libcore/asobj/flash/external/ExternalInterface_as.cpp
@@ -33,7 +33,6 @@
#include "as_object.h" // for inheritance
#include "fn_call.h"
#include "Global_as.h"
-#include "smart_ptr.h" // for boost intrusive_ptr
#include "GnashException.h" // for ActionException
#include "VM.h"
#include "rc.h"
diff --git a/libcore/asobj/flash/filters/ColorMatrixFilter_as.cpp
b/libcore/asobj/flash/filters/ColorMatrixFilter_as.cpp
index 844ee55..cfed5f5 100644
--- a/libcore/asobj/flash/filters/ColorMatrixFilter_as.cpp
+++ b/libcore/asobj/flash/filters/ColorMatrixFilter_as.cpp
@@ -24,7 +24,6 @@
#include "Global_as.h"
#include "BitmapFilter_as.h"
#include "Filters.h"
-#include "smart_ptr.h"
namespace gnash {
diff --git a/libcore/asobj/flash/filters/ConvolutionFilter_as.cpp
b/libcore/asobj/flash/filters/ConvolutionFilter_as.cpp
index a71a677..a818cd2 100644
--- a/libcore/asobj/flash/filters/ConvolutionFilter_as.cpp
+++ b/libcore/asobj/flash/filters/ConvolutionFilter_as.cpp
@@ -24,7 +24,6 @@
#include "Global_as.h"
#include "BitmapFilter_as.h"
#include "Filters.h"
-#include "smart_ptr.h"
namespace gnash {
diff --git a/libcore/asobj/flash/filters/DisplacementMapFilter_as.cpp
b/libcore/asobj/flash/filters/DisplacementMapFilter_as.cpp
index e9d8adb..11a94dd 100644
--- a/libcore/asobj/flash/filters/DisplacementMapFilter_as.cpp
+++ b/libcore/asobj/flash/filters/DisplacementMapFilter_as.cpp
@@ -31,7 +31,6 @@
#include "Global_as.h"
#include "BitmapFilter_as.h"
#include "Filters.h"
-#include "smart_ptr.h"
namespace gnash {
diff --git a/libcore/asobj/flash/filters/DropShadowFilter_as.cpp
b/libcore/asobj/flash/filters/DropShadowFilter_as.cpp
index e79d073..f18e52e 100644
--- a/libcore/asobj/flash/filters/DropShadowFilter_as.cpp
+++ b/libcore/asobj/flash/filters/DropShadowFilter_as.cpp
@@ -24,7 +24,6 @@
#include "Global_as.h"
#include "BitmapFilter_as.h"
#include "Filters.h"
-#include "smart_ptr.h"
namespace gnash {
diff --git a/libcore/asobj/flash/filters/GlowFilter_as.cpp
b/libcore/asobj/flash/filters/GlowFilter_as.cpp
index a7abda2..e4551a3 100644
--- a/libcore/asobj/flash/filters/GlowFilter_as.cpp
+++ b/libcore/asobj/flash/filters/GlowFilter_as.cpp
@@ -24,7 +24,6 @@
#include "Global_as.h"
#include "BitmapFilter_as.h"
#include "Filters.h"
-#include "smart_ptr.h"
namespace gnash {
diff --git a/libcore/asobj/flash/filters/GradientBevelFilter_as.cpp
b/libcore/asobj/flash/filters/GradientBevelFilter_as.cpp
index 33197f4..7fe3f1e 100644
--- a/libcore/asobj/flash/filters/GradientBevelFilter_as.cpp
+++ b/libcore/asobj/flash/filters/GradientBevelFilter_as.cpp
@@ -24,7 +24,6 @@
#include "Global_as.h"
#include "BitmapFilter_as.h"
#include "Filters.h"
-#include "smart_ptr.h"
namespace gnash {
diff --git a/libcore/asobj/flash/filters/GradientGlowFilter_as.cpp
b/libcore/asobj/flash/filters/GradientGlowFilter_as.cpp
index e68fbcc..c928d31 100644
--- a/libcore/asobj/flash/filters/GradientGlowFilter_as.cpp
+++ b/libcore/asobj/flash/filters/GradientGlowFilter_as.cpp
@@ -24,7 +24,6 @@
#include "as_object.h"
#include "VM.h"
#include "Global_as.h"
-#include "smart_ptr.h"
namespace gnash {
diff --git a/libcore/asobj/flash/geom/ColorTransform_as.cpp
b/libcore/asobj/flash/geom/ColorTransform_as.cpp
index 4684c81..9d73e25 100644
--- a/libcore/asobj/flash/geom/ColorTransform_as.cpp
+++ b/libcore/asobj/flash/geom/ColorTransform_as.cpp
@@ -24,7 +24,6 @@
#include "log.h"
#include "fn_call.h"
#include "Global_as.h"
-#include "smart_ptr.h" // for boost intrusive_ptr
#include "NativeFunction.h"
#include "VM.h"
diff --git a/libcore/asobj/flash/geom/Matrix_as.cpp
b/libcore/asobj/flash/geom/Matrix_as.cpp
index 772a630..3e336be 100644
--- a/libcore/asobj/flash/geom/Matrix_as.cpp
+++ b/libcore/asobj/flash/geom/Matrix_as.cpp
@@ -31,7 +31,6 @@
#include "log.h"
#include "fn_call.h"
#include "Global_as.h"
-#include "smart_ptr.h" // for boost intrusive_ptr
#include "GnashException.h" // for ActionException
#include "VM.h"
#include "namedStrings.h"
diff --git a/libcore/asobj/flash/geom/Rectangle_as.cpp
b/libcore/asobj/flash/geom/Rectangle_as.cpp
index 1f8f2e1..c233e39 100644
--- a/libcore/asobj/flash/geom/Rectangle_as.cpp
+++ b/libcore/asobj/flash/geom/Rectangle_as.cpp
@@ -26,7 +26,6 @@
#include "log.h"
#include "fn_call.h"
#include "Global_as.h"
-#include "smart_ptr.h" // for boost intrusive_ptr
#include "GnashException.h" // for ActionException
#include "VM.h"
#include "as_value.h"
diff --git a/libcore/asobj/flash/text/TextRenderer_as.cpp
b/libcore/asobj/flash/text/TextRenderer_as.cpp
index 8fff6cb..03b8294 100644
--- a/libcore/asobj/flash/text/TextRenderer_as.cpp
+++ b/libcore/asobj/flash/text/TextRenderer_as.cpp
@@ -28,7 +28,6 @@
#include "log.h"
#include "fn_call.h"
#include "Global_as.h"
-#include "smart_ptr.h"
#include "VM.h"
namespace gnash {
diff --git a/libcore/fontlib.cpp b/libcore/fontlib.cpp
index 0c13bfd..5455d5d 100644
--- a/libcore/fontlib.cpp
+++ b/libcore/fontlib.cpp
@@ -9,7 +9,6 @@
#include "gnashconfig.h" // HAVE_ZLIB_H, USE_SWFTREE
#endif
-#include "smart_ptr.h"
#include "Font.h"
#include "log.h"
#include "DefineShapeTag.h"
diff --git a/libcore/parser/BitmapMovieDefinition.cpp
b/libcore/parser/BitmapMovieDefinition.cpp
index 74834d3..bcddd43 100644
--- a/libcore/parser/BitmapMovieDefinition.cpp
+++ b/libcore/parser/BitmapMovieDefinition.cpp
@@ -17,7 +17,6 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#include "smart_ptr.h"
#include "BitmapMovie.h"
#include "BitmapMovieDefinition.h"
#include "Geometry.h" // for class path and class edge
diff --git a/libcore/parser/SWFMovieDefinition.cpp
b/libcore/parser/SWFMovieDefinition.cpp
index 3c49517..7174b62 100644
--- a/libcore/parser/SWFMovieDefinition.cpp
+++ b/libcore/parser/SWFMovieDefinition.cpp
@@ -33,7 +33,6 @@
#include <algorithm>
#include "GnashSleep.h"
-#include "smart_ptr.h"
#include "movie_definition.h"
#include "zlib_adapter.h"
#include "IOChannel.h"
diff --git a/libcore/parser/SWFMovieDefinition.h
b/libcore/parser/SWFMovieDefinition.h
index e7b816f..510b2ef 100644
--- a/libcore/parser/SWFMovieDefinition.h
+++ b/libcore/parser/SWFMovieDefinition.h
@@ -27,7 +27,6 @@
#include "gnashconfig.h" // for USE_SWFTREE
#endif
-#include "smart_ptr.h"
#include "movie_definition.h" // for inheritance
#include "DefinitionTag.h" // for boost::intrusive_ptr visibility of dtor
#include "StringPredicates.h"
diff --git a/libcore/parser/SWFParser.cpp b/libcore/parser/SWFParser.cpp
index aaafcfc..7993630 100644
--- a/libcore/parser/SWFParser.cpp
+++ b/libcore/parser/SWFParser.cpp
@@ -22,7 +22,6 @@
#include "SWFParser.h"
#include "TagLoadersTable.h"
#include "log.h"
-#include "smart_ptr.h"
#include <iomanip>
diff --git a/libcore/parser/sprite_definition.cpp
b/libcore/parser/sprite_definition.cpp
index 4fbbfe1..1018453 100644
--- a/libcore/parser/sprite_definition.cpp
+++ b/libcore/parser/sprite_definition.cpp
@@ -18,7 +18,6 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "RunResources.h"
-#include "smart_ptr.h"
#include "MovieClip.h"
#include "sprite_definition.h"
#include "ControlTag.h" // for dtor visibility
diff --git a/libcore/parser/sprite_definition.h
b/libcore/parser/sprite_definition.h
index 3a35242..0a57e61 100644
--- a/libcore/parser/sprite_definition.h
+++ b/libcore/parser/sprite_definition.h
@@ -25,7 +25,6 @@
#include <boost/cstdint.hpp>
#include <string>
#include <map>
-#include "smart_ptr.h"
#include "movie_definition.h" // for inheritance
#include "log.h"
#include "SWFRect.h"
diff --git a/libcore/swf/CSMTextSettingsTag.cpp
b/libcore/swf/CSMTextSettingsTag.cpp
index 73af18d..b0fa3cf 100644
--- a/libcore/swf/CSMTextSettingsTag.cpp
+++ b/libcore/swf/CSMTextSettingsTag.cpp
@@ -22,7 +22,6 @@
#include "SWFStream.h"
#include "movie_definition.h"
#include "CSMTextSettingsTag.h"
-#include "smart_ptr.h"
namespace gnash {
namespace SWF {
diff --git a/libcore/swf/DefineButtonTag.cpp b/libcore/swf/DefineButtonTag.cpp
index c9110bb..fdf6430 100644
--- a/libcore/swf/DefineButtonTag.cpp
+++ b/libcore/swf/DefineButtonTag.cpp
@@ -25,7 +25,6 @@
#include "TypesParser.h"
#include "RunResources.h"
-#include "smart_ptr.h"
#include "DisplayObject.h"
#include "Button.h" // for createDisplayObject()
#include "DefineButtonCxformTag.h"
diff --git a/libcore/swf/DefineEditTextTag.cpp
b/libcore/swf/DefineEditTextTag.cpp
index 1bab12c..bc3c33f 100644
--- a/libcore/swf/DefineEditTextTag.cpp
+++ b/libcore/swf/DefineEditTextTag.cpp
@@ -25,7 +25,6 @@
#include "Font.h"
#include "SWFStream.h"
#include "Global_as.h"
-#include "smart_ptr.h"
namespace gnash {
namespace SWF {
diff --git a/libcore/swf/DefineFontAlignZonesTag.cpp
b/libcore/swf/DefineFontAlignZonesTag.cpp
index d37955c..3eb47e6 100644
--- a/libcore/swf/DefineFontAlignZonesTag.cpp
+++ b/libcore/swf/DefineFontAlignZonesTag.cpp
@@ -26,7 +26,6 @@
#include "log.h"
#include "SWFStream.h"
#include "movie_definition.h"
-#include "smart_ptr.h"
namespace gnash {
namespace SWF {
diff --git a/libcore/swf/DefineFontTag.cpp b/libcore/swf/DefineFontTag.cpp
index 6c973a9..d1dd0b1 100644
--- a/libcore/swf/DefineFontTag.cpp
+++ b/libcore/swf/DefineFontTag.cpp
@@ -28,7 +28,6 @@
#include "Font.h"
#include "RunResources.h"
#include "SWF.h"
-#include "smart_ptr.h"
#include "movie_definition.h"
#include "ShapeRecord.h"
#include "log.h"
diff --git a/libcore/swf/DefineShapeTag.cpp b/libcore/swf/DefineShapeTag.cpp
index 77a02ed..676103c 100644
--- a/libcore/swf/DefineShapeTag.cpp
+++ b/libcore/swf/DefineShapeTag.cpp
@@ -23,7 +23,6 @@
#include "RunResources.h"
#include "DefineShapeTag.h"
-#include "smart_ptr.h"
#include "log.h"
#include "Shape.h"
#include "SWFStream.h"
diff --git a/libcore/swf/PlaceObject2Tag.cpp b/libcore/swf/PlaceObject2Tag.cpp
index c9449ad..6b6091f 100644
--- a/libcore/swf/PlaceObject2Tag.cpp
+++ b/libcore/swf/PlaceObject2Tag.cpp
@@ -35,7 +35,6 @@
#include "filter_factory.h"
#include "GnashAlgorithm.h"
#include "action_buffer.h"
-#include "smart_ptr.h"
namespace gnash {
namespace SWF {
diff --git a/libcore/swf/RemoveObjectTag.cpp b/libcore/swf/RemoveObjectTag.cpp
index edad6e1..c319abb 100644
--- a/libcore/swf/RemoveObjectTag.cpp
+++ b/libcore/swf/RemoveObjectTag.cpp
@@ -24,7 +24,6 @@
#include "SWF.h" // for TagType definition
#include "log.h"
#include "SWFStream.h"
-#include "smart_ptr.h"
namespace gnash {
namespace SWF {
diff --git a/libcore/swf/ShapeRecord.cpp b/libcore/swf/ShapeRecord.cpp
index 57042eb..72ea8e0 100644
--- a/libcore/swf/ShapeRecord.cpp
+++ b/libcore/swf/ShapeRecord.cpp
@@ -23,7 +23,6 @@
#include "SWF.h"
#include "SWFStream.h"
#include "movie_definition.h"
-#include "smart_ptr.h"
#include "FillStyle.h"
#include "Geometry.h"
#include "GnashNumeric.h"
diff --git a/libcore/swf/TextRecord.cpp b/libcore/swf/TextRecord.cpp
index fc51d93..ca15876 100644
--- a/libcore/swf/TextRecord.cpp
+++ b/libcore/swf/TextRecord.cpp
@@ -25,7 +25,6 @@
#include "SWFStream.h"
#include "SWFMatrix.h"
#include "SWFCxForm.h"
-#include "smart_ptr.h"
#include "movie_definition.h"
#include "DisplayObject.h"
#include "SWF.h"
diff --git a/libcore/swf/VideoFrameTag.cpp b/libcore/swf/VideoFrameTag.cpp
index d39b109..d64f65e 100644
--- a/libcore/swf/VideoFrameTag.cpp
+++ b/libcore/swf/VideoFrameTag.cpp
@@ -26,7 +26,6 @@
#include "SWFStream.h" // for read()
#include "movie_definition.h"
#include "utility.h"
-#include "smart_ptr.h"
namespace gnash {
namespace SWF {
diff --git a/libcore/vm/ASHandlers.cpp b/libcore/vm/ASHandlers.cpp
index 089e947..cdbf3c3 100644
--- a/libcore/vm/ASHandlers.cpp
+++ b/libcore/vm/ASHandlers.cpp
@@ -31,7 +31,6 @@
#include <boost/lexical_cast.hpp>
#include <algorithm>
-#include "smart_ptr.h"
#include "log.h"
#include "SWF.h"
#include "rc.h"
diff --git a/libcore/vm/ActionExec.cpp b/libcore/vm/ActionExec.cpp
index 00e7f4b..45b9d81 100644
--- a/libcore/vm/ActionExec.cpp
+++ b/libcore/vm/ActionExec.cpp
@@ -34,7 +34,6 @@
#include "as_environment.h"
#include "SystemClock.h"
#include "CallStack.h"
-#include "smart_ptr.h"
#include <sstream>
#include <string>
diff --git a/libcore/vm/VM.cpp b/libcore/vm/VM.cpp
index 16bcd22..867d23a 100644
--- a/libcore/vm/VM.cpp
+++ b/libcore/vm/VM.cpp
@@ -34,7 +34,6 @@
#endif
#include "SharedObject_as.h" // for SharedObjectLibrary
-#include "smart_ptr.h"
#include "NativeFunction.h"
#include "movie_definition.h"
#include "Movie.h"
diff --git a/librender/cairo/Renderer_cairo.cpp
b/librender/cairo/Renderer_cairo.cpp
index 5aeb9fa..dcc0485 100644
--- a/librender/cairo/Renderer_cairo.cpp
+++ b/librender/cairo/Renderer_cairo.cpp
@@ -43,7 +43,6 @@
#include <boost/scoped_ptr.hpp>
#include <boost/bind.hpp>
-#include "smart_ptr.h"
#include "Renderer.h"
#include "GnashImage.h"
#include "PathParser.h"
diff --git a/librender/opengl/Renderer_ogl.cpp
b/librender/opengl/Renderer_ogl.cpp
index 248a435..b862d53 100644
--- a/librender/opengl/Renderer_ogl.cpp
+++ b/librender/opengl/Renderer_ogl.cpp
@@ -30,7 +30,6 @@
#include <cmath>
#include <boost/scoped_ptr.hpp>
-#include "smart_ptr.h"
#include "swf/ShapeRecord.h"
#include "GnashEnums.h"
#include "RGBA.h"
diff --git a/testsuite/libcore.all/PropertyListTest.cpp
b/testsuite/libcore.all/PropertyListTest.cpp
index 66ab68f..35d93b2 100644
--- a/testsuite/libcore.all/PropertyListTest.cpp
+++ b/testsuite/libcore.all/PropertyListTest.cpp
@@ -27,7 +27,6 @@
#include "as_object.h" // need to set as owner of PropertyList
#include "as_value.h"
#include "log.h"
-#include "smart_ptr.h"
#include "PropFlags.h"
#include "ManualClock.h"
#include "RunResources.h"
diff --git a/utilities/processor.cpp b/utilities/processor.cpp
index b0b80b6..44eec5c 100644
--- a/utilities/processor.cpp
+++ b/utilities/processor.cpp
@@ -49,7 +49,6 @@
#include "noseek_fd_adapter.h"
#include "ManualClock.h"
#include "StringPredicates.h"
-#include "smart_ptr.h"
#include "IOChannel.h" // for proper dtor call
#include "GnashSleep.h" // for usleep comptibility.
#include "StreamProvider.h"
http://git.savannah.gnu.org/cgit//commit/?id=4b6d8ae427ae022ec99cde338c34d378cd6b80d2
commit 4b6d8ae427ae022ec99cde338c34d378cd6b80d2
Author: Benjamin Wolsey <address@hidden>
Date: Fri Apr 8 13:36:01 2011 +0200
Separate Video DisplayObject and AS implementation.
diff --git a/libcore/Video.cpp b/libcore/Video.cpp
index 9288735..2314239 100644
--- a/libcore/Video.cpp
+++ b/libcore/Video.cpp
@@ -23,39 +23,22 @@
#include <boost/bind.hpp>
#include <cassert>
-#include "MovieClip.h"
#include "DefineVideoStreamTag.h"
-#include "fn_call.h"
-#include "as_value.h"
#include "NetStream_as.h"
-#include "NativeFunction.h"
-#include "movie_root.h"
+#include "as_object.h"
#include "VM.h"
#include "MediaHandler.h" // for setting up embedded video decoder
#include "VideoDecoder.h" // for setting up embedded video decoder
-#include "namedStrings.h"
-#include "Global_as.h"
#include "Renderer.h"
#include "RunResources.h"
#include "Transform.h"
+#include "smart_ptr.h"
// Define this to get debug logging during embedded video decoding
//#define DEBUG_EMBEDDED_VIDEO_DECODING
namespace gnash {
-namespace {
- void attachPrototypeProperties(as_object& o);
- void attachVideoInterface(as_object& o);
- as_value video_ctor(const fn_call& fn);
- as_value video_attach(const fn_call& fn);
- as_value video_clear(const fn_call& fn);
- as_value video_deblocking(const fn_call& fn);
- as_value video_smoothing(const fn_call& fn);
- as_value video_width(const fn_call& fn);
- as_value video_height(const fn_call& fn);
-}
-
Video::Video(as_object* object,
const SWF::DefineVideoStreamTag* def, DisplayObject* parent)
:
@@ -219,7 +202,6 @@ Video::construct(as_object* /*init*/)
saveOriginalTarget();
}
-
void
Video::add_invalidated_bounds(InvalidatedRanges& ranges, bool force)
{
@@ -242,29 +224,6 @@ Video::setStream(NetStream_as* ns)
_ns->setInvalidatedVideo(this);
}
-// extern (used by Global.cpp)
-void
-video_class_init(as_object& global, const ObjectURI& uri)
-{
- // This is going to be the global Video "class"/"function"
- Global_as& gl = getGlobal(global);
- as_object* proto = createObject(gl);
- as_object* cl = gl.createClass(&video_ctor, proto);
- attachVideoInterface(*proto);
-
- // Register _global.Video
- global.init_member(uri, cl, as_object::DefaultFlags);
-}
-
-void
-registerVideoNative(as_object& global)
-{
- VM& vm = getVM(global);
- vm.registerNative(video_ctor, 667, 0);
- vm.registerNative(video_attach, 667, 1);
- vm.registerNative(video_clear, 667, 2);
-}
-
SWFRect
Video::getBounds() const
{
@@ -281,127 +240,5 @@ Video::markOwnResources() const
if (_ns) _ns->setReachable();
}
-as_object*
-createVideoObject(Global_as& gl)
-{
- // TODO: how to use this for AS3 as well?
- // Turn into constructBuiltin()
- as_object* obj = getObjectWithPrototype(gl, NSV::CLASS_VIDEO);
- as_object* proto = obj->get_prototype();
- if (proto) attachPrototypeProperties(*proto);
- return obj;
-}
-
-namespace {
-
-void
-attachVideoInterface(as_object& o)
-{
- VM& vm = getVM(o);
- o.init_member("attachVideo", vm.getNative(667, 1));
- o.init_member("clear", vm.getNative(667, 2));
-}
-
-void
-attachPrototypeProperties(as_object& proto)
-{
- const int protect = PropFlags::dontDelete;
-
- proto.init_property("deblocking", &video_deblocking, &video_deblocking,
- protect);
- proto.init_property("smoothing", &video_smoothing, &video_smoothing,
- protect);
-
- const int flags = PropFlags::dontDelete |
- PropFlags::readOnly;
-
- proto.init_property("height", &video_height, &video_height, flags);
- proto.init_property("width", &video_width, &video_width, flags);
-}
-
-as_value
-video_attach(const fn_call& fn)
-{
- Video* video = ensure<IsDisplayObject<Video> >(fn);
-
- if (fn.nargs < 1)
- {
- IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(_("attachVideo needs 1 arg"));
- );
- return as_value();
- }
-
- as_object* obj = toObject(fn.arg(0), getVM(fn));
- NetStream_as* ns;
-
- if (isNativeType(obj, ns)) {
- video->setStream(ns);
- }
- else {
- IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(_("attachVideo(%s) first arg is not a NetStream
instance"),
- fn.arg(0));
- );
- }
- return as_value();
-}
-
-as_value
-video_deblocking(const fn_call& fn)
-{
- Video* video = ensure<IsDisplayObject<Video> >(fn);
- UNUSED(video);
-
- log_unimpl("Video.deblocking");
- return as_value();
-}
-
-as_value
-video_smoothing(const fn_call& fn)
-{
- Video* video = ensure<IsDisplayObject<Video> >(fn);
-
- if (!fn.nargs) return as_value(video->smoothing());
-
- const bool smooth = toBool(fn.arg(0), getVM(fn));
- video->setSmoothing(smooth);
-
- return as_value();
-}
-
-as_value
-video_width(const fn_call& fn)
-{
- Video* video = ensure<IsDisplayObject<Video> >(fn);
- return as_value(video->width());
-}
-
-as_value
-video_height(const fn_call& fn)
-{
- Video* video = ensure<IsDisplayObject<Video> >(fn);
- return as_value(video->height());
-}
-
-as_value
-video_clear(const fn_call& fn)
-{
- Video* video = ensure<IsDisplayObject<Video> >(fn);
-
- video->clear();
- return as_value();
-}
-
-as_value
-video_ctor(const fn_call& /* fn */)
-{
- return as_value();
-}
-
-} // anonymous namespace
-
-} // end of namespace gnash
-
-
+} // namespace gnash
diff --git a/libcore/Video.h b/libcore/Video.h
index 3319799..bafe5d4 100644
--- a/libcore/Video.h
+++ b/libcore/Video.h
@@ -25,7 +25,7 @@
// Forward declarations
namespace gnash {
class NetStream_as;
- class Global_as;
+ class as_object;
namespace image {
class GnashImage;
}
@@ -136,17 +136,6 @@ private:
bool _smoothing;
};
-/// Native function to create a plain object with Video properties
-//
-/// This adds properties to the prototype, but does not add a Video
-/// DisplayObject.
-as_object* createVideoObject(Global_as& gl);
-
-void video_class_init(as_object& global, const ObjectURI& uri);
-
-void registerVideoNative(as_object& global);
-
-} // end namespace gnash
-
+} // namespace gnash
-#endif // GNASH_VIDEO_STREAM_INSTANCE_H
+#endif
diff --git a/libcore/asobj/Global_as.cpp b/libcore/asobj/Global_as.cpp
index cebb385..ebdc2b1 100644
--- a/libcore/asobj/Global_as.cpp
+++ b/libcore/asobj/Global_as.cpp
@@ -76,7 +76,7 @@
#include "flash/external/ExternalInterface_as.h"
#include "MovieClipLoader.h"
#include "movie_definition.h"
-#include "Video.h"
+#include "Video_as.h"
#include "extension.h"
#include "VM.h"
#include "Timers.h"
diff --git a/libcore/asobj/Video_as.cpp b/libcore/asobj/Video_as.cpp
new file mode 100644
index 0000000..58d9e24
--- /dev/null
+++ b/libcore/asobj/Video_as.cpp
@@ -0,0 +1,186 @@
+// Video.cpp: Draw individual video frames, for Gnash.
+//
+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010,
+// 2011 Free Software Foundation, Inc
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
+#include "Video_as.h"
+
+#include "Video.h"
+#include "fn_call.h"
+#include "as_value.h"
+#include "Global_as.h"
+#include "as_object.h"
+#include "NativeFunction.h"
+#include "NetStream_as.h"
+#include "namedStrings.h"
+
+namespace gnash {
+
+namespace {
+ void attachPrototypeProperties(as_object& o);
+ void attachVideoInterface(as_object& o);
+ as_value video_ctor(const fn_call& fn);
+ as_value video_attach(const fn_call& fn);
+ as_value video_clear(const fn_call& fn);
+ as_value video_deblocking(const fn_call& fn);
+ as_value video_smoothing(const fn_call& fn);
+ as_value video_width(const fn_call& fn);
+ as_value video_height(const fn_call& fn);
+}
+
+as_object*
+createVideoObject(Global_as& gl)
+{
+ as_object* obj = getObjectWithPrototype(gl, NSV::CLASS_VIDEO);
+ as_object* proto = obj->get_prototype();
+ if (proto) attachPrototypeProperties(*proto);
+ return obj;
+}
+
+// extern (used by Global.cpp)
+void
+video_class_init(as_object& global, const ObjectURI& uri)
+{
+ // This is going to be the global Video "class"/"function"
+ Global_as& gl = getGlobal(global);
+ as_object* proto = createObject(gl);
+ as_object* cl = gl.createClass(&video_ctor, proto);
+ attachVideoInterface(*proto);
+
+ // Register _global.Video
+ global.init_member(uri, cl, as_object::DefaultFlags);
+}
+
+void
+registerVideoNative(as_object& global)
+{
+ VM& vm = getVM(global);
+ vm.registerNative(video_ctor, 667, 0);
+ vm.registerNative(video_attach, 667, 1);
+ vm.registerNative(video_clear, 667, 2);
+}
+
+namespace {
+
+void
+attachVideoInterface(as_object& o)
+{
+ VM& vm = getVM(o);
+ o.init_member("attachVideo", vm.getNative(667, 1));
+ o.init_member("clear", vm.getNative(667, 2));
+}
+
+void
+attachPrototypeProperties(as_object& proto)
+{
+ const int protect = PropFlags::dontDelete;
+
+ proto.init_property("deblocking", &video_deblocking, &video_deblocking,
+ protect);
+ proto.init_property("smoothing", &video_smoothing, &video_smoothing,
+ protect);
+
+ const int flags = PropFlags::dontDelete |
+ PropFlags::readOnly;
+
+ proto.init_property("height", &video_height, &video_height, flags);
+ proto.init_property("width", &video_width, &video_width, flags);
+}
+
+as_value
+video_attach(const fn_call& fn)
+{
+ Video* video = ensure<IsDisplayObject<Video> >(fn);
+
+ if (fn.nargs < 1)
+ {
+ IF_VERBOSE_ASCODING_ERRORS(
+ log_aserror(_("attachVideo needs 1 arg"));
+ );
+ return as_value();
+ }
+
+ as_object* obj = toObject(fn.arg(0), getVM(fn));
+ NetStream_as* ns;
+
+ if (isNativeType(obj, ns)) {
+ video->setStream(ns);
+ }
+ else {
+ IF_VERBOSE_ASCODING_ERRORS(
+ log_aserror(_("attachVideo(%s) first arg is not a NetStream
instance"),
+ fn.arg(0));
+ );
+ }
+ return as_value();
+}
+
+as_value
+video_deblocking(const fn_call& fn)
+{
+ Video* video = ensure<IsDisplayObject<Video> >(fn);
+ UNUSED(video);
+
+ log_unimpl("Video.deblocking");
+ return as_value();
+}
+
+as_value
+video_smoothing(const fn_call& fn)
+{
+ Video* video = ensure<IsDisplayObject<Video> >(fn);
+
+ if (!fn.nargs) return as_value(video->smoothing());
+
+ const bool smooth = toBool(fn.arg(0), getVM(fn));
+ video->setSmoothing(smooth);
+
+ return as_value();
+}
+
+as_value
+video_width(const fn_call& fn)
+{
+ Video* video = ensure<IsDisplayObject<Video> >(fn);
+ return as_value(video->width());
+}
+
+as_value
+video_height(const fn_call& fn)
+{
+ Video* video = ensure<IsDisplayObject<Video> >(fn);
+ return as_value(video->height());
+}
+
+as_value
+video_clear(const fn_call& fn)
+{
+ Video* video = ensure<IsDisplayObject<Video> >(fn);
+
+ video->clear();
+ return as_value();
+}
+
+as_value
+video_ctor(const fn_call& /* fn */)
+{
+ return as_value();
+}
+
+} // anonymous namespace
+} // namespace gnash
diff --git a/libcore/asobj/Video_as.h b/libcore/asobj/Video_as.h
new file mode 100644
index 0000000..f21d514
--- /dev/null
+++ b/libcore/asobj/Video_as.h
@@ -0,0 +1,43 @@
+//
+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010,
+// 2011 Free Software Foundation, Inc
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+#ifndef GNASH_ASOBJ_VIDEO_AS_H
+#define GNASH_ASOBJ_VIDEO_AS_H
+
+// Forward declarations
+namespace gnash {
+ class Global_as;
+ struct ObjectURI;
+ class as_object;
+}
+
+namespace gnash {
+
+/// Native function to create a plain object with Video properties
+//
+/// This adds properties to the prototype, but does not add a Video
+/// DisplayObject.
+as_object* createVideoObject(Global_as& gl);
+
+void video_class_init(as_object& global, const ObjectURI& uri);
+
+void registerVideoNative(as_object& global);
+
+} // namespace gnash
+
+#endif
diff --git a/libcore/asobj/flash.am b/libcore/asobj/flash.am
index 4eeb796..aaf5bef 100644
--- a/libcore/asobj/flash.am
+++ b/libcore/asobj/flash.am
@@ -46,6 +46,7 @@ libgnashasobjs_la_SOURCES = \
asobj/Stage_as.cpp \
asobj/Accessibility_as.cpp \
asobj/Sound_as.cpp \
+ asobj/Video_as.cpp \
asobj/Microphone_as.cpp \
asobj/Camera_as.cpp \
asobj/LocalConnection_as.cpp \
@@ -86,6 +87,7 @@ inst_HEADERS = \
asobj/Stage_as.h \
asobj/Accessibility_as.h \
asobj/Sound_as.h \
+ asobj/Video_as.h \
asobj/Microphone_as.h \
asobj/Camera_as.h \
asobj/LocalConnection_as.h \
diff --git a/libcore/swf/DefineVideoStreamTag.cpp
b/libcore/swf/DefineVideoStreamTag.cpp
index 4999fed..cfacaef 100644
--- a/libcore/swf/DefineVideoStreamTag.cpp
+++ b/libcore/swf/DefineVideoStreamTag.cpp
@@ -24,6 +24,7 @@
#include <memory>
#include <vector>
+#include "Video_as.h"
#include "RunResources.h"
#include "Video.h"
#include "MediaParser.h" // for VideoInfo
-----------------------------------------------------------------------
Summary of changes:
cygnal/cvm.cpp | 1 -
gui/pythonmod/gnash-view.cpp | 1 -
gui/qt/Qt4Gui.cpp | 1 -
libbase/Makefile.am | 1 -
libbase/ref_counted.h | 12 ++
libbase/smart_ptr.h | 64 -------
libcore/Button.cpp | 1 -
libcore/Button.h | 1 -
libcore/CharacterProxy.cpp | 1 -
libcore/DisplayList.cpp | 1 -
libcore/DisplayObject.cpp | 1 -
libcore/DynamicShape.cpp | 1 -
libcore/ExternalInterface.cpp | 1 -
libcore/FillStyle.cpp | 1 -
libcore/Font.cpp | 1 -
libcore/FreetypeGlyphsProvider.cpp | 1 -
libcore/LineStyle.cpp | 1 -
libcore/MorphShape.h | 1 -
libcore/MovieClip.cpp | 1 -
libcore/MovieFactory.cpp | 1 -
libcore/MovieLoader.h | 1 -
libcore/Relay.cpp | 1 -
libcore/Shape.cpp | 1 -
libcore/StaticText.h | 1 -
libcore/Video.cpp | 168 +-----------------
libcore/Video.h | 17 +--
libcore/as_environment.cpp | 1 -
libcore/as_function.cpp | 1 -
libcore/as_object.cpp | 1 -
libcore/as_value.cpp | 1 -
libcore/asobj/Accessibility_as.cpp | 1 -
libcore/asobj/Array_as.cpp | 1 -
libcore/asobj/Boolean_as.cpp | 1 -
libcore/asobj/Camera_as.cpp | 1 -
libcore/asobj/Color_as.cpp | 1 -
libcore/asobj/ContextMenu_as.cpp | 1 -
libcore/asobj/Global_as.cpp | 2 +-
libcore/asobj/Key_as.cpp | 1 -
libcore/asobj/LoadVars_as.cpp | 1 -
libcore/asobj/Microphone_as.cpp | 1 -
libcore/asobj/Mouse_as.cpp | 1 -
libcore/asobj/MovieClipLoader.cpp | 1 -
libcore/asobj/MovieClip_as.cpp | 1 -
libcore/asobj/NetStream_as.cpp | 1 -
libcore/asobj/Number_as.cpp | 1 -
libcore/asobj/Object.cpp | 1 -
libcore/asobj/Selection_as.cpp | 1 -
libcore/asobj/SharedObject_as.cpp | 1 -
libcore/asobj/Sound_as.cpp | 1 -
libcore/asobj/Stage_as.cpp | 1 -
libcore/asobj/String_as.cpp | 1 -
libcore/asobj/System_as.cpp | 1 -
libcore/asobj/TextField_as.cpp | 1 -
libcore/asobj/TextFormat_as.cpp | 1 -
libcore/asobj/TextSnapshot_as.cpp | 1 -
libcore/asobj/Video_as.cpp | 186 ++++++++++++++++++++
libcore/asobj/{ASConversions.h => Video_as.h} | 32 ++--
libcore/asobj/XMLNode_as.cpp | 1 -
libcore/asobj/XML_as.cpp | 1 -
libcore/asobj/flash.am | 2 +
libcore/asobj/flash/display/BitmapData_as.cpp | 1 -
libcore/asobj/flash/display/BitmapData_as.h | 1 -
.../asobj/flash/external/ExternalInterface_as.cpp | 1 -
.../asobj/flash/filters/ColorMatrixFilter_as.cpp | 1 -
.../asobj/flash/filters/ConvolutionFilter_as.cpp | 1 -
.../flash/filters/DisplacementMapFilter_as.cpp | 1 -
.../asobj/flash/filters/DropShadowFilter_as.cpp | 1 -
libcore/asobj/flash/filters/GlowFilter_as.cpp | 1 -
.../asobj/flash/filters/GradientBevelFilter_as.cpp | 1 -
.../asobj/flash/filters/GradientGlowFilter_as.cpp | 1 -
libcore/asobj/flash/geom/ColorTransform_as.cpp | 1 -
libcore/asobj/flash/geom/Matrix_as.cpp | 1 -
libcore/asobj/flash/geom/Rectangle_as.cpp | 1 -
libcore/asobj/flash/text/TextRenderer_as.cpp | 1 -
libcore/fontlib.cpp | 1 -
libcore/parser/BitmapMovieDefinition.cpp | 1 -
libcore/parser/SWFMovieDefinition.cpp | 1 -
libcore/parser/SWFMovieDefinition.h | 1 -
libcore/parser/SWFParser.cpp | 1 -
libcore/parser/sprite_definition.cpp | 1 -
libcore/parser/sprite_definition.h | 1 -
libcore/swf/CSMTextSettingsTag.cpp | 1 -
libcore/swf/DefineButtonTag.cpp | 1 -
libcore/swf/DefineEditTextTag.cpp | 1 -
libcore/swf/DefineFontAlignZonesTag.cpp | 1 -
libcore/swf/DefineFontTag.cpp | 1 -
libcore/swf/DefineShapeTag.cpp | 1 -
libcore/swf/DefineVideoStreamTag.cpp | 1 +
libcore/swf/PlaceObject2Tag.cpp | 1 -
libcore/swf/RemoveObjectTag.cpp | 1 -
libcore/swf/ShapeRecord.cpp | 1 -
libcore/swf/TextRecord.cpp | 1 -
libcore/swf/VideoFrameTag.cpp | 1 -
libcore/vm/ASHandlers.cpp | 1 -
libcore/vm/ActionExec.cpp | 1 -
libcore/vm/VM.cpp | 1 -
librender/cairo/Renderer_cairo.cpp | 1 -
librender/opengl/Renderer_ogl.cpp | 1 -
testsuite/libcore.all/PropertyListTest.cpp | 1 -
utilities/processor.cpp | 1 -
100 files changed, 224 insertions(+), 351 deletions(-)
delete mode 100644 libbase/smart_ptr.h
create mode 100644 libcore/asobj/Video_as.cpp
copy libcore/asobj/{ASConversions.h => Video_as.h} (66%)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-214-g93c3171,
Benjamin Wolsey <=