[Gnash-commit] gnash ChangeLog utilities/processor.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/12/29 13:02:59

Modified files:
        .              : ChangeLog 
        utilities      : processor.cpp 

Log message:
        Add main movie base dir to local sandboxes, or gprocessor won't
        be able to play anything not explicitly in the sandboxes list.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5268&r2=1.5269
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.78&r2=1.79

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5268
retrieving revision 1.5269
diff -u -b -r1.5268 -r1.5269
--- ChangeLog   28 Dec 2007 19:37:00 -0000      1.5268
+++ ChangeLog   29 Dec 2007 13:02:58 -0000      1.5269
@@ -1,3 +1,9 @@
+2007-12-29 Sandro Santilli <address@hidden>
+
+       * utilities/processor.cpp: add main movie base dir
+         to local sandboxes, or gprocessor won't be able to 
+         play anything not explicitly in the sandboxes list.
+
 2007-12-28 Sandro Santilli <address@hidden>
 
        * doc/C/usermanual/usage/gnashrc.xml: update info about

Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- utilities/processor.cpp     18 Dec 2007 00:07:12 -0000      1.78
+++ utilities/processor.cpp     29 Dec 2007 13:02:59 -0000      1.79
@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: processor.cpp,v 1.78 2007/12/18 00:07:12 strk Exp $ */
+/* $Id: processor.cpp,v 1.79 2007/12/29 13:02:59 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -316,7 +316,21 @@
       }
       else
       {
-         md = gnash::create_library_movie(URL(filename), NULL, false);
+         URL url(filename);
+         if ( url.protocol() == "file" )
+         {
+             const std::string& path = url.path();
+#if 1 // add the *directory* the movie was loaded from to the local sandbox 
path
+             size_t lastSlash = path.find_last_of('/');
+             std::string dir = path.substr(0, lastSlash+1);
+             rcfile.addLocalSandboxPath(dir);
+             log_debug(_("%s appended to local sandboxes"), dir.c_str());
+#else // add the *file* to be loaded to the local sandbox path
+             rcfile.addLocalSandboxPath(path);
+             log_debug(_("%s appended to local sandboxes"), path.c_str());
+#endif
+         }
+         md = gnash::create_library_movie(url, NULL, false);
       }
     }
     catch (GnashException& ge)