CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/01/05 09:36:55
Modified files:
. : ChangeLog
server/asobj : LocalConnection.cpp LocalConnection.h
Log message:
allow build to complete.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5306&r2=1.5307
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/LocalConnection.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/LocalConnection.h?cvsroot=gnash&r1=1.11&r2=1.12
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5306
retrieving revision 1.5307
diff -u -b -r1.5306 -r1.5307
--- ChangeLog 5 Jan 2008 04:25:47 -0000 1.5306
+++ ChangeLog 5 Jan 2008 09:36:54 -0000 1.5307
@@ -1,3 +1,7 @@
+2008-01-05 Sandro Santilli <[EMAIL PROTECTED]>
+
+ * server/asobj/LocalConnection.{cpp,h}: allow build to complete.
+
2008-01-04 Rob Savoye <[EMAIL PROTECTED]>
* server/asobj/LocalConnection.cpp: A mostly implemented
Index: server/asobj/LocalConnection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/LocalConnection.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/asobj/LocalConnection.cpp 5 Jan 2008 04:25:46 -0000 1.16
+++ server/asobj/LocalConnection.cpp 5 Jan 2008 09:36:55 -0000 1.17
@@ -33,6 +33,7 @@
#include "network.h"
#include "fn_call.h"
#include "builtin_function.h"
+#include "amf.h"
using namespace std;
using namespace amf;
@@ -95,7 +96,7 @@
GNASH_REPORT_FUNCTION;
}
-#if 0
+#if 0 // {
Listener::Listener()
: _baseaddr(0)
{
@@ -169,6 +170,7 @@
return listeners;
}
+#endif // }
/// \brief Closes (disconnects) the LocalConnection object.
void
@@ -187,23 +189,25 @@
/// send() command to signify which local connection to send the
/// object to.
bool
-LocalConnection::connect(const char *name)
+LocalConnection::connect(const std::string& name)
{
GNASH_REPORT_FUNCTION;
_name = name;
- log_debug("trying to open shared memory segment: \"%s\"", name);
+ log_debug("trying to open shared memory segment: \"%s\"", name.c_str());
- if (Shm::attach(name, true) == false) {
+ if (Shm::attach(name.c_str(), true) == false) {
return false;
}
if (Shm::getAddr() <= 0) {
- log_error("Failed to open shared memory segment: \"%s\"", name);
+ log_error("Failed to open shared memory segment: \"%s\"",
name.c_str());
return false;
}
+#if 0 // { // what are these Listeners ?
+
Listener::setBaseAddress(Shm::getAddr());
string str1 = "HelloWorld";
@@ -237,10 +241,10 @@
}
delete listeners;
+#endif // }
return true;
}
-#endif
/// \brief Returns a string representing the superdomain of the
/// location of the current SWF file.
@@ -259,11 +263,9 @@
return _name;
}
- string url_s;
- const URL& baseurl = get_base_url();
- URL url(url_s, baseurl);
-// log_msg(_("BASE URL=%s (%s)"), baseurl.str().c_str(),
url.hostname().c_str());
- if (url.hostname().size() == 0) {
+ URL url(getVM().getSWFUrl());
+// log_debug(_("ORIG URL=%s (%s)"), url.str().c_str(),
url.hostname().c_str());
+ if (url.hostname().empty()) {
_name = "localhost";
} else {
_name = url.hostname();
@@ -284,7 +286,7 @@
}
// If unset, pick the default. Yes, we're paranoid.
- if (_name.size() == 0) {
+ if (_name.empty()) {
_name = "localhost";
}
Index: server/asobj/LocalConnection.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/LocalConnection.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/asobj/LocalConnection.h 1 Jul 2007 10:54:28 -0000 1.11
+++ server/asobj/LocalConnection.h 5 Jan 2008 09:36:55 -0000 1.12
@@ -41,17 +41,17 @@
namespace gnash {
#ifdef NETWORK_CONN
-class LocalConnection {
+class LocalConnection : public as_object {
#else
-class LocalConnection : public Shm {
+class LocalConnection : public as_object, Shm {
#endif
public:
LocalConnection();
~LocalConnection();
void close(void);
- bool connect(const char *name);
- std::string domain(void);
+ bool connect(const std::string& name);
+ std::string domain(int version);
void send();
// FIXME: these should be callbacks
// bool _allowDomain;
@@ -62,11 +62,13 @@
std::map<const char *, short> _allocated;
};
+#if 0
class localconnection_as_object : public as_object
{
public:
LocalConnection obj;
};
+#endif
as_value localconnection_new(const fn_call& fn);
as_value localconnection_close(const fn_call& fn);
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
