[Gnash-commit] gnash pythonmodule/gnashpython.cpp pythonmodule...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/01/28 13:58:26

Modified files:
        pythonmodule   : gnashpython.cpp gnashpython.h 
        .              : ChangeLog 

Log message:
        Update include

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/pythonmodule/gnashpython.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/pythonmodule/gnashpython.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5507&r2=1.5508

Patches:
Index: pythonmodule/gnashpython.cpp
===================================================================
RCS file: /sources/gnash/gnash/pythonmodule/gnashpython.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- pythonmodule/gnashpython.cpp        22 Jan 2008 21:13:15 -0000      1.6
+++ pythonmodule/gnashpython.cpp        28 Jan 2008 13:58:25 -0000      1.7
@@ -43,7 +43,7 @@
 #include "gnashpython.h"
 
 #define REQUIRE_MOVIE_LOADED if (!_movieDef) throw GnashException("No Movie 
Loaded!")
-#define REQUIRE_VM_STARTED if (!_movieDef || !_movieRoot) throw 
GnashException("VM not started!")
+#define REQUIRE_VM_STARTED if (!_movieRoot) throw GnashException("VM not 
started!")
 
 namespace gnash {
 
@@ -256,6 +256,23 @@
     return _movieDef->get_frame_count();
 }
 
+geometry::SnappingRanges2d<int>
+GnashPlayer::getInvalidatedRanges() const
+{
+       using namespace gnash::geometry;
+
+       SnappingRanges2d<float> ranges = _invalidatedBounds;
+
+       // scale by 1/20 (twips to pixels)
+       ranges.scale(1.0/20);
+
+       // Convert to integer range.
+       SnappingRanges2d<int> pixranges(ranges);
+
+       return pixranges;
+
+}
+
 // The URL of the stream.
 std::string
 GnashPlayer::getSWFURL() const

Index: pythonmodule/gnashpython.h
===================================================================
RCS file: /sources/gnash/gnash/pythonmodule/gnashpython.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- pythonmodule/gnashpython.h  12 Jan 2008 15:05:54 -0000      1.4
+++ pythonmodule/gnashpython.h  28 Jan 2008 13:58:25 -0000      1.5
@@ -21,9 +21,10 @@
 #define GNASHPYTHON_H
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include "gnashconfig.h"
 #endif
 
+#include "Range2d.h"
 #include "gnash.h"
 #include "ManualClock.h"
 #include "movie_root.h"
@@ -97,6 +98,8 @@
     void restart();
     void setVerbose(bool verbose);
     
+    geometry::SnappingRanges2d<int> getInvalidatedRanges() const;
+    
     // Move the pointer to position x, y.
     // @ return whether the move triggered an event needing a redraw. Use this
     // to decide whether to rerender.

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5507
retrieving revision 1.5508
diff -u -b -r1.5507 -r1.5508
--- ChangeLog   28 Jan 2008 12:26:47 -0000      1.5507
+++ ChangeLog   28 Jan 2008 13:58:25 -0000      1.5508
@@ -1,5 +1,9 @@
 2008-01-28 Benjamin Wolsey <address@hidden>
 
+       * pythonmodule/gnashpython.h: config.h -> gnashconfig.h.
+
+2008-01-28 Benjamin Wolsey <address@hidden>
+
        * server/vm/ASHandlers.cpp (CommonGetUrl): Escape newline, tab etc.
          Escape pipe and backtick.