[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog libnet/http.cpp libnet/rtmp.cpp...
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash ChangeLog libnet/http.cpp libnet/rtmp.cpp... |
Date: |
Wed, 30 Apr 2008 03:48:53 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 08/04/30 03:48:52
Modified files:
. : ChangeLog
libnet : http.cpp rtmp.cpp rtmp.h rtmp_server.cpp
Log message:
* libnet/rtmp.{h,cpp}: Use *Property instead of *Variable.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6452&r2=1.6453
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/http.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/rtmp.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/rtmp.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/rtmp_server.cpp?cvsroot=gnash&r1=1.3&r2=1.4
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6452
retrieving revision 1.6453
diff -u -b -r1.6452 -r1.6453
--- ChangeLog 30 Apr 2008 03:36:28 -0000 1.6452
+++ ChangeLog 30 Apr 2008 03:48:50 -0000 1.6453
@@ -1,5 +1,7 @@
2008-04-29 Rob Savoye <address@hidden>
+ * libnet/rtmp.{h,cpp}: Use *Property instead of *Variable.
+
* configure.ac: Don't look for mallinfo() when using jemalloc().
* libamf/amf.h: Use _AMF0* on Element types.
Index: libnet/http.cpp
===================================================================
RCS file: /sources/gnash/gnash/libnet/http.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libnet/http.cpp 29 Apr 2008 16:50:50 -0000 1.8
+++ libnet/http.cpp 30 Apr 2008 03:48:52 -0000 1.9
@@ -1277,7 +1277,7 @@
st.st_size, filefd);
do {
amf::Buffer *buf = new amf::Buffer;
- ret = ::read(filefd, buf->reference(), buf->size());
+ ret = read(filefd, buf->reference(), buf->size());
if (ret == 0) { // the file is done
delete buf;
break;
Index: libnet/rtmp.cpp
===================================================================
RCS file: /sources/gnash/gnash/libnet/rtmp.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libnet/rtmp.cpp 8 Apr 2008 02:56:29 -0000 1.7
+++ libnet/rtmp.cpp 30 Apr 2008 03:48:52 -0000 1.8
@@ -127,21 +127,21 @@
}
void
-RTMP::addVariable(amf::Element *el)
+RTMP::addProperty(amf::Element *el)
{
// GNASH_REPORT_FUNCTION;
_variables[el->getName()] = el;
}
void
-RTMP::addVariable(char *name, amf::Element *el)
+RTMP::addProperty(char *name, amf::Element *el)
{
// GNASH_REPORT_FUNCTION;
_variables[name] = el;
}
amf::Element *
-RTMP::getVariable(const std::string &name)
+RTMP::getProperty(const std::string &name)
{
// GNASH_REPORT_FUNCTION;
// return _variables[name.c_str()];
@@ -333,8 +333,8 @@
log_debug (_("Reading AMF packets till we're done..."));
buf->dump();
while (ptr < end) {
- amf::Element *el = amf.extractVariable(ptr);
- addVariable(el);
+ amf::Element *el = amf.extractProperty(ptr);
+ addProperty(el);
el->dump();
}
ptr += 1;
@@ -346,16 +346,16 @@
buf = _handler->merge(buf);
}
while ((ptr - buf->begin()) < actual_size) {
- amf::Element *el = amf.extractVariable(ptr);
- addVariable(el);
+ amf::Element *el = amf.extractProperty(ptr);
+ addProperty(el);
el->dump(); // FIXME: dump the AMF objects as they are read
in
}
dump();
- amf::Element *url = getVariable("tcUrl");
- amf::Element *file = getVariable("swfUrl");
- amf::Element *app = getVariable("app");
+ amf::Element *url = getProperty("tcUrl");
+ amf::Element *file = getProperty("swfUrl");
+ amf::Element *app = getProperty("app");
if (file) {
log_debug("SWF file %s", file->getData());
Index: libnet/rtmp.h
===================================================================
RCS file: /sources/gnash/gnash/libnet/rtmp.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libnet/rtmp.h 8 Apr 2008 02:56:29 -0000 1.6
+++ libnet/rtmp.h 30 Apr 2008 03:48:52 -0000 1.7
@@ -177,10 +177,10 @@
bool packetSend(amf::Buffer *buf);
bool packetRead(amf::Buffer *buf);
- void addVariable(amf::Element *el);
- void addVariable(char *name, amf::Element *el);
- void addVariable(std::string &name, amf::Element *el);
- amf::Element *getVariable(const std::string &name);
+ void addProperty(amf::Element *el);
+ void addProperty(char *name, amf::Element *el);
+ void addProperty(std::string &name, amf::Element *el);
+ amf::Element *getProperty(const std::string &name);
void setHandler(Handler *hand) { _handler = hand; };
int headerSize(gnash::Network::byte_t header);
Network::byte_t *parseHeader(gnash::Network::byte_t *header);
Index: libnet/rtmp_server.cpp
===================================================================
RCS file: /sources/gnash/gnash/libnet/rtmp_server.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libnet/rtmp_server.cpp 1 Apr 2008 22:20:39 -0000 1.3
+++ libnet/rtmp_server.cpp 30 Apr 2008 03:48:52 -0000 1.4
@@ -228,8 +228,8 @@
buf->dump();
while (ptr < end) {
amf::Element *el = new amf::Element;
- ptr = amf.extractVariable(el, ptr);
- addVariable(el);
+ ptr = amf.extractProperty(el, ptr);
+ addProperty(el);
el->dump();
}
ptr += 1;
@@ -243,8 +243,8 @@
while ((ptr - buf->begin()) < static_cast<int>(actual_size)) {
amf::Element *el = new amf::Element;
if (ptr) {
- ptr = amf.extractVariable(el, ptr);
- addVariable(el);
+ ptr = amf.extractProperty(el, ptr);
+ addProperty(el);
} else {
return true;
}
@@ -271,9 +271,9 @@
break;
};
- Element *url = getVariable("tcUrl");
- Element *file = getVariable("swfUrl");
- Element *app = getVariable("app");
+ Element *url = getProperty("tcUrl");
+ Element *file = getProperty("swfUrl");
+ Element *app = getProperty("app");
if (file) {
log_debug("SWF file %s", file->getData());
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog libnet/http.cpp libnet/rtmp.cpp...,
Rob Savoye <=