[Gnash-commit] /srv/bzr/gnash/trunk r12309: Fixing AHI audio handler

[Andrea Palmatè]

------------------------------------------------------------
revno: 12309
committer: Andrea Palmatè <address@hidden>
branch nick: gnash
timestamp: Sun 2010-07-18 19:10:05 +0200
message:
  Fixing AHI audio handler
modified:
  libsound/aos4/sound_handler_ahi.cpp
  libsound/aos4/sound_handler_ahi.h
  libsound/sound_handler.h

=== modified file 'libsound/aos4/sound_handler_ahi.cpp'
--- a/libsound/aos4/sound_handler_ahi.cpp       2010-07-12 21:18:16 +0000
+++ b/libsound/aos4/sound_handler_ahi.cpp       2010-07-18 17:10:05 +0000
@@ -98,8 +98,10 @@
 namespace gnash {
 namespace sound {
 
-AOS4_sound_handler::AOS4_sound_handler(const std::string& wavefile)
+AOS4_sound_handler::AOS4_sound_handler(media::MediaHandler* m,
+               const std::string& wavefile)
     :
+    sound_handler(m),
     _audioOpened(false),
        _closing(false)
 {
@@ -120,8 +122,9 @@
 
 }
 
-AOS4_sound_handler::AOS4_sound_handler()
+AOS4_sound_handler::AOS4_sound_handler(media::MediaHandler* m)
     :
+    sound_handler(m),
     _audioOpened(false),
        _closing(false)
 {
@@ -310,17 +313,17 @@
 }
 
 sound_handler*
-create_sound_handler_aos4()
+create_sound_handler_aos4(media::MediaHandler* m)
 // Factory.
 {
-    return new AOS4_sound_handler;
+    return new AOS4_sound_handler(m);
 }
 
 sound_handler*
-create_sound_handler_aos4(const std::string& wave_file)
+create_sound_handler_aos4(media::MediaHandler* m, const std::string& wave_file)
 // Factory.
 {
-    return new AOS4_sound_handler(wave_file);
+    return new AOS4_sound_handler(m, wave_file);
 }
 
 void

=== modified file 'libsound/aos4/sound_handler_ahi.h'
--- a/libsound/aos4/sound_handler_ahi.h 2010-03-11 01:47:08 +0000
+++ b/libsound/aos4/sound_handler_ahi.h 2010-07-18 17:10:05 +0000
@@ -110,9 +110,9 @@
 
 public:
 
-    AOS4_sound_handler();
+    AOS4_sound_handler(media::MediaHandler* m);
 
-    AOS4_sound_handler(const std::string& wave_file);
+    AOS4_sound_handler(media::MediaHandler* m, const std::string& wave_file);
 
     ~AOS4_sound_handler();
 

=== modified file 'libsound/sound_handler.h'
--- a/libsound/sound_handler.h  2010-07-14 10:47:13 +0000
+++ b/libsound/sound_handler.h  2010-07-18 17:10:05 +0000
@@ -582,7 +582,7 @@
 DSOEXPORT sound_handler* create_sound_handler_aos4(media::MediaHandler* m);
 
 /// @throw a SoundException if fails to initialize audio card.
-DSOEXPORT sound_handler* create_sound_handler_aos4(media::MediaHandler* m
+DSOEXPORT sound_handler* create_sound_handler_aos4(media::MediaHandler* m,
         const std::string& wave_file);
 
 #elif defined(SOUND_MKIT)