CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/07/26 19:48:38
Modified files:
. : ChangeLog
gui : Player.cpp Player.h
Log message:
* gui/Player.{cpp,h}: Be more verbose on gui initialization error.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3838&r2=1.3839
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.h?cvsroot=gnash&r1=1.14&r2=1.15
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3838
retrieving revision 1.3839
diff -u -b -r1.3838 -r1.3839
--- ChangeLog 26 Jul 2007 19:43:23 -0000 1.3838
+++ ChangeLog 26 Jul 2007 19:48:38 -0000 1.3839
@@ -1,5 +1,6 @@
2007-07-26 Sandro Santilli <[EMAIL PROTECTED]>
+ * gui/Player.{cpp,h}: Be more verbose on gui initialization error.
* gui/kde.cpp (createWindow): return false if renderer creation
failed.
* gui/kde_glue_agg.cpp (createRenderHandler): throw an exception if
Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- gui/Player.cpp 26 Jul 2007 15:40:35 -0000 1.61
+++ gui/Player.cpp 26 Jul 2007 19:48:38 -0000 1.62
@@ -279,6 +279,7 @@
// which is *required* during movie loading
if ( ! _gui->init(argc, &argv) )
{
+ std::cerr << "Could not initialize gui " <<
guiName(_guiFlavor) << std::endl;
return EXIT_FAILURE;
}
@@ -408,6 +409,44 @@
throw GnashException(ss.str());
}
+/* public */
+std::string
+Player::guiName(GuiFlavor which)
+{
+ switch (which)
+ {
+
+ case guiGTK:
+ return "GTK";
+
+ case guiKDE:
+ return "KDE";
+
+ case guiSDL:
+ return "SDL";
+
+ case guiAQUA:
+ return "AQUA";
+
+ case guiRISCOS:
+ return "RISCOS";
+
+ case guiFLTK:
+ return "FLTK";
+
+ case guiFB:
+ return "FB";
+
+ case guiNull:
+ return "NULL";
+
+ }
+
+ std::stringstream ss;
+ ss << "unknown(" << which << ")";
+ return ss.str();
+}
+
Player::GuiFlavor
Player::parseGuiFlavorByName(const std::string& flavorName)
{
Index: gui/Player.h
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gui/Player.h 26 Jul 2007 14:39:09 -0000 1.14
+++ gui/Player.h 26 Jul 2007 19:48:38 -0000 1.15
@@ -14,7 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
//
//
@@ -149,6 +148,9 @@
setGuiFlavor(flav);
}
+ /// Return name of given Gui flavor
+ std::string guiName(GuiFlavor which);
+
void setGuiFlavor(GuiFlavor which) { _guiFlavor = which; }
/// Set the base url for this run.
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
