[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash/gui Player.cpp Player.h gnash.cpp
From: |
Benjamin Wolsey |
Subject: |
[Gnash-commit] gnash/gui Player.cpp Player.h gnash.cpp |
Date: |
Sat, 15 Mar 2008 11:33:41 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 08/03/15 11:33:41
Modified files:
gui : Player.cpp Player.h gnash.cpp
Log message:
* gui/gnash.cpp: change / add some long options and update help
output.
Add --fullscreen to allow starting in fullscreen mode.
* gui/Player.{h,cpp}: implement starting in fullscreen mode.
Someone was nagging about a --fullscreen option on irc.
Don't say we don't listen :)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.h?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.108&r2=1.109
Patches:
Index: Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- Player.cpp 13 Mar 2008 13:17:37 -0000 1.89
+++ Player.cpp 15 Mar 2008 11:33:41 -0000 1.90
@@ -85,11 +85,12 @@
_doSound(true),
_exitTimeout(0),
_movieDef(0),
- _maxAdvances(0)
+ _maxAdvances(0),
#ifdef GNASH_FPS_DEBUG
- ,_fpsDebugTime(0.0)
+ _fpsDebugTime(0.0),
#endif
- ,_hostfd(-1)
+ _hostfd(-1),
+ _startFullscreen(false)
{
init();
}
@@ -381,6 +382,9 @@
_gui->setTimeout(static_cast<unsigned int>(_exitTimeout * 1000));
}
+ if (!_windowID && _startFullscreen) {
+ _gui->setFullscreen();
+ }
_gui->run();
std::cerr << "Main loop ended, cleaning up" << std::endl;
Index: Player.h
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- Player.h 10 Mar 2008 20:07:05 -0000 1.26
+++ Player.h 15 Mar 2008 11:33:41 -0000 1.27
@@ -128,11 +128,14 @@
params[name] = value;
}
- void setHostFD(int fd)
- {
+ void setHostFD(int fd) {
_hostfd = fd;
}
+ void setStartFullscreen(bool x) {
+ _startFullscreen = x;
+ }
+
private:
void init();
@@ -210,6 +213,10 @@
// Filedescriptor to use for host application requests, -1 if none
int _hostfd;
+ // Whether to start Gnash in fullscreen mode.
+ // (Or what did you think it meant?)
+ bool _startFullscreen;
+
};
Index: gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- gnash.cpp 15 Mar 2008 10:45:48 -0000 1.108
+++ gnash.cpp 15 Mar 2008 11:33:41 -0000 1.109
@@ -109,13 +109,16 @@
<< _(" -t, --timeout <sec> Exit after the specified number of
seconds") << endl
<< _(" -u, --real-url <url> Set \"real\" URL of the movie") << endl
<< _(" -U, --base-url <url> Set \"base\" URL for resolving relative
URLs") << endl
- << _(" -P, --pass-vars <param> Set parameter (e.g.
\"FlashVars=A=1&b=2\")") << endl
+ << _(" -P, --param <param> Set parameter (e.g.
\"FlashVars=A=1&b=2\")") << endl
<< _(" -V, --version Print gnash's version number and exit")
<< endl
<< _(" -F, --fd <fd> Filedescriptor to use for external
communications") << endl
#ifdef GNASH_FPS_DEBUG
<< _(" -f, --debug-fps num Print FPS every num seconds (float).") <<
endl
#endif // def GNASH_FPS_DEBUG
<< endl
+ << _(" --max-advances num Exit after specified number of advances")
<< endl
+ << _(" --fullscreen Start in fullscreen mode") << endl
+ << endl
<< _("Keys:") << endl
<< endl
<< _(" CTRL-Q, CTRL-W Quit/Exit") << endl
@@ -181,6 +184,7 @@
{ 'p', 0, Arg_parser::no },
{ 's', "scale", Arg_parser::yes },
{ 256, "max-advances", Arg_parser::yes },
+ { 257, "fullscreen", Arg_parser::no },
{ 'c', 0, Arg_parser::no },
{ 'd', "delay", Arg_parser::yes },
{ 'x', "xid", Arg_parser::yes },
@@ -191,7 +195,7 @@
{ 'j', "width", Arg_parser::yes },
{ 'k', "height", Arg_parser::yes },
{ 'u', "real-url", Arg_parser::yes },
- { 'P', "pass-vars", Arg_parser::yes },
+ { 'P', "param", Arg_parser::yes },
{ 'U', "base-url", Arg_parser::yes },
{ 'g', "debugger", Arg_parser::no },
{ 'V', "version", Arg_parser::no },
@@ -254,6 +258,9 @@
case 256:
player.setMaxAdvances( parser.argument<unsigned long>(i));
break;
+ case 257:
+ player.setStartFullscreen(true);
+ break;
case 's':
player.setScale( fclamp(
parser.argument<float>(i),
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash/gui Player.cpp Player.h gnash.cpp,
Benjamin Wolsey <=