[Gnash-commit] [SCM] Gnash branch, master, updated. fd450e3eac18be3b60d27ce81154c249a9771380

[Sandro Santilli]

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  fd450e3eac18be3b60d27ce81154c249a9771380 (commit)
       via  0858e9a44e5466a1c36ad8d7f6ff8d7d4127cdcb (commit)
       via  9ec7f5be49fc2d49bde588bc597dcccb31d3e51b (commit)
      from  d279f443fe454c34343d0164d2c6d9ebd16c6b1b (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=fd450e3eac18be3b60d27ce81154c249a9771380


commit fd450e3eac18be3b60d27ce81154c249a9771380
Author: Sandro Santilli <address@hidden>
Date:   Mon Sep 20 22:41:28 2010 +0200

    framesLoaded and framesTotal property getters were swapped. Hard one to 
catch, with unpredictable loading times... see bug #30179 for a case

diff --git a/libcore/DisplayObject.cpp b/libcore/DisplayObject.cpp
index a608011..aca10b2 100644
--- a/libcore/DisplayObject.cpp
+++ b/libcore/DisplayObject.cpp
@@ -1451,7 +1451,7 @@ getFramesLoaded(DisplayObject& o)
     // This property only applies to MovieClips.
     MovieClip* mc = dynamic_cast<MovieClip*>(&o);
     if (!mc) return as_value();
-    return as_value(mc->get_frame_count());
+    return as_value(mc->get_loaded_frames());
 }
 
 as_value
@@ -1460,7 +1460,7 @@ getTotalFrames(DisplayObject& o)
     // This property only applies to MovieClips.
     MovieClip* mc = dynamic_cast<MovieClip*>(&o);
     if (!mc) return as_value();
-    return as_value(mc->get_loaded_frames());
+    return as_value(mc->get_frame_count());
 }
 
 

http://git.savannah.gnu.org/cgit//commit/?id=0858e9a44e5466a1c36ad8d7f6ff8d7d4127cdcb


commit 0858e9a44e5466a1c36ad8d7f6ff8d7d4127cdcb
Merge: 9ec7f5b d279f44
Author: Sandro Santilli <address@hidden>
Date:   Mon Sep 20 22:07:11 2010 +0200

    Merge branch 'master' of ssh://address@hidden/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=9ec7f5be49fc2d49bde588bc597dcccb31d3e51b


commit 9ec7f5be49fc2d49bde588bc597dcccb31d3e51b
Author: Sandro Santilli <address@hidden>
Date:   Sun Sep 19 14:04:14 2010 +0200

    There's nothing horrible about getBytesTotal (nothing more than any other 
similar function)

diff --git a/libcore/asobj/MovieClip_as.cpp b/libcore/asobj/MovieClip_as.cpp
index c082085..ee69ce1 100644
--- a/libcore/asobj/MovieClip_as.cpp
+++ b/libcore/asobj/MovieClip_as.cpp
@@ -853,7 +853,6 @@ movieclip_getBytesTotal(const fn_call& fn)
 {
     MovieClip* movieclip = ensure<IsDisplayObject<MovieClip> >(fn);
 
-    // @@ horrible uh ?
     return as_value(movieclip->get_bytes_total());
 }
 

-----------------------------------------------------------------------

Summary of changes:
 libcore/DisplayObject.cpp      |    4 ++--
 libcore/asobj/MovieClip_as.cpp |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Gnash