[Gnash-commit] gnash ./ChangeLog backend/gnash.cpp

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/04/18 14:40:16

Modified files:
        .              : ChangeLog 
        backend        : gnash.cpp 

Log message:
        * backend/gnash.cpp: Turn off sound be default, since it doesn't
        work yet, and it grabs the sound device preventing other programs
        from working. Delete the gnash-dbg.log file if we don't want it
        writing to disk. Add -u option to set the root URL when navigating
        web pages with frames.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.211&tr2=1.212&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/gnash.cpp.diff?tr1=1.25&tr2=1.26&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.211 gnash/ChangeLog:1.212
--- gnash/ChangeLog:1.211       Sat Apr 15 20:19:27 2006
+++ gnash/ChangeLog     Tue Apr 18 14:40:15 2006
@@ -1,3 +1,11 @@
+2006-04-18  Rob Savoye  <address@hidden>
+
+       * backend/gnash.cpp: Turn off sound be default, since it doesn't
+       work yet, and it grabs the sound device preventing other programs
+       from working. Delete the gnash-dbg.log file if we don't want it
+       writing to disk. Add -u option to set the root URL when navigating
+       web pages with frames.
+
 2006-04-15  Sandro Santilli  <address@hidden>
 
        * backend/gnash.cpp: verbose SDL_SetVideoMode() failure message.
@@ -22,8 +30,7 @@
 
 2006-04-10  Sandro Santilli  <address@hidden>
 
-       * server/action.cpp: fixe compiler error
-       in as_global_parseint()
+       * server/action.cpp: fix compiler error in as_global_parseint()
 
 2006-04-10  Rob Savoye  <address@hidden>
 
Index: gnash/backend/gnash.cpp
diff -u gnash/backend/gnash.cpp:1.25 gnash/backend/gnash.cpp:1.26
--- gnash/backend/gnash.cpp:1.25        Sat Apr 15 20:19:27 2006
+++ gnash/backend/gnash.cpp     Tue Apr 18 14:40:16 2006
@@ -193,6 +193,7 @@
     int c;
     int render_arg;
     std::vector<const char*> infiles;
+    string url;
 #ifdef HAVE_GTK2
     GdkGLConfig *glconfig;
     GdkGLConfigMode glcmode;
@@ -234,7 +235,7 @@
     
     float      exit_timeout = 0;
     bool do_render = true;
-    bool do_sound = true;
+    bool do_sound = false;
     bool do_loop = true;
     bool sdl_abort = true;
     int  delay = 31;
@@ -258,9 +259,8 @@
     }
 
     dbglogfile.setWriteDisk(false);
-//    dbglogfile.removeLog();
     
-    while ((c = getopt (argc, argv, "hvaps:cfd:m:x:r:t:b:1ewj:k:")) != -1) {
+    while ((c = getopt (argc, argv, "hvaps:cfd:m:x:r:t:b:1ewj:k:u:")) != -1) {
        switch (c) {
          case 'h':
              usage ();
@@ -270,7 +270,6 @@
              dbglogfile << "Verbose output turned on" << endl;
              break;
          case 'w':
-//              dbglogfile.openLog();
               dbglogfile.setWriteDisk(true);
              dbglogfile << "Logging to disk enabled." << endl;
              break;
@@ -292,6 +291,10 @@
           case 'd':
               delay = strtol(optarg, NULL, 0);
               break;
+          case 'u':
+              url = optarg;
+              dbglogfile << "Setting root URL to: " << width << endl;
+              break;
           case 'j':
               width = strtol(optarg, NULL, 0);
               dbglogfile << "Setting width to: " << width << endl;
@@ -357,6 +360,12 @@
        optind++;
     }
 
+    // Remove the logfile that's created by default, since leaving a short
+    // file is confusing.
+    if (dbglogfile.getWriteDisk() == false) {
+        dbglogfile.removeLog();
+    }
+
     // No file names were supplied
     if (infiles.size() == 0) {
        printf("no input files\n");
@@ -915,7 +924,7 @@
                    0.0, 1.0, 0.0);
         glTranslatef (0.0, 0.0, -3.0);
         
-        gdk_gl_drawable_gl_end (gldrawable);    
+        gdk_gl_drawable_gl_end (gldrawable);
 // end of TEST_GRAPHIC
 #endif