[haiku-commits] r36212 - in haiku/trunk: headers/os/media src/kits/media

From: axeld@xxxxxxxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Tue, 13 Apr 2010 15:01:56 +0200 (CEST)
Author: axeld
Date: 2010-04-13 15:01:56 +0200 (Tue, 13 Apr 2010)
New Revision: 36212
Changeset: http://dev.haiku-os.org/changeset/36212/haiku

Modified:
   haiku/trunk/headers/os/media/SoundPlayer.h
   haiku/trunk/src/kits/media/SoundPlayNode.cpp
   haiku/trunk/src/kits/media/SoundPlayer.cpp
Log:
* Reverted part of r34474 that broke binary compatibility.


Modified: haiku/trunk/headers/os/media/SoundPlayer.h
===================================================================
--- haiku/trunk/headers/os/media/SoundPlayer.h  2010-04-13 12:27:05 UTC (rev 
36211)
+++ haiku/trunk/headers/os/media/SoundPlayer.h  2010-04-13 13:01:56 UTC (rev 
36212)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009, Haiku, Inc. All rights reserved.
+ * Copyright 2009-2010, Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _SOUND_PLAYER_H
@@ -152,8 +152,9 @@
 
                        void                            
_NotifySoundDone(play_id sound, bool gotToPlay);
 
-       virtual void                            
_Notify(sound_player_notification what, ...);
-       virtual void                            _PlayBuffer(void* buffer, 
size_t size,
+       // TODO: those two shouldn't be virtual
+       virtual void                            
Notify(sound_player_notification what, ...);
+       virtual void                            PlayBuffer(void* buffer, size_t 
size,
                                                                        const 
media_raw_audio_format& format);
 
 private:

Modified: haiku/trunk/src/kits/media/SoundPlayNode.cpp
===================================================================
--- haiku/trunk/src/kits/media/SoundPlayNode.cpp        2010-04-13 12:27:05 UTC 
(rev 36211)
+++ haiku/trunk/src/kits/media/SoundPlayNode.cpp        2010-04-13 13:01:56 UTC 
(rev 36212)
@@ -829,7 +829,7 @@
        }
 
        if (fPlayer->HasData()) {
-               fPlayer->_PlayBuffer(buffer->Data(),
+               fPlayer->PlayBuffer(buffer->Data(),
                        fOutput.format.u.raw_audio.buffer_size, 
fOutput.format.u.raw_audio);
        } else
                memset(buffer->Data(), 0, 
fOutput.format.u.raw_audio.buffer_size);

Modified: haiku/trunk/src/kits/media/SoundPlayer.cpp
===================================================================
--- haiku/trunk/src/kits/media/SoundPlayer.cpp  2010-04-13 12:27:05 UTC (rev 
36211)
+++ haiku/trunk/src/kits/media/SoundPlayer.cpp  2010-04-13 13:01:56 UTC (rev 
36212)
@@ -871,7 +871,7 @@
 BSoundPlayer::_NotifySoundDone(play_id id, bool gotToPlay)
 {
        CALLED();
-       _Notify(B_SOUND_DONE, id, gotToPlay);
+       Notify(B_SOUND_DONE, id, gotToPlay);
 }
 
 
@@ -915,7 +915,7 @@
 
 
 void
-BSoundPlayer::_Notify(sound_player_notification what, ...)
+BSoundPlayer::Notify(sound_player_notification what, ...)
 {
        CALLED();
        if (fLocker.Lock()) {
@@ -927,7 +927,7 @@
 
 
 void
-BSoundPlayer::_PlayBuffer(void* buffer, size_t size,
+BSoundPlayer::PlayBuffer(void* buffer, size_t size,
        const media_raw_audio_format& format)
 {
        if (fLocker.Lock()) {
[haiku-commits] r36212 - in haiku/trunk: headers/os/media src/kits/media

Other related posts:
