[Gnash-commit] /srv/bzr/gnash/trunk r12314: Haiku patches for recent media handling changes.

[Rob Savoye]

------------------------------------------------------------
revno: 12314 [merge]
author: Adrian Panasiuk <address@hidden>
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Mon 2010-07-19 11:52:45 -0600
message:
  Haiku patches for recent media handling changes.
modified:
  configure.ac
  libbase/GnashFactory.h
  libmedia/haiku/MediaHandlerHaiku.cpp
  libsound/mkit/sound_handler_mkit.cpp
  libsound/mkit/sound_handler_mkit.h

=== modified file 'configure.ac'
--- a/configure.ac      2010-07-17 15:09:14 +0000
+++ b/configure.ac      2010-07-19 13:55:09 +0000
@@ -931,18 +931,19 @@
         break;
       fi
     done,
-    [build_media_gst=yes
-     media_list="gst"]
+    [if test x"${build_haiku}" = xyes; then
+        build_media_ffmpeg=yes
+        build_media_haiku=yes
+        media_list="ffmpeg haiku"
+     else
+        build_media_gst=yes
+        media_list="gst"
+    fi]
 )
 
 MEDIA_CONFIG="${media_list}"
 AC_SUBST(MEDIA_CONFIG)
 
-dnl If we're on Haiku, there is only one supported media handler.
-if test x"${build_haiku}" = xyes; then
-    build_media_haiku=true
-fi
-
 AC_ARG_ENABLE(lirc, AC_HELP_STRING([--enable-lirc], [Disable support for 
Lirc]),
 [case "${enableval}" in
   yes) lirc=yes ;;

=== modified file 'libbase/GnashFactory.h'
--- a/libbase/GnashFactory.h    2010-07-14 20:07:06 +0000
+++ b/libbase/GnashFactory.h    2010-07-19 13:57:06 +0000
@@ -69,7 +69,7 @@
     typedef T*(*CreateHandler)();
     typedef std::map<std::string, CreateHandler> Handlers;
 
-    /// Get the MediaFactory singleton.
+    /// Get the GnashFactory singleton.
     static GnashFactory& instance() {
         static GnashFactory m;
         return m;
@@ -88,7 +88,7 @@
 
     }
 
-    /// Return a MediaHandler identified by a name.
+    /// Return a Handler identified by a name.
     //
     /// @param name     The name of the handler to return. An empty string
     ///                 will return the first available handler. If the
@@ -104,12 +104,12 @@
         return it->second();
     }
 
-    /// Register a MediaHandler with a particular name.
+    /// Register a Handler with a particular name.
     //
-    /// @param name     The name to register the MediaHandler under. Duplicated
+    /// @param name     The name to register the Handler under. Duplicated
     ///                 names will replace previous handlers!
     /// @param r        A pointer to a function that will return the 
-    ///                 MediaHandler when called.
+    ///                 Handler when called.
     void registerHandler(const Key& name, CreateHandler r) {
         _handlers[name] = r;
     }

=== modified file 'libmedia/haiku/MediaHandlerHaiku.cpp'
--- a/libmedia/haiku/MediaHandlerHaiku.cpp      2010-07-14 13:26:31 +0000
+++ b/libmedia/haiku/MediaHandlerHaiku.cpp      2010-07-19 13:55:09 +0000
@@ -17,6 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
+#include "MediaHandler.h"
 #include "MediaParser.h"
 
 #include "log.h"
@@ -38,7 +39,7 @@
 namespace haiku {
 
 /// Haiku based MediaHandler
-class DSOEXPORT MediaHandlerHaiku : public MediaHandler
+class MediaHandlerHaiku : public MediaHandler
 {
 public:
 
@@ -179,7 +180,7 @@
 
 #ifdef REGISTER_MEDIA_HANDLERS
 namespace {
-    RegisterMediaHandler<MediaHandlerHaiku> reg("haiku");
+    MediaFactory::RegisterHandler<MediaHandlerHaiku> reg("haiku");
 }
 #endif
 

=== modified file 'libsound/mkit/sound_handler_mkit.cpp'
--- a/libsound/mkit/sound_handler_mkit.cpp      2010-02-25 01:54:14 +0000
+++ b/libsound/mkit/sound_handler_mkit.cpp      2010-07-19 13:55:09 +0000
@@ -74,13 +74,17 @@
 namespace gnash {
 namespace sound {
 
-Mkit_sound_handler::Mkit_sound_handler()
-: _audioopen(false)
+Mkit_sound_handler::Mkit_sound_handler(media::MediaHandler* m)
+    :
+    sound_handler(m),
+    _audioopen(false)
 {
 }
 
-Mkit_sound_handler::Mkit_sound_handler(const std::string& wavefile)
-: _audioopen(false)
+Mkit_sound_handler::Mkit_sound_handler(media::MediaHandler* m, const 
std::string& wavefile)
+    :
+    sound_handler(m),
+    _audioopen(false)
 {
     if (! wavefile.empty() ) {
         file_stream.open(wavefile.c_str());
@@ -436,17 +440,17 @@
 
 
 sound_handler*
-create_sound_handler_mkit()
+create_sound_handler_mkit(media::MediaHandler* m)
 // Factory.
 {
-    return new Mkit_sound_handler;
+    return new Mkit_sound_handler(m);
 }
 
 sound_handler*
-create_sound_handler_mkit(const std::string& wave_file)
+create_sound_handler_mkit(media::MediaHandler* m, const std::string& wave_file)
 // Factory.
 {
-    return new Mkit_sound_handler(wave_file);
+    return new Mkit_sound_handler(m, wave_file);
 }
 
 

=== modified file 'libsound/mkit/sound_handler_mkit.h'
--- a/libsound/mkit/sound_handler_mkit.h        2010-03-11 01:47:08 +0000
+++ b/libsound/mkit/sound_handler_mkit.h        2010-07-19 13:55:09 +0000
@@ -78,9 +78,9 @@
     void MixAudio (boost::uint8_t *dst, const boost::uint8_t *src, 
boost::uint32_t len, int volume);
 
 public:
-    Mkit_sound_handler();
+    Mkit_sound_handler(media::MediaHandler* m);
 
-    Mkit_sound_handler(const std::string& wave_file);
+    Mkit_sound_handler(media::MediaHandler* m, const std::string& wave_file);
 
     ~Mkit_sound_handler();