[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/asobj/System.cpp testsui...
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] gnash ChangeLog server/asobj/System.cpp testsui... |
|
Date: |
Sun, 13 Apr 2008 18:27:43 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 08/04/13 18:27:43
Modified files:
. : ChangeLog
server/asobj : System.cpp
testsuite/actionscript.all: System.as
Log message:
* server/asobj/System.cpp: add windowlessDisable, reorder.
* testsuite/actionscript.all: test windowlessDisable.
That's what the WD part of the serverString refers to.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6264&r2=1.6265
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/System.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/System.as?cvsroot=gnash&r1=1.22&r2=1.23
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6264
retrieving revision 1.6265
diff -u -b -r1.6264 -r1.6265
--- ChangeLog 12 Apr 2008 17:22:43 -0000 1.6264
+++ ChangeLog 13 Apr 2008 18:27:42 -0000 1.6265
@@ -1,3 +1,8 @@
+2008-04-13 Benjamin Wolsey <address@hidden>
+
+ * server/asobj/System.cpp: add windowlessDisable, reorder.
+ * testsuite/actionscript.all: test windowlessDisable.
+
2008-04-12 Rob Savoye <address@hidden>
* libamf/element.cpp: Use new check_buffer() to reduce code
Index: server/asobj/System.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/System.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/asobj/System.cpp 11 Apr 2008 08:43:41 -0000 1.25
+++ server/asobj/System.cpp 13 Apr 2008 18:27:42 -0000 1.26
@@ -67,58 +67,43 @@
{
RcInitFile& rcfile = RcInitFile::getDefaultInstance();
- // "LNX 9,0,22,0", "MAC 8,0,99,0"
- // Override in gnashrc
- const std::string version = VM::get().getPlayerVersion();
+ //
+ // Filesystem, access, miscellaneous hardware information
+ //
- // "Windows XP", "Windows 2000", "Windows NT", "Windows 98/ME",
"Windows 95", "Windows CE", "Linux", "MacOS"
+ // "Windows XP", "Windows 2000", "Windows NT", "Windows 98/ME",
+ // "Windows 95", "Windows CE", "Linux", "MacOS"
// Override in gnashrc
const std::string os = VM::get().getOSName();
- // "Macromedia Windows", "Macromedia Linux", "Macromedia MacOS"
- // Override in gnashrc
- const std::string manufacturer = rcfile.getFlashSystemManufacturer();
+ const std::string language = systemLanguage();
+ // FIXME: these need to be implemented properly
// Does the NetStream object natively support SSL?
const bool hasTLS = false;
- //
- // Media
- //
-
- // Is audio available?
- const bool hasAudio = (get_sound_handler() != NULL);
+ // Microphone and camera access disabled
const bool avHardwareDisable = false;
- // TODO: these need to be implemented properly
- const bool hasAudioEncoder = true;
- const bool hasEmbeddedVideo = true;
- const bool hasIME = true;
- const bool hasMP3 = true;
- const bool hasPrinting = true;
- const bool hasScreenBroadcast = true;
- const bool hasScreenPlayback = true;
- const bool hasStreamingAudio = true;
- const bool hasStreamingVideo = true;
- const bool hasVideoEncoder = true;
+ // Not sure: seems to be whether the movie can 'float' above web pages,
+ // and is useful for disabling certain annoying adverts.
+ const bool windowlessDisable = false;
- //
- // Human interface
- //
-
- const std::string language = systemLanguage();
-
- // TODO: these need to be implemented properly.
+ const bool hasPrinting = true;
const bool hasAccessibility = true;
const bool isDebugger = false;
const bool localFileReadDisable = false;
- // "StandAlone", "External", "PlugIn", "ActiveX" (get from GUI)
- std::string playerType;
+ //
+ // Display information (needs active GUI)
+ //
// Documented to be a number, but is in fact a string.
std::string pixelAspectRatio;
+ // "StandAlone", "External", "PlugIn", "ActiveX" (get from GUI)
+ std::string playerType;
+
int screenResolutionX = 0;
int screenResolutionY = 0;
@@ -136,6 +121,38 @@
playerType =
(*movie_root::interfaceHandle)("System.capabilities.playerType", "");
}
+ //
+ // Media
+ //
+
+ // Is audio available?
+ const bool hasAudio = (get_sound_handler() != NULL);
+
+ // FIXME: these need to be implemented properly. They are mostly
+ // self-explanatory.
+ const bool hasAudioEncoder = true;
+ const bool hasEmbeddedVideo = true;
+ const bool hasIME = true;
+ const bool hasMP3 = true;
+ const bool hasScreenBroadcast = true;
+ const bool hasScreenPlayback = true;
+ const bool hasStreamingAudio = true;
+ const bool hasStreamingVideo = true;
+ const bool hasVideoEncoder = true;
+
+ //
+ // Player version
+ //
+
+ // "LNX 9,0,22,0", "MAC 8,0,99,0"
+ // Override in gnashrc
+ const std::string version = VM::get().getPlayerVersion();
+
+ // "Macromedia Windows", "Macromedia Linux", "Macromedia MacOS"
+ // Override in gnashrc
+ const std::string manufacturer = rcfile.getFlashSystemManufacturer();
+
+ // serverString
// A URL-encoded string to send system info to a server.
// Boolean values are represented as t or f.
// Privacy concerns should probably be addressed by
@@ -151,23 +168,24 @@
// TLS and hasTLS are documented for AS3, player version 9.
//
// WD is included in the server string for player version 9,
- // but not documented.
+ // but not documented. It corresponds to the equally undocumented
+ // windowlessDisable.
// This should be the standard order of parameters in the server
// string.
std::ostringstream serverString;
serverString << "&A=" << TF(hasAudio)
- << "&SA=" << hasStreamingAudio
- << "&SV=" << hasStreamingVideo
- << "&EV=" << hasEmbeddedVideo
- << "&MP3=" << hasMP3
- << "&AE=" << hasAudioEncoder
- << "&VE=" << hasVideoEncoder
- << "&ACC=" << hasAccessibility
- << "&PR=" << hasPrinting
- << "&SP=" << hasScreenPlayback
- << "&SB=" << hasScreenBroadcast
- << "&DEB=" << isDebugger
+ << "&SA=" << TF(hasStreamingAudio)
+ << "&SV=" << TF(hasStreamingVideo)
+ << "&EV=" << TF(hasEmbeddedVideo)
+ << "&MP3=" << TF(hasMP3)
+ << "&AE=" << TF(hasAudioEncoder)
+ << "&VE=" << TF(hasVideoEncoder)
+ << "&ACC=" << TF(hasAccessibility)
+ << "&PR=" << TF(hasPrinting)
+ << "&SP=" << TF(hasScreenPlayback)
+ << "&SB=" << TF(hasScreenBroadcast)
+ << "&DEB=" << TF(isDebugger)
<< "&V=" << URL::encode(version)
<< "&M=" << URL::encode(manufacturer)
<< "&R=" << screenResolutionX << "x" <<
screenResolutionY
@@ -177,10 +195,10 @@
<< "OS=" << URL::encode(os)
<< "&L=" << language
<< "&PT=" << playerType
- << "&AVD=" << avHardwareDisable
- << "&LFD=" << localFileReadDisable
- << "&WD="
- << "&TLS=" << hasTLS;
+ << "&AVD=" << TF(avHardwareDisable)
+ << "&LFD=" << TF(localFileReadDisable)
+ << "&WD=" << TF(windowlessDisable)
+ << "&TLS=" << TF(hasTLS);
static boost::intrusive_ptr<as_object> proto;
if ( proto == NULL )
@@ -216,6 +234,7 @@
proto->init_member("isDebugger", isDebugger, flags);
proto->init_member("localFileReadDisable",
localFileReadDisable, flags);
proto->init_member("hasTLS", hasTLS, flags);
+ proto->init_member("windowlessDisable", windowlessDisable,
flags);
}
return proto.get();
}
Index: testsuite/actionscript.all/System.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/System.as,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- testsuite/actionscript.all/System.as 11 Apr 2008 09:04:24 -0000
1.22
+++ testsuite/actionscript.all/System.as 13 Apr 2008 18:27:42 -0000
1.23
@@ -21,7 +21,7 @@
// execute it like this gnash -1 -r 0 -v out.swf
-rcsid="$Id: System.as,v 1.22 2008/04/11 09:04:24 bwy Exp $";
+rcsid="$Id: System.as,v 1.23 2008/04/13 18:27:42 bwy Exp $";
#include "check.as"
check_equals(typeof(System), 'object');
@@ -84,6 +84,7 @@
check_equals(typeof(System.capabilities.hasAudio), 'boolean');
check_equals(typeof(System.capabilities.hasAccessibility), 'boolean');
check_equals(typeof(System.capabilities.avHardwareDisable), 'boolean');
+check_equals(typeof(System.capabilities.windowlessDisable), 'boolean');
// Not present on Linux player version 9,0,115,0, is (?) on windows.
check_equals(typeof(System.capabilities.hasIME), 'boolean');
@@ -127,11 +128,11 @@
xcheck_equals(typeof(p.launch), 'function');
#if OUTPUT_VERSION > 6
- check_totals(52);
+ check_totals(53);
#else
# if OUTPUT_VERSION == 6
- check_totals(51);
+ check_totals(52);
# else
- check_totals(49);
+ check_totals(50);
# endif
#endif
- [Gnash-commit] gnash ChangeLog server/asobj/System.cpp testsui...,
Benjamin Wolsey <=