[Gnash-commit] gnash server/asobj/SharedObject.cpp ChangeLog

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/04/30 03:58:15

Modified files:
        server/asobj   : SharedObject.cpp 
        .              : ChangeLog 

Log message:
                * server/asobj/SharedObject.cpp: Use AMF0_* instead of just
                AMF_*.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SharedObject.cpp?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6454&r2=1.6455

Patches:
Index: server/asobj/SharedObject.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SharedObject.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- server/asobj/SharedObject.cpp       21 Apr 2008 11:27:44 -0000      1.38
+++ server/asobj/SharedObject.cpp       30 Apr 2008 03:58:14 -0000      1.39
@@ -409,18 +409,18 @@
     for (it = els.begin(); it != els.end(); it++) {
         Element *el = (*(it));
 //        log_debug("Adding \"%s\"", el->name.c_str());
-        if (el->getType() == Element::NUMBER) {
+        if (el->getType() == Element::NUMBER_AMF0) {
             double dub =  *((double *)el->getData());
             ptr->set_member(st.string_table::find(el->getName()), 
as_value(dub));
         } 
-        if (el->getType() == Element::BOOLEAN) {
+        if (el->getType() == Element::BOOLEAN_AMF0) {
             if (el->to_bool() == true) {
                 ptr->set_member(st.string_table::find(el->getName()), 
as_value(true));
             } else {
                 ptr->set_member(st.string_table::find(el->getName()), 
as_value(false));
             }       
         } 
-        if (el->getType() == Element::STRING) {
+        if (el->getType() == Element::STRING_AMF0) {
             if (el->getLength() == 0) {
                 ptr->set_member(st.string_table::find(el->getName()), 
as_value(""));
             } else {
@@ -428,7 +428,7 @@
                 ptr->set_member(st.string_table::find(el->getName()), 
as_value(str));
             }
         } 
-        if (el->getType() == Element::OBJECT) {
+        if (el->getType() == Element::OBJECT_AMF0) {
 //            data.convert_to_object();
 //            ptr->set_member(st.string_table::find(el->name), data);
         } 

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6454
retrieving revision 1.6455
diff -u -b -r1.6454 -r1.6455
--- ChangeLog   30 Apr 2008 03:57:01 -0000      1.6454
+++ ChangeLog   30 Apr 2008 03:58:14 -0000      1.6455
@@ -1,5 +1,8 @@
 2008-04-29  Rob Savoye  <address@hidden>
 
+       * server/asobj/SharedObject.cpp: Use AMF0_* instead of just
+       AMF_*.
+       
        * libamf/amf.cpp: Go back to a proper type cast now that the real
        problem is fixed.