[Gnash-commit] gnash ChangeLog configure.ac libnet/rtmp.cpp li...

[Russ Nelson]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Russ Nelson <nelsonrn>  08/04/08 02:56:29

Modified files:
        .              : ChangeLog configure.ac 
        libnet         : rtmp.cpp rtmp.h 

Log message:
        GAH!  Checked in too much.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6213&r2=1.6214
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.507&r2=1.508
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/rtmp.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/rtmp.h?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6213
retrieving revision 1.6214
diff -u -b -r1.6213 -r1.6214
--- ChangeLog   8 Apr 2008 02:48:56 -0000       1.6213
+++ ChangeLog   8 Apr 2008 02:56:28 -0000       1.6214
@@ -1,5 +1,9 @@
 2008-04-07 Russ Nelson <address@hidden>
 
+       * GAH!  Checked in too much.
+
+2008-04-07 Russ Nelson <address@hidden>
+
        * Make sure that an existing libming is properly detected, so that
          we don't tell people to install a libming-dev which is already
         there.

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -b -r1.507 -r1.508
--- configure.ac        8 Apr 2008 02:48:56 -0000       1.507
+++ configure.ac        8 Apr 2008 02:56:28 -0000       1.508
@@ -2698,13 +2698,6 @@
 
 dnl don't look for the flash compilers when cross compiling.
 if test x$cross_compiling = xno; then
-  if test x"$MING_LIBS" == ancientx; then
-    echo "        WARNING: The version of Ming that you have installed is too 
old for"
-    echo "                 us to use.  If you installed it from a package, 
uninstall and"
-    echo "                 Install it from http://ming.sourceforge.net";
-    echo "                 If necessary, use --with-ming-incl and 
--with-ming-lib"
-    echo "        MAKESWF is $MAKESWF"
-  else
     if test x"$MING_LIBS" != x; then
       echo "        MING version code is $MING_VERSION_CODE"
       echo "        MING flags are $MING_CFLAGS"
@@ -2716,7 +2709,6 @@
       echo "                 Install it from http://ming.sourceforge.net";
       echo "                 or .deb users: apt-get install libming-dev"
     fi
-  fi
 
   if test x"$SWFDEC_TESTSUITE" != x; then
     echo "        SWFDEC testsuite dir is $SWFDEC_TESTSUITE"

Index: libnet/rtmp.cpp
===================================================================
RCS file: /sources/gnash/gnash/libnet/rtmp.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libnet/rtmp.cpp     8 Apr 2008 02:48:57 -0000       1.6
+++ libnet/rtmp.cpp     8 Apr 2008 02:56:29 -0000       1.7
@@ -130,10 +130,6 @@
 RTMP::addVariable(amf::Element *el)
 {
 //    GNASH_REPORT_FUNCTION;
-    // by using a set we'd just insert the new element
-    // and the comparator would properly maintain the
-    // binary tree. See comment in header about 
-    // the _variables member
     _variables[el->getName()] = el;
 }
 
@@ -141,12 +137,6 @@
 RTMP::addVariable(char *name, amf::Element *el)
 { 
 //    GNASH_REPORT_FUNCTION;
-    assert(name); // caller should check for null
-    // NOTE: this method seems the only one preventing
-    // _variables to be a std::set, in that explicitly
-    // specifies a name, which may be different from
-    // the name stored in the amf::Element itself
-    // TODO: check if needed
     _variables[name] = el;
 }
 
@@ -154,8 +144,7 @@
 RTMP::getVariable(const std::string &name)
 {
 //    GNASH_REPORT_FUNCTION;
-    return _variables[name];
-#if 0
+//    return _variables[name.c_str()];
     map<const char *, amf::Element *>::iterator it;
     for (it = _variables.begin(); it != _variables.end(); it++) {
        const char *title = it->first;
@@ -165,7 +154,6 @@
            return el;
        }
     }
-#endif
 }
 
 // A request for a handshake is initiated by sending a byte with a
@@ -386,7 +374,7 @@
 RTMP::dump()
 {
     cerr << "RTMP packet contains " << _variables.size() << " variables." << 
endl;
-    Variables::iterator it;
+    map<const char *, amf::Element *>::iterator it;
     for (it = _variables.begin(); it != _variables.end(); it++) {
 //     const char *name = it->first;
        amf::Element *el = it->second;

Index: libnet/rtmp.h
===================================================================
RCS file: /sources/gnash/gnash/libnet/rtmp.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libnet/rtmp.h       8 Apr 2008 02:48:57 -0000       1.5
+++ libnet/rtmp.h       8 Apr 2008 02:56:29 -0000       1.6
@@ -205,13 +205,7 @@
     bool invoke();
     void dump();
   protected:
-
-    // this could be reduced to a std::set if there's
-    // never the need to specify a different name from the
-    // one actually found in the Element object
-    typedef std::map<std::string, amf::Element *> Variables;
-    Variables _variables;
-
+    std::map<const char *, amf::Element *> _variables;
     amf::Buffer                *_handshake;
     Handler            *_handler;
     int                 _amf_index;