[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. ebb9d7695d8fdfb16c30
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. ebb9d7695d8fdfb16c307e52dd7f09cd53649c1c |
|
Date: |
Mon, 10 Jan 2011 15:55:28 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via ebb9d7695d8fdfb16c307e52dd7f09cd53649c1c (commit)
via 269cb63eb61a0e62946b1aa6ca78d1a8477d4356 (commit)
via b74a9e044f1d36a568dea2d46dcd4908425a6a36 (commit)
via 8b891a95cb2873e671f04cab03b796dc118e5663 (commit)
via 0170d1ce22313ac8316be9523cfccedbfdfca9d7 (commit)
via b956e6cce918e42ca6e0be61ef8ad6646c015531 (commit)
from 6f29d46bea91530dfe7498248a6f8fd4a7bb1fd3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=ebb9d7695d8fdfb16c307e52dd7f09cd53649c1c
commit ebb9d7695d8fdfb16c307e52dd7f09cd53649c1c
Author: Benjamin Wolsey <address@hidden>
Date: Mon Jan 10 16:37:12 2011 +0100
Fix tests.
diff --git a/plugin/npapi/test.cpp b/plugin/npapi/test.cpp
index c2b5e29..0da95a9 100644
--- a/plugin/npapi/test.cpp
+++ b/plugin/npapi/test.cpp
@@ -45,7 +45,7 @@ main(int argc, char *argv[])
NPVariant *value = (NPVariant *)NPN_MemAlloc(sizeof(NPVariant));
BOOLEAN_TO_NPVARIANT(true, *value);
- std::string str = ExternalInterface::convertNPVariant(value);
+ std::string str = plugin::ExternalInterface::convertNPVariant(value);
if (str == "<true/>") {
runtest.pass("convertNPVariant(true)");
} else {
@@ -53,7 +53,7 @@ main(int argc, char *argv[])
}
BOOLEAN_TO_NPVARIANT(false, *value);
- str = ExternalInterface::convertNPVariant(value);
+ str = plugin::ExternalInterface::convertNPVariant(value);
if (str == "<false/>") {
runtest.pass("convertNPVariant(false)");
} else {
@@ -61,7 +61,7 @@ main(int argc, char *argv[])
}
NULL_TO_NPVARIANT(*value);
- str = ExternalInterface::convertNPVariant(value);
+ str = plugin::ExternalInterface::convertNPVariant(value);
if (str == "<null/>") {
runtest.pass("convertNPVariant(null)");
} else {
@@ -69,7 +69,7 @@ main(int argc, char *argv[])
}
VOID_TO_NPVARIANT(*value);
- str = ExternalInterface::convertNPVariant(value);
+ str = plugin::ExternalInterface::convertNPVariant(value);
if (str == "<void/>") {
runtest.pass("convertNPVariant(void)");
} else {
@@ -77,7 +77,7 @@ main(int argc, char *argv[])
}
DOUBLE_TO_NPVARIANT(123.456, *value);
- str = ExternalInterface::convertNPVariant(value);
+ str = plugin::ExternalInterface::convertNPVariant(value);
if (str == "<number>123.456</number>") {
runtest.pass("convertNPVariant(double)");
} else {
@@ -85,7 +85,7 @@ main(int argc, char *argv[])
}
INT32_TO_NPVARIANT(78, *value);
- str = ExternalInterface::convertNPVariant(value);
+ str = plugin::ExternalInterface::convertNPVariant(value);
if (str == "<number>78</number>") {
runtest.pass("convertNPVariant(int32)");
} else {
@@ -93,23 +93,23 @@ main(int argc, char *argv[])
}
STRINGZ_TO_NPVARIANT("Hello World!", *value);
- str = ExternalInterface::convertNPVariant(value);
+ str = plugin::ExternalInterface::convertNPVariant(value);
if (str == "<string>Hello World!</string>") {
runtest.pass("convertNPVariant(string)");
} else {
runtest.fail("convertNPVariant(string)");
}
- str = ExternalInterface::makeProperty("hi", "Hello World!");
+ str = plugin::ExternalInterface::makeProperty("hi", "Hello World!");
if (str == "<property id=\"hi\">Hello World!</property>") {
- runtest.pass("ExternalInterface::makeProperty()");
+ runtest.pass("plugin::ExternalInterface::makeProperty()");
} else {
- runtest.fail("ExternalInterface::makeProperty()");
+ runtest.fail("plugin::ExternalInterface::makeProperty()");
}
#if 0
ARRAY_TO_NPVARIANT(*value);
- str = ExternalInterface::convertNPVariant(value);
+ str = plugin::ExternalInterface::convertNPVariant(value);
if (str == "<array></array>") {
runtest.pass("convertNPVariant(array)");
} else {
@@ -118,9 +118,9 @@ main(int argc, char *argv[])
#endif
NPObject *obj = (NPObject *)NPN_MemAlloc(sizeof(NPObject));
- std::string prop1 = ExternalInterface::makeString("foobar");
- std::string prop2 = ExternalInterface::makeNumber(12.34);
- std::string prop3 = ExternalInterface::makeNumber(56);
+ std::string prop1 = plugin::ExternalInterface::makeString("foobar");
+ std::string prop2 = plugin::ExternalInterface::makeNumber(12.34);
+ std::string prop3 = plugin::ExternalInterface::makeNumber(56);
std::vector<std::string> aargs;
aargs.push_back(prop1);
aargs.push_back(prop2);
@@ -128,11 +128,11 @@ main(int argc, char *argv[])
regex_t regex_pat;
regcomp (®ex_pat, "<array><property
id=\"0\"><string>foobar</string></property><property
id=\"1\"><number>12.34</number></property><property
id=\"2\"><number>56</number></property></array>", REG_NOSUB|REG_NEWLINE);
- str = ExternalInterface::makeArray(aargs);
+ str = plugin::ExternalInterface::makeArray(aargs);
if (regexec (®ex_pat, reinterpret_cast<const char*>(str.c_str()), 0,
(regmatch_t *)0, 0)) {
- runtest.fail("ExternalInterface::makeArray()");
+ runtest.fail("plugin::ExternalInterface::makeArray()");
} else {
- runtest.pass("ExternalInterface::makeArray()");
+ runtest.pass("plugin::ExternalInterface::makeArray()");
}
std::map<std::string, std::string> margs;
@@ -140,137 +140,137 @@ main(int argc, char *argv[])
margs["test2"] = prop2;
margs["test3"] = prop3;
- str = ExternalInterface::makeObject(margs);
+ str = plugin::ExternalInterface::makeObject(margs);
std::string xml = "<object><property
id=\"test1\"><string>foobar</string></property><property
id=\"test2\"><number>12.34</number></property><property
id=\"test3\"><number>56</number></property></object>";
regcomp (®ex_pat, xml.c_str(), REG_NOSUB|REG_NEWLINE);
// std::cout << str << std::endl;
if (regexec (®ex_pat, reinterpret_cast<const char*>(str.c_str()), 0,
(regmatch_t *)0, 0)) {
- runtest.fail("ExternalInterface::makeObject()");
+ runtest.fail("plugin::ExternalInterface::makeObject()");
} else {
- runtest.pass("ExternalInterface::makeObject()");
+ runtest.pass("plugin::ExternalInterface::makeObject()");
}
//
// Parsing tests
//
xml = "<string>Hello World!</string>";
- GnashNPVariant np = ExternalInterface::parseXML(xml);
+ GnashNPVariant np = plugin::ExternalInterface::parseXML(xml);
std::string data = NPStringToString(NPVARIANT_TO_STRING(np.get()));
if (NPVARIANT_IS_STRING(np.get()) &&
(data == "Hello World!")) {
- runtest.pass("ExternalInterface::parseXML(string)");
+ runtest.pass("plugin::ExternalInterface::parseXML(string)");
} else {
- runtest.fail("ExternalInterface::parseXML(string)");
+ runtest.fail("plugin::ExternalInterface::parseXML(string)");
}
xml = "<number>123.456</number>";
- np = ExternalInterface::parseXML(xml);
+ np = plugin::ExternalInterface::parseXML(xml);
double num = NPVARIANT_TO_DOUBLE(np.get());
if (NPVARIANT_IS_DOUBLE(np.get()) &&
(num == 123.456)) {
- runtest.pass("ExternalInterface::parseXML(double)");
+ runtest.pass("plugin::ExternalInterface::parseXML(double)");
} else {
- runtest.fail("ExternalInterface::parseXML(double)");
+ runtest.fail("plugin::ExternalInterface::parseXML(double)");
}
xml = "<number>78</number>";
- np = ExternalInterface::parseXML(xml);
+ np = plugin::ExternalInterface::parseXML(xml);
int inum = NPVARIANT_TO_INT32(np.get());
if (NPVARIANT_IS_INT32(np.get()) &&
(inum == 78)) {
- runtest.pass("ExternalInterface::parseXML(int32)");
+ runtest.pass("plugin::ExternalInterface::parseXML(int32)");
} else {
- runtest.fail("ExternalInterface::parseXML(int32)");
+ runtest.fail("plugin::ExternalInterface::parseXML(int32)");
}
xml = "<true/>";
- np = ExternalInterface::parseXML(xml);
+ np = plugin::ExternalInterface::parseXML(xml);
bool flag = NPVARIANT_TO_BOOLEAN(np.get());
if (NPVARIANT_IS_BOOLEAN(np.get()) &&
(flag == true)) {
- runtest.pass("ExternalInterface::parseXML(true)");
+ runtest.pass("plugin::ExternalInterface::parseXML(true)");
} else {
- runtest.fail("ExternalInterface::parseXML(true)");
+ runtest.fail("plugin::ExternalInterface::parseXML(true)");
}
xml = "<false/>";
- np = ExternalInterface::parseXML(xml);
+ np = plugin::ExternalInterface::parseXML(xml);
flag = NPVARIANT_TO_BOOLEAN(np.get());
if (NPVARIANT_IS_BOOLEAN(np.get()) &&
(flag == false)) {
- runtest.pass("ExternalInterface::parseXML(false)");
+ runtest.pass("plugin::ExternalInterface::parseXML(false)");
} else {
- runtest.fail("ExternalInterface::parseXML(false)");
+ runtest.fail("plugin::ExternalInterface::parseXML(false)");
}
xml = "<null/>";
- np = ExternalInterface::parseXML(xml);
+ np = plugin::ExternalInterface::parseXML(xml);
if (NPVARIANT_IS_NULL(np.get())) {
- runtest.pass("ExternalInterface::parseXML(null)");
+ runtest.pass("plugin::ExternalInterface::parseXML(null)");
} else {
- runtest.fail("ExternalInterface::parseXML(null)");
+ runtest.fail("plugin::ExternalInterface::parseXML(null)");
}
xml = "<void/>";
- np = ExternalInterface::parseXML(xml);
+ np = plugin::ExternalInterface::parseXML(xml);
if (NPVARIANT_IS_VOID(np.get())) {
- runtest.pass("ExternalInterface::parseXML(void)");
+ runtest.pass("plugin::ExternalInterface::parseXML(void)");
} else {
- runtest.fail("ExternalInterface::parseXML(void)");
+ runtest.fail("plugin::ExternalInterface::parseXML(void)");
}
xml = "<property id=\"0\"><string>foobar</string></property><property
id=\"1\"><number>12.34</number></property><property
id=\"2\"><number>56</number></property>";
- std::map<std::string, GnashNPVariant> props =
ExternalInterface::parseProperties(xml);
+ std::map<std::string, GnashNPVariant> props =
plugin::ExternalInterface::parseProperties(xml);
np = props["0"];
data = NPStringToString(NPVARIANT_TO_STRING(np.get()));
if ((props.size() == 3) && (data == "foobar")) {
- runtest.pass("ExternalInterface::parseProperties()");
+ runtest.pass("plugin::ExternalInterface::parseProperties()");
} else {
- runtest.fail("ExternalInterface::parseProperties()");
+ runtest.fail("plugin::ExternalInterface::parseProperties()");
}
xml = "<object><property
id=\"test1\"><string>foobar</string></property><property
id=\"test2\"><number>12.34</number></property><property
id=\"test3\"><number>56</number></property></object>";
- np = ExternalInterface::parseXML(xml);
+ np = plugin::ExternalInterface::parseXML(xml);
if (NPVARIANT_IS_OBJECT(np.get())) {
- runtest.pass("ExternalInterface::parseXML(object)");
+ runtest.pass("plugin::ExternalInterface::parseXML(object)");
} else {
- runtest.fail("ExternalInterface::parseXML(object)");
+ runtest.fail("plugin::ExternalInterface::parseXML(object)");
}
std::vector<std::string> iargs;
- str = ExternalInterface::makeString("barfoo");
+ str = plugin::ExternalInterface::makeString("barfoo");
iargs.push_back(str);
- str = ExternalInterface::makeNumber(135.78);
+ str = plugin::ExternalInterface::makeNumber(135.78);
iargs.push_back(str);
- str = ExternalInterface::makeInvoke("barbyfoo", iargs);
+ str = plugin::ExternalInterface::makeInvoke("barbyfoo", iargs);
xml = "<invoke name=\"barbyfoo\"
returntype=\"xml\"><arguments><string>barfoo</string><number>135.78</number></arguments></invoke>";
// std::cout << str << std::endl;
regcomp (®ex_pat, xml.c_str(), REG_NOSUB|REG_NEWLINE);
if (regexec (®ex_pat, reinterpret_cast<const char*>(str.c_str()), 0,
(regmatch_t *)0, 0) == 0) {
- runtest.pass("ExternalInterface::makeInvoke()");
+ runtest.pass("plugin::ExternalInterface::makeInvoke()");
} else {
- runtest.fail("ExternalInterface::makeInvoke()");
+ runtest.fail("plugin::ExternalInterface::makeInvoke()");
}
xml =
"<arguments><string>barfoo</string><number>135.78</number><number>89</number></arguments>";
- std::vector<GnashNPVariant> arguments =
ExternalInterface::parseArguments(xml);
+ std::vector<GnashNPVariant> arguments =
plugin::ExternalInterface::parseArguments(xml);
np = arguments[0];
str = NPStringToString(NPVARIANT_TO_STRING(np.get()));
double dub = NPVARIANT_TO_DOUBLE(arguments[1].get());
int val = NPVARIANT_TO_INT32(arguments[2].get());
if ((arguments.size() == 3) && (str == "barfoo")
&& (dub == 135.78) && (val == 89)) {
- runtest.pass("ExternalInterface::parseArguments()");
+ runtest.pass("plugin::ExternalInterface::parseArguments()");
} else {
- runtest.fail("ExternalInterface::parseArguments()");
+ runtest.fail("plugin::ExternalInterface::parseArguments()");
}
// Parse an invoke message
xml = "<invoke name=\"barbyfoo\"
returntype=\"xml\"><arguments><string>barfoo</string><number>135.78</number></arguments></invoke>";
- ExternalInterface::invoke_t *invoke = ExternalInterface::parseInvoke(xml);
+ plugin::ExternalInterface::invoke_t *invoke =
plugin::ExternalInterface::parseInvoke(xml);
str = NPStringToString(NPVARIANT_TO_STRING(invoke->args[0].get()));
if ((invoke->name == "barbyfoo") && (invoke->type == "xml")
&& (NPVARIANT_IS_STRING(invoke->args[0].get()))
@@ -278,9 +278,9 @@ main(int argc, char *argv[])
&& (NPVARIANT_IS_DOUBLE(invoke->args[1].get()))
&& (NPVARIANT_TO_DOUBLE(invoke->args[1].get()) == 135.78)
) {
- runtest.pass("ExternalInterface::parseInvoke()");
+ runtest.pass("plugin::ExternalInterface::parseInvoke()");
} else {
- runtest.fail("ExternalInterface::parseInvoke()");
+ runtest.fail("plugin::ExternalInterface::parseInvoke()");
}
}
http://git.savannah.gnu.org/cgit//commit/?id=269cb63eb61a0e62946b1aa6ca78d1a8477d4356
commit 269cb63eb61a0e62946b1aa6ca78d1a8477d4356
Author: Benjamin Wolsey <address@hidden>
Date: Mon Jan 10 16:20:44 2011 +0100
Put the second ExternalInterface class in namespace plugin,
as having two definitions of gnash::ExternalInterface not only
corrupts execution, but is also silly and confusing.
diff --git a/libcore/ExternalInterface.cpp b/libcore/ExternalInterface.cpp
index 1ed01a9..b25e2cf 100644
--- a/libcore/ExternalInterface.cpp
+++ b/libcore/ExternalInterface.cpp
@@ -177,8 +177,6 @@ ExternalInterface::ExternalEventCheck(int fd)
boost::shared_ptr<ExternalInterface::invoke_t>
ExternalInterface::parseInvoke(const std::string &xml)
{
- // GNASH_REPORT_FUNCTION;
-
boost::shared_ptr<ExternalInterface::invoke_t> invoke;
if (xml.empty()) {
return invoke;
@@ -226,8 +224,6 @@ ExternalInterface::parseInvoke(const std::string &xml)
as_value
ExternalInterface::parseXML(const std::string &xml)
{
- // GNASH_REPORT_FUNCTION;
-
if (xml.empty()) {
return as_value();
}
diff --git a/plugin/npapi/callbacks.cpp b/plugin/npapi/callbacks.cpp
index 06a1017..dba00ba 100644
--- a/plugin/npapi/callbacks.cpp
+++ b/plugin/npapi/callbacks.cpp
@@ -172,10 +172,10 @@ GotoFrame (NPObject *npobj, NPIdentifier /* name */,
const NPVariant *args,
std::string varname;
if (argCount == 1) {
- std::string str = ExternalInterface::convertNPVariant(&args[0]);
+ std::string str =
plugin::ExternalInterface::convertNPVariant(&args[0]);
std::vector<std::string> iargs;
iargs.push_back(str);
- str = ExternalInterface::makeInvoke("GotoFrame", iargs);
+ str = plugin::ExternalInterface::makeInvoke("GotoFrame", iargs);
// Write the message to the Control FD.
size_t ret = gpso->writePlayer(str);
@@ -213,7 +213,7 @@ IsPlaying (NPObject *npobj, NPIdentifier /* name */, const
NPVariant */*args */,
if (argCount == 0) {
std::vector<std::string> iargs;
- std::string str = ExternalInterface::makeInvoke("IsPlaying", iargs);
+ std::string str = plugin::ExternalInterface::makeInvoke("IsPlaying",
iargs);
// Write the message to the Control FD.
size_t ret = gpso->writePlayer(str);
@@ -230,7 +230,7 @@ IsPlaying (NPObject *npobj, NPIdentifier /* name */, const
NPVariant */*args */,
return false;
}
- GnashNPVariant value = ExternalInterface::parseXML(data);
+ GnashNPVariant value = plugin::ExternalInterface::parseXML(data);
if (NPVARIANT_TO_BOOLEAN(value.get()) == true) {
BOOLEAN_TO_NPVARIANT(true, *result);
} else {
@@ -267,12 +267,12 @@ LoadMovie (NPObject *npobj, NPIdentifier /* name */,
const NPVariant *args,
if (argCount == 2) {
// int layer = NPVARIANT_TO_INT32(args[0]);
// std::string url = NPStringToString(NPVARIANT_TO_STRING(args[1]));
- std::string str = ExternalInterface::convertNPVariant(&args[0]);
+ std::string str =
plugin::ExternalInterface::convertNPVariant(&args[0]);
std::vector<std::string> iargs;
iargs.push_back(str);
- str = ExternalInterface::convertNPVariant(&args[1]);
+ str = plugin::ExternalInterface::convertNPVariant(&args[1]);
iargs.push_back(str);
- str = ExternalInterface::makeInvoke("LoadMovie", iargs);
+ str = plugin::ExternalInterface::makeInvoke("LoadMovie", iargs);
// Write the message to the Control FD.
size_t ret = gpso->writePlayer(str);
@@ -313,14 +313,14 @@ Pan (NPObject *npobj, NPIdentifier /* name */, const
NPVariant *args,
GnashPluginScriptObject *gpso = (GnashPluginScriptObject *)npobj;
if (argCount == 3) {
- std::string str = ExternalInterface::convertNPVariant(&args[0]);
+ std::string str =
plugin::ExternalInterface::convertNPVariant(&args[0]);
std::vector<std::string> iargs;
iargs.push_back(str);
- str = ExternalInterface::convertNPVariant(&args[1]);
+ str = plugin::ExternalInterface::convertNPVariant(&args[1]);
iargs.push_back(str);
- str = ExternalInterface::convertNPVariant(&args[2]);
+ str = plugin::ExternalInterface::convertNPVariant(&args[2]);
iargs.push_back(str);
- str = ExternalInterface::makeInvoke("Pan", iargs);
+ str = plugin::ExternalInterface::makeInvoke("Pan", iargs);
// Write the message to the Control FD.
size_t ret = gpso->writePlayer(str);
@@ -357,7 +357,7 @@ PercentLoaded (NPObject *npobj, NPIdentifier /* name */,
const NPVariant */*args
if (argCount == 0) {
std::vector<std::string> iargs;
- std::string str = ExternalInterface::makeInvoke("PercentLoaded",
iargs);
+ std::string str =
plugin::ExternalInterface::makeInvoke("PercentLoaded", iargs);
// Write the message to the Control FD.
size_t ret = gpso->writePlayer(str);
@@ -374,7 +374,7 @@ PercentLoaded (NPObject *npobj, NPIdentifier /* name */,
const NPVariant */*args
return false;
}
- GnashNPVariant value = ExternalInterface::parseXML(data);
+ GnashNPVariant value = plugin::ExternalInterface::parseXML(data);
if (NPVARIANT_IS_INT32(value.get())) {
INT32_TO_NPVARIANT(NPVARIANT_TO_INT32(value.get()), *result);
} else {
@@ -407,7 +407,7 @@ Play (NPObject *npobj, NPIdentifier /* name */, const
NPVariant */*args */,
if (argCount == 0) {
std::vector<std::string> iargs;
- std::string str = ExternalInterface::makeInvoke("Play", iargs);
+ std::string str = plugin::ExternalInterface::makeInvoke("Play", iargs);
// Write the message to the Control FD.
size_t ret = gpso->writePlayer(str);
@@ -445,7 +445,7 @@ Rewind (NPObject *npobj, NPIdentifier /* name */, const
NPVariant */*args */,
if (argCount == 0) {
std::vector<std::string> iargs;
- std::string str = ExternalInterface::makeInvoke("Rewind", iargs);
+ std::string str = plugin::ExternalInterface::makeInvoke("Rewind",
iargs);
// Write the message to the Control FD.
size_t ret = gpso->writePlayer(str);
@@ -486,16 +486,16 @@ SetZoomRect (NPObject *npobj, NPIdentifier /* name */,
const NPVariant *args,
GnashPluginScriptObject *gpso = (GnashPluginScriptObject *)npobj;
if (argCount == 4) {
- std::string str = ExternalInterface::convertNPVariant(&args[0]);
+ std::string str =
plugin::ExternalInterface::convertNPVariant(&args[0]);
std::vector<std::string> iargs;
iargs.push_back(str);
- str = ExternalInterface::convertNPVariant(&args[1]);
+ str = plugin::ExternalInterface::convertNPVariant(&args[1]);
iargs.push_back(str);
- str = ExternalInterface::convertNPVariant(&args[2]);
+ str = plugin::ExternalInterface::convertNPVariant(&args[2]);
iargs.push_back(str);
- str = ExternalInterface::convertNPVariant(&args[3]);
+ str = plugin::ExternalInterface::convertNPVariant(&args[3]);
iargs.push_back(str);
- str = ExternalInterface::makeInvoke("SetZoomRect", iargs);
+ str = plugin::ExternalInterface::makeInvoke("SetZoomRect", iargs);
// Write the message to the Control FD.
size_t ret = gpso->writePlayer(str);
@@ -532,7 +532,7 @@ StopPlay (NPObject *npobj, NPIdentifier /* name */, const
NPVariant */*args */,
if (argCount == 0) {
std::vector<std::string> iargs;
- std::string str = ExternalInterface::makeInvoke("StopPlay", iargs);
+ std::string str = plugin::ExternalInterface::makeInvoke("StopPlay",
iargs);
// Write the message to the Control FD.
size_t ret = gpso->writePlayer(str);
@@ -571,10 +571,10 @@ Zoom (NPObject *npobj, NPIdentifier /* name */, const
NPVariant *args,
GnashPluginScriptObject *gpso = (GnashPluginScriptObject *)npobj;
if (argCount == 1) {
- std::string str = ExternalInterface::convertNPVariant(&args[0]);
+ std::string str =
plugin::ExternalInterface::convertNPVariant(&args[0]);
std::vector<std::string> iargs;
iargs.push_back(str);
- str = ExternalInterface::makeInvoke("Zoom", iargs);
+ str = plugin::ExternalInterface::makeInvoke("Zoom", iargs);
// Write the message to the Control FD.
size_t ret = gpso->writePlayer(str);
@@ -611,7 +611,7 @@ TotalFrames (NPObject *npobj, NPIdentifier /* name */,
const NPVariant */*args *
if (argCount == 0) {
std::vector<std::string> iargs;
- std::string str = ExternalInterface::makeInvoke("TotalFrames", iargs);
+ std::string str = plugin::ExternalInterface::makeInvoke("TotalFrames",
iargs);
// Write the message to the Control FD.
size_t ret = gpso->writePlayer(str);
@@ -628,7 +628,7 @@ TotalFrames (NPObject *npobj, NPIdentifier /* name */,
const NPVariant */*args *
return false;
}
- GnashNPVariant value = ExternalInterface::parseXML(data);
+ GnashNPVariant value = plugin::ExternalInterface::parseXML(data);
if (NPVARIANT_IS_INT32(value.get())) {
value.copy(*result);
} else {
@@ -675,12 +675,12 @@ remoteCallback (NPObject *npobj, NPIdentifier name, const
NPVariant *args,
// Build the argument array
std::vector<std::string> fnargs;
for (uint32_t i=0; i<argCount; ++i) {
- std::string xml = ExternalInterface::convertNPVariant(&args[i]);
+ std::string xml =
plugin::ExternalInterface::convertNPVariant(&args[i]);
fnargs.push_back(xml);
}
- std::string str = ExternalInterface::makeInvoke(method, fnargs);
+ std::string str = plugin::ExternalInterface::makeInvoke(method, fnargs);
// Write the message to the Control FD.
size_t ret = gpso->writePlayer(str);
@@ -700,7 +700,7 @@ remoteCallback (NPObject *npobj, NPIdentifier name, const
NPVariant *args,
}
std::string answer;
- GnashNPVariant parsed = ExternalInterface::parseXML(data);
+ GnashNPVariant parsed = plugin::ExternalInterface::parseXML(data);
if (!NPVARIANT_IS_NULL(parsed.get())) {
answer = NPStringToString(NPVARIANT_TO_STRING(parsed.get()));
}
diff --git a/plugin/npapi/external.cpp b/plugin/npapi/external.cpp
index feda253..17a2497 100644
--- a/plugin/npapi/external.cpp
+++ b/plugin/npapi/external.cpp
@@ -35,6 +35,7 @@
#include <boost/algorithm/string/erase.hpp>
namespace gnash {
+namespace plugin {
// Create an Invoke message for the standalone Gnash
std::string
@@ -419,6 +420,7 @@ ExternalInterface::parseArguments(const std::string &xml)
return args;
}
+} // namespace plugin
} // namespace gnash
// local Variables:
diff --git a/plugin/npapi/external.h b/plugin/npapi/external.h
index f320e46..a0df10e 100644
--- a/plugin/npapi/external.h
+++ b/plugin/npapi/external.h
@@ -35,6 +35,8 @@
namespace gnash {
+namespace plugin {
+
struct ExternalInterface
{
typedef struct {
@@ -68,6 +70,7 @@ struct ExternalInterface
};
}
+}
#endif // GNASH_PLUGIN_EXTERNAL_H
diff --git a/plugin/npapi/plugin.cpp b/plugin/npapi/plugin.cpp
index 3dcced5..a297631 100644
--- a/plugin/npapi/plugin.cpp
+++ b/plugin/npapi/plugin.cpp
@@ -772,7 +772,7 @@ nsPluginInstance::processPlayerRequest(gchar* buf, gsize
linelen)
return false;
}
- ExternalInterface::invoke_t *invoke = ExternalInterface::parseInvoke(buf);
+ plugin::ExternalInterface::invoke_t *invoke =
plugin::ExternalInterface::parseInvoke(buf);
if (!invoke->name.empty()) {
gnash::log_debug("Requested method is: %s", invoke->name);
@@ -877,12 +877,12 @@ nsPluginInstance::processPlayerRequest(gchar* buf, gsize
linelen)
// We got a result from invoking the Javascript method
std::stringstream ss;
if (invokeResult) {
- ss << ExternalInterface::convertNPVariant(&result);
+ ss << plugin::ExternalInterface::convertNPVariant(&result);
NPN_ReleaseVariantValue(&result);
} else {
// Send response
// FIXME: "securityError" also possible, check domain
- ss << ExternalInterface::makeString("Error");
+ ss << plugin::ExternalInterface::makeString("Error");
}
size_t ret = _scriptObject->writePlayer(ss.str());
if (ret != ss.str().size()) {
diff --git a/plugin/npapi/pluginScriptObject.cpp
b/plugin/npapi/pluginScriptObject.cpp
index b083eb2..b9480bb 100644
--- a/plugin/npapi/pluginScriptObject.cpp
+++ b/plugin/npapi/pluginScriptObject.cpp
@@ -613,11 +613,11 @@ GnashPluginScriptObject::SetVariable(const std::string
&name,
const NPVariant& value)
{
std::vector<std::string> iargs;
- std::string str = ExternalInterface::makeString(name);
+ std::string str = plugin::ExternalInterface::makeString(name);
iargs.push_back(str);
- str = ExternalInterface::convertNPVariant(&value);
+ str = plugin::ExternalInterface::convertNPVariant(&value);
iargs.push_back(str);
- str = ExternalInterface::makeInvoke("SetVariable", iargs);
+ str = plugin::ExternalInterface::makeInvoke("SetVariable", iargs);
log_debug("Trying to set a value for %s.", name);
@@ -640,9 +640,9 @@ GnashNPVariant
GnashPluginScriptObject::GetVariable(const std::string &name)
{
std::vector<std::string> iargs;
- std::string str = ExternalInterface::makeString(name);
+ std::string str = plugin::ExternalInterface::makeString(name);
iargs.push_back(str);
- str = ExternalInterface::makeInvoke("GetVariable", iargs);
+ str = plugin::ExternalInterface::makeInvoke("GetVariable", iargs);
log_debug("Trying to get a value for %s.", name);
@@ -670,7 +670,7 @@ GnashPluginScriptObject::GetVariable(const std::string
&name)
return GnashNPVariant();
}
- GnashNPVariant parsed = ExternalInterface::parseXML(data);
+ GnashNPVariant parsed = plugin::ExternalInterface::parseXML(data);
printNPVariant(&parsed.get());
@@ -812,7 +812,7 @@ GnashPluginScriptObject::closePipe(int fd)
if (fd > 0) {
// Send a Quit message to the player before closing the pipe.
std::vector<std::string> args;
- std::string str = ExternalInterface::makeInvoke("Quit", args);
+ std::string str = plugin::ExternalInterface::makeInvoke("Quit", args);
writePlayer(fd, str);
::shutdown(fd, SHUT_RDWR);
http://git.savannah.gnu.org/cgit//commit/?id=b74a9e044f1d36a568dea2d46dcd4908425a6a36
commit b74a9e044f1d36a568dea2d46dcd4908425a6a36
Author: Benjamin Wolsey <address@hidden>
Date: Mon Jan 10 16:07:38 2011 +0100
Fix typo.
diff --git a/libcore/ExternalInterface.h b/libcore/ExternalInterface.h
index e24873e..d640fe2 100644
--- a/libcore/ExternalInterface.h
+++ b/libcore/ExternalInterface.h
@@ -68,7 +68,7 @@ struct DSOEXPORT ExternalInterface
const std::vector<as_value> &args);
static std::string makeString (const std::string &str) {
- return "<string>" + str + "</string";
+ return "<string>" + str + "</string>";
}
DSOEXPORT static size_t writeBrowser(int fd, const std::string &xml);
http://git.savannah.gnu.org/cgit//commit/?id=8b891a95cb2873e671f04cab03b796dc118e5663
commit 8b891a95cb2873e671f04cab03b796dc118e5663
Author: Benjamin Wolsey <address@hidden>
Date: Mon Jan 10 16:07:08 2011 +0100
Drop useless declarations.
diff --git a/libcore/ExternalInterface.h b/libcore/ExternalInterface.h
index 5460e3f..e24873e 100644
--- a/libcore/ExternalInterface.h
+++ b/libcore/ExternalInterface.h
@@ -54,9 +54,6 @@ struct DSOEXPORT ExternalInterface
return ei._toXML(obj);
}
- static std::string escapeXML(as_object &obj);
- static std::string unescapeXML(as_object &obj);
-
static as_value parseXML(const std::string &xml);
static std::vector<as_value> parseArguments(const std::string &xml);
http://git.savannah.gnu.org/cgit//commit/?id=0170d1ce22313ac8316be9523cfccedbfdfca9d7
commit 0170d1ce22313ac8316be9523cfccedbfdfca9d7
Author: Benjamin Wolsey <address@hidden>
Date: Mon Jan 10 16:06:42 2011 +0100
Drop more unneeded functions.
diff --git a/libcore/ExternalInterface.cpp b/libcore/ExternalInterface.cpp
index fdcb2dc..1ed01a9 100644
--- a/libcore/ExternalInterface.cpp
+++ b/libcore/ExternalInterface.cpp
@@ -325,24 +325,6 @@ ExternalInterface::makeInvoke (const std::string &method,
return ss.str();
}
-std::string
-ExternalInterface::makeArray (std::vector<std::string> &args)
-{
- std::stringstream ss;
- std::vector<std::string>::iterator it;
- int index = 0;
-
- ss << "<array>";
- for (it=args.begin(); it != args.end(); ++it) {
- ss << "<property id=\"" << index << "\">" << *it << "</property>";
- index++;
- }
-
- ss << "</array>";
-
- return ss.str();
-}
-
size_t
ExternalInterface::writeBrowser(int fd, const std::string &data)
{
diff --git a/libcore/ExternalInterface.h b/libcore/ExternalInterface.h
index bceb044..5460e3f 100644
--- a/libcore/ExternalInterface.h
+++ b/libcore/ExternalInterface.h
@@ -74,9 +74,6 @@ struct DSOEXPORT ExternalInterface
return "<string>" + str + "</string";
}
- static std::string makeArray (std::vector<std::string> &args);
- static std::string makeObject (std::map<std::string, std::string> &args);
-
DSOEXPORT static size_t writeBrowser(int fd, const std::string &xml);
DSOEXPORT static std::string readBrowser(int fd);
http://git.savannah.gnu.org/cgit//commit/?id=b956e6cce918e42ca6e0be61ef8ad6646c015531
commit b956e6cce918e42ca6e0be61ef8ad6646c015531
Author: Benjamin Wolsey <address@hidden>
Date: Mon Jan 10 16:02:36 2011 +0100
Drop unused functions in illegally duplicated class.
diff --git a/libcore/ExternalInterface.cpp b/libcore/ExternalInterface.cpp
index 0fcddfa..fdcb2dc 100644
--- a/libcore/ExternalInterface.cpp
+++ b/libcore/ExternalInterface.cpp
@@ -326,91 +326,6 @@ ExternalInterface::makeInvoke (const std::string &method,
}
std::string
-ExternalInterface::makeNull ()
-{
- return "<null/>";
-}
-
-std::string
-ExternalInterface::makeTrue ()
-{
- return "<true/>";
-}
-
-std::string
-ExternalInterface::makeFalse ()
-{
- return "<false/>";
-}
-
-std::string
-ExternalInterface::makeString (const std::string &str)
-{
- std::stringstream ss;
-
- ss << "<string>" << str << "</string>";
-
- return ss.str();
-}
-
-
-std::string
-ExternalInterface::makeProperty (const std::string &id, double num)
-{
- std::stringstream ss;
- ss << num;
- return makeProperty(id, ss.str());
-}
-
-std::string
-ExternalInterface::makeProperty (const std::string &id, int num)
-{
- std::stringstream ss;
- ss << num;
- return makeProperty(id, ss.str());
-}
-
-std::string
-ExternalInterface::makeProperty (const std::string &id, const std::string
&data)
-{
- std::stringstream ss;
-
- ss << "<property id=\"" << id << "\">" << data << "</property>";
-
- return ss.str();
-}
-
-std::string
-ExternalInterface::makeNumber (double num)
-{
- std::stringstream ss;
-
- ss << "<number>" << num << "</number>";
-
- return ss.str();
-}
-
-std::string
-ExternalInterface::makeNumber (int num)
-{
- std::stringstream ss;
-
- ss << "<number>" << num << "</number>";
-
- return ss.str();
-}
-
-std::string
-ExternalInterface::makeNumber (unsigned int num)
-{
- std::stringstream ss;
-
- ss << "<number>" << num << "</number>";
-
- return ss.str();
-}
-
-std::string
ExternalInterface::makeArray (std::vector<std::string> &args)
{
std::stringstream ss;
@@ -428,21 +343,6 @@ ExternalInterface::makeArray (std::vector<std::string>
&args)
return ss.str();
}
-std::string
-ExternalInterface::makeObject (std::map<std::string, std::string> &args)
-{
- std::stringstream ss;
- std::map<std::string, std::string>::iterator it;
-
- ss << "<object>";
- for (it = args.begin(); it != args.end(); ++it) {
- ss << "<property id=\"" << it->first << "\">" << it->second <<
"</property>";
- }
- ss << "</object>";
-
- return ss.str();
-}
-
size_t
ExternalInterface::writeBrowser(int fd, const std::string &data)
{
diff --git a/libcore/ExternalInterface.h b/libcore/ExternalInterface.h
index fd1faa5..bceb044 100644
--- a/libcore/ExternalInterface.h
+++ b/libcore/ExternalInterface.h
@@ -70,16 +70,10 @@ struct DSOEXPORT ExternalInterface
DSOEXPORT static std::string makeInvoke (const std::string &method,
const std::vector<as_value> &args);
- static std::string makeNull ();
- static std::string makeTrue ();
- static std::string makeFalse ();
- static std::string makeString (const std::string &str);
- static std::string makeProperty (const std::string &str, const std::string
&data);
- static std::string makeProperty (const std::string &str, double num);
- static std::string makeProperty (const std::string &str, int num);
- static std::string makeNumber (double num);
- static std::string makeNumber (int num);
- static std::string makeNumber (unsigned int num);
+ static std::string makeString (const std::string &str) {
+ return "<string>" + str + "</string";
+ }
+
static std::string makeArray (std::vector<std::string> &args);
static std::string makeObject (std::map<std::string, std::string> &args);
-----------------------------------------------------------------------
Summary of changes:
libcore/ExternalInterface.cpp | 122 -----------------------------------
libcore/ExternalInterface.h | 18 +----
plugin/npapi/callbacks.cpp | 56 ++++++++--------
plugin/npapi/external.cpp | 2 +
plugin/npapi/external.h | 3 +
plugin/npapi/plugin.cpp | 6 +-
plugin/npapi/pluginScriptObject.cpp | 14 ++--
plugin/npapi/test.cpp | 116 +++++++++++++++++-----------------
8 files changed, 104 insertions(+), 233 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. ebb9d7695d8fdfb16c307e52dd7f09cd53649c1c,
Benjamin Wolsey <=