[Gnash-commit] gnash/libamf Makefile.am amf.cpp amf.h amftest....

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/01/21 22:55:27

Modified files:
        libamf         : Makefile.am amf.cpp amf.h amftest.cpp amfutf8.h 
                         element.cpp element.h lcshm.cpp lcshm.h 
                         protocol.h rtmp.cpp rtmp.h sol.cpp sol.h 

Log message:
        Oops, missed this one too. Too many files...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/Makefile.am?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.h?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amftest.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amfutf8.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/element.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/element.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/lcshm.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/lcshm.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/protocol.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/rtmp.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/rtmp.h?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/sol.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/sol.h?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libamf/Makefile.am,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- Makefile.am 31 Dec 2007 00:26:48 -0000      1.31
+++ Makefile.am 21 Jan 2008 22:55:26 -0000      1.32
@@ -1,6 +1,6 @@
 ## Process this file with automake to generate Makefile.in
 # 
-#   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+#   Copyright (C) 2005, 2006, 2007, 2008 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
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.31 2007/12/31 00:26:48 rsavoye Exp $
+# $Id: Makefile.am,v 1.32 2008/01/21 22:55:26 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 

Index: amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- amf.cpp     5 Jan 2008 17:44:44 -0000       1.55
+++ amf.cpp     21 Jan 2008 22:55:26 -0000      1.56
@@ -1,6 +1,6 @@
 // amf.cpp:  AMF (Action Message Format) rpc marshalling, for Gnash.
 // 
-//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007, 2008 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
@@ -18,7 +18,7 @@
 //
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "gnashconfig.h"
 #endif
 
 #include <string>

Index: amf.h
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- amf.h       31 Dec 2007 00:26:48 -0000      1.28
+++ amf.h       21 Jan 2008 22:55:26 -0000      1.29
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007, 2008 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
@@ -19,7 +19,7 @@
 #define _AMF_H_
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "gnashconfig.h"
 #endif
 
 #include <vector>

Index: amftest.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amftest.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- amftest.cpp 1 Jul 2007 10:54:05 -0000       1.12
+++ amftest.cpp 21 Jan 2008 22:55:26 -0000      1.13
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007, 2008 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
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "gnashconfig.h"
 #endif
 
 #ifdef HAVE_DEJAGNU_H

Index: amfutf8.h
===================================================================
RCS file: /sources/gnash/gnash/libamf/amfutf8.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- amfutf8.h   1 Jul 2007 10:54:05 -0000       1.7
+++ amfutf8.h   21 Jan 2008 22:55:26 -0000      1.8
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007, 2008 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
@@ -15,14 +15,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// 
-//
-
 #ifndef _AMFUTF8_H_
 #define _AMFUTF8_H_
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "gnashconfig.h"
 #endif
 
 #include <vector>

Index: element.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/element.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- element.cpp 15 Jan 2008 14:58:15 -0000      1.5
+++ element.cpp 21 Jan 2008 22:55:26 -0000      1.6
@@ -1,6 +1,6 @@
 // amf.cpp:  AMF (Action Message Format) rpc marshalling, for Gnash.
 // 
-//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007, 2008 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
@@ -18,7 +18,7 @@
 //
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "gnashconfig.h"
 #endif
 
 #include <string>

Index: element.h
===================================================================
RCS file: /sources/gnash/gnash/libamf/element.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- element.h   15 Jan 2008 14:58:15 -0000      1.5
+++ element.h   21 Jan 2008 22:55:26 -0000      1.6
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007, 2008 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
@@ -19,7 +19,7 @@
 #define _ELEMENT_H_
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "gnashconfig.h"
 #endif
 
 #include <vector>

Index: lcshm.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/lcshm.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- lcshm.cpp   15 Jan 2008 14:58:15 -0000      1.3
+++ lcshm.cpp   21 Jan 2008 22:55:26 -0000      1.4
@@ -1,5 +1,5 @@
 //
-//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007, 2008 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
@@ -17,7 +17,7 @@
 //
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "gnashconfig.h"
 #endif
 
 #include <unistd.h>

Index: lcshm.h
===================================================================
RCS file: /sources/gnash/gnash/libamf/lcshm.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- lcshm.h     15 Jan 2008 14:58:15 -0000      1.3
+++ lcshm.h     21 Jan 2008 22:55:27 -0000      1.4
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007, 2008 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
@@ -19,7 +19,7 @@
 #define __LCSHM_H__
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "gnashconfig.h"
 #endif
 
 #include <boost/cstdint.hpp>

Index: protocol.h
===================================================================
RCS file: /sources/gnash/gnash/libamf/protocol.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- protocol.h  15 Dec 2007 06:58:40 -0000      1.6
+++ protocol.h  21 Jan 2008 22:55:27 -0000      1.7
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007, 2008 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
@@ -22,7 +22,7 @@
 #define _PROTOCOL_H_
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "gnashconfig.h"
 #endif
 
 #include <string>

Index: rtmp.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/rtmp.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- rtmp.cpp    31 Dec 2007 02:17:02 -0000      1.19
+++ rtmp.cpp    21 Jan 2008 22:55:27 -0000      1.20
@@ -1,6 +1,6 @@
 // rtmp.cpp:  Adobe/Macromedia Real Time Message Protocol handler, for Gnash.
 // 
-//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007, 2008 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
@@ -18,7 +18,7 @@
 //
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "gnashconfig.h"
 #endif
 
 #include <iostream>

Index: rtmp.h
===================================================================
RCS file: /sources/gnash/gnash/libamf/rtmp.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- rtmp.h      31 Dec 2007 02:17:02 -0000      1.11
+++ rtmp.h      21 Jan 2008 22:55:27 -0000      1.12
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007, 2008 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
@@ -19,7 +19,7 @@
 #define _RTMP_H_
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "gnashconfig.h"
 #endif
 
 #include "tu_config.h"

Index: sol.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/sol.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- sol.cpp     15 Jan 2008 14:58:15 -0000      1.15
+++ sol.cpp     21 Jan 2008 22:55:27 -0000      1.16
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007, 2008 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
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "gnashconfig.h"
 #endif
 
 #include <boost/cstdint.hpp>
@@ -119,14 +119,14 @@
 SOL::formatHeader(std::string &name, int filesize)
 {
 //    GNASH_REPORT_FUNCTION;
-    uint32_t i;
+    boost::uint32_t i;
 
     // First we add the magic number. All SOL data is in big-endian format,
     // so we swap it first.
-    uint16_t swapped = SOL_MAGIC;
+    boost::uint16_t swapped = SOL_MAGIC;
 //    swapped = ntohs(swapped);
-    uint8_t *ptr = reinterpret_cast<uint8_t *>(&swapped);
-    for (i=0; i<sizeof(uint16_t); i++) {
+    boost::uint8_t *ptr = reinterpret_cast<boost::uint8_t *>(&swapped);
+    for (i=0; i<sizeof(boost::uint16_t); i++) {
         _header.push_back(ptr[i]);
     }
 
@@ -134,10 +134,10 @@
     // includes the padding in the header, the mystery bytes, and the
     // padding, plus the length of the name itself.
     filesize += name.size() + 16;
-    uint32_t len = filesize;
+    boost::uint32_t len = filesize;
     len = htonl(len);
-    ptr = reinterpret_cast<uint8_t *>(&len);
-    for (i=0; i<sizeof(uint32_t); i++) {
+    ptr = reinterpret_cast<boost::uint8_t *>(&len);
+    for (i=0; i<sizeof(boost::uint32_t); i++) {
         _header.push_back(ptr[i]);
     }
 
@@ -146,18 +146,18 @@
     // first is the TCSO, we have no idea what this stands for.
 //    ptr = reinterpret_cast<uint8_t *>(const_cast<uint8_t *>("TCSO");
     ptr = (uint8_t *)"TCSO";
-    for (i=0; i<sizeof(uint32_t); i++) {
+    for (i=0; i<sizeof(boost::uint32_t); i++) {
         _header.push_back(ptr[i]);
     }
     // then the 0x0004 bytes, also a mystery
     swapped = SOL_BLOCK_MARK;
     swapped = htons(swapped);
-    ptr = reinterpret_cast<uint8_t *>(&swapped);
-    for (i=0; i<sizeof(uint16_t); i++) {
+    ptr = reinterpret_cast<boost::uint8_t *>(&swapped);
+    for (i=0; i<sizeof(boost::uint16_t); i++) {
         _header.push_back(ptr[i]);
     }
     // finally a bunch of zeros to pad things for this field
-    for (i=0; i<sizeof(uint32_t); i++) {
+    for (i=0; i<sizeof(boost::uint32_t); i++) {
         _header.push_back('\0');
     }
 
@@ -166,18 +166,18 @@
     //  First the length in two bytes
     swapped = name.size();
     swapped = htons(swapped);
-    ptr = reinterpret_cast<uint8_t *>(&swapped);
-    for (i=0; i<sizeof(uint16_t); i++) {
+    ptr = reinterpret_cast<boost::uint8_t *>(&swapped);
+    for (i=0; i<sizeof(boost::uint16_t); i++) {
         _header.push_back(ptr[i]);
     }
     // then the string itself
-    ptr = (uint8_t *)name.c_str();
+    ptr = (boost::uint8_t *)name.c_str();
     for (i=0; i<name.size(); i++) {
         _header.push_back(ptr[i]);
     }
     
     // finally a bunch of zeros to pad things at the end of the header
-    for (i=0; i<sizeof(uint32_t); i++) {
+    for (i=0; i<sizeof(boost::uint32_t); i++) {
         _header.push_back('\0');
     }
 
@@ -217,7 +217,7 @@
 {
 //    GNASH_REPORT_FUNCTION;
     ofstream ofs(filespec.c_str(), ios::binary);
-    vector<uint8_t>::iterator it;
+    vector<boost::uint8_t>::iterator it;
     vector<amf::Element *>::iterator ita; 
     AMF amf_obj;
     char *ptr;
@@ -240,7 +240,7 @@
     for (ita = _amfobjs.begin(); ita != _amfobjs.end(); ita++) {
         amf::Element *el = (*(ita));
         int outsize = el->getName().size() + el->getLength() + 5;
-        uint8_t *foo = amf_obj.encodeVariable(el); 
+        boost::uint8_t *foo = amf_obj.encodeVariable(el); 
         switch (el->getType()) {
          case Element::BOOLEAN:
              outsize = el->getName().size() + 5;

Index: sol.h
===================================================================
RCS file: /sources/gnash/gnash/libamf/sol.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- sol.h       15 Jan 2008 14:58:15 -0000      1.6
+++ sol.h       21 Jan 2008 22:55:27 -0000      1.7
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007, 2008 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
@@ -19,7 +19,7 @@
 #define _SOL_H_
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "gnashconfig.h"
 #endif
 
 #include <boost/cstdint.hpp>