CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 07/12/16 09:17:22
Modified files:
. : ChangeLog
gui : Player.cpp
Log message:
* gui/Player.cpp: allow setting base URL with -P (to support
<embed base="myurl"> tag; move parsing of flashvars and query
string before the base URL gets set.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5185&r2=1.5186
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.73&r2=1.74
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5185
retrieving revision 1.5186
diff -u -b -r1.5185 -r1.5186
--- ChangeLog 15 Dec 2007 17:13:58 -0000 1.5185
+++ ChangeLog 16 Dec 2007 09:17:21 -0000 1.5186
@@ -1,3 +1,9 @@
+2007-12-16 Benjamin Wolsey <[EMAIL PROTECTED]>
+
+ * gui/Player.cpp: allow setting base URL with -P (to support
+ <embed base="myurl"> tag; move parsing of flashvars and query
+ string before the base URL gets set.
+
2007-12-15 Rob Savoye <[EMAIL PROTECTED]>
* testsuite/libamf.all/test_sol.cpp: When reading a SOL file,
Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- gui/Player.cpp 7 Dec 2007 15:34:36 -0000 1.73
+++ gui/Player.cpp 16 Dec 2007 09:17:22 -0000 1.74
@@ -274,6 +274,31 @@
return EXIT_FAILURE;
}
+ // Parse querystring (before FlashVars, see
testsuite/misc-ming.all/FlashVarsTest*)
+ setFlashVars(URL(_url).querystring());
+
+ // Parse parameters
+ StringNoCaseEqual noCaseCompare;
+ for ( map<string,string>::const_iterator it=params.begin(),
+ itEnd=params.end(); it != itEnd; ++it)
+ {
+ if ( noCaseCompare(it->first, "flashvars") )
+ {
+ setFlashVars(it->second);
+ continue;
+ }
+
+ if ( noCaseCompare(it->first, "base") )
+ {
+ setBaseUrl(it->second);
+ continue;
+ }
+
+ // too much noise...
+ //log_debug(_("Unused parameter %s = %s"),
+ // it->first.c_str(), it->second.c_str());
+ }
+
// Set base url for this movie (needed before parsing)
gnash::set_base_url(URL(_baseurl));
@@ -317,28 +342,8 @@
// Start loader thread
_movie_def->completeLoad();
- // Parse querystring (before FlashVars, see
testsuite/misc-ming.all/FlashVarsTest*)
- setFlashVars(URL(_url).querystring());
-
- // Parse parameters
- for ( map<string,string>::const_iterator it=params.begin(),
- itEnd=params.end(); it != itEnd; ++it)
- {
- // todo: use a case-insensitive string type
- if ( it->first == "flashvars" || it->first == "FlashVars" )
- {
- setFlashVars(it->second);
- continue;
- }
-
- // too much noise...
- //log_debug(_("Unused parameter %s = %s"),
- // it->first.c_str(), it->second.c_str());
- }
-
_gui->setMovieDefinition(_movie_def);
-
if (!delay) {
delay = (unsigned int) (1000 / movie_fps) ; // milliseconds per frame
}
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
