[Gnash-commit] gnash ChangeLog gui/gnash.cpp gui/gtk.cpp

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/03/17 18:38:12

Modified files:
        .              : ChangeLog 
        gui            : gnash.cpp gtk.cpp 

Log message:
                * gui/gtk.cpp, gui/gnash.cpp: make clear that media handler
                  version information is static.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5952&r2=1.5953
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.157&r2=1.158

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5952
retrieving revision 1.5953
diff -u -b -r1.5952 -r1.5953
--- ChangeLog   17 Mar 2008 17:41:02 -0000      1.5952
+++ ChangeLog   17 Mar 2008 18:38:11 -0000      1.5953
@@ -1,5 +1,10 @@
 2008-03-17 Benjamin Wolsey <address@hidden>
 
+       * gui/gtk.cpp, gui/gnash.cpp: make clear that media handler
+         version information is static.
+
+2008-03-17 Benjamin Wolsey <address@hidden>
+
        * gui/gtk.cpp: add media handler version information.
 
 2008-03-17 Sandro Santilli <address@hidden>

Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- gui/gnash.cpp       15 Mar 2008 21:46:20 -0000      1.110
+++ gui/gnash.cpp       17 Mar 2008 18:38:11 -0000      1.111
@@ -62,7 +62,7 @@
 using std::cout;
 
 std::vector<std::string> infiles;
-std::string url = "";
+std::string url;
 
 namespace {
 gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
@@ -164,10 +164,10 @@
         << _("   CXXFLAGS: ") << CXXFLAGS << endl;
 
 #ifdef HAVE_FFMPEG_AVCODEC_H
-    cout << _("Ffmpeg version is: ") << LIBAVCODEC_IDENT << endl;
+    cout << _("Built against ffmpeg version: ") << LIBAVCODEC_IDENT << endl;
 #endif
 #ifdef HAVE_GST_GST_H
-    cout << _("Gstreamer version is: ") << GST_VERSION_MAJOR << "."
+    cout << _("Built against gstreamer version: ") << GST_VERSION_MAJOR << "."
         << GST_VERSION_MINOR << "." << GST_VERSION_MICRO << endl;
 #endif
 }
@@ -346,7 +346,7 @@
                     }
                     break;
                 case 't':
-                    player.setExitTimeout( parser.argument<float>(i) );
+                    player.setExitTimeout(parser.argument<float>(i));
                     break;
                 case 'f':
     #ifdef GNASH_FPS_DEBUG

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -b -r1.157 -r1.158
--- gui/gtk.cpp 17 Mar 2008 17:41:03 -0000      1.157
+++ gui/gtk.cpp 17 Mar 2008 18:38:11 -0000      1.158
@@ -1371,13 +1371,13 @@
     comments.append(_("\nMedia: "));
     comments.append(MEDIA_CONFIG" ");
 #ifdef HAVE_GST_GST_H
-    comments.append(_("\nGstreamer version: "));
+    comments.append(_("\nBuilt against gstreamer version: "));
     std::ostringstream ss;
     ss << GST_VERSION_MAJOR << "." << GST_VERSION_MINOR << "." << 
GST_VERSION_MICRO;
     comments.append(ss.str());
 #endif
 #ifdef HAVE_FFMPEG_AVCODEC_H
-    comments.append(_("\nFfmpeg version: "));
+    comments.append(_("\nBuilt against ffmpeg version: "));
     comments.append(LIBAVCODEC_IDENT);
 #endif