[Gnash-commit] /srv/bzr/gnash/trunk r9973: Register media handler before sound handler (next step would be having

[Sandro Santilli]

------------------------------------------------------------
revno: 9973
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Wed 2008-10-08 20:27:25 +0200
message:
  Register media handler before sound handler (next step would be having
  the sound handler cache the media handler pointer...)
modified:
  gui/Player.cpp
  testsuite/MovieTester.cpp

=== modified file 'gui/Player.cpp'
--- a/gui/Player.cpp    2008-09-29 18:35:49 +0000
+++ b/gui/Player.cpp    2008-10-08 18:27:25 +0000
@@ -299,8 +299,8 @@
     // a cache of setting some parameter before calling us...
     // (example: setDoSound(), setWindowId() etc.. ) 
     init_logfile();
+    init_media();
     init_sound();
-    init_media();
     init_gui();
    
     // gnash.cpp should check that a filename is supplied.

=== modified file 'testsuite/MovieTester.cpp'
--- a/testsuite/MovieTester.cpp 2008-09-29 20:29:32 +0000
+++ b/testsuite/MovieTester.cpp 2008-10-08 18:27:25 +0000
@@ -111,12 +111,12 @@
                throw GnashException("Could not load movie from "+url);
        }
 
+       // Initialize the testing media handlers
+       initTestingMediaHandlers();
+
        // Initialize the sound handler(s)
        initTestingSoundHandlers();
 
-       // Initialize the testing media handlers
-       initTestingMediaHandlers();
-
        _movie_root = &(VM::init(*_movie_def, _clock).getRoot());
 
        // Initialize viewport size with the one advertised in the header