* Reverted part of r34474 that broke binary compatibility.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36212 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-04-13 13:01:56 +00:00
parent 69bffde17e
commit 15c81466c4
3 changed files with 8 additions and 7 deletions
+4 -3
View File
@@ -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 @@ private:
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:
+1 -1
View File
@@ -829,7 +829,7 @@ SoundPlayNode::FillNextBuffer(bigtime_t eventTime)
}
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);
+3 -3
View File
@@ -871,7 +871,7 @@ void
BSoundPlayer::_NotifySoundDone(play_id id, bool gotToPlay)
{
CALLED();
_Notify(B_SOUND_DONE, id, gotToPlay);
Notify(B_SOUND_DONE, id, gotToPlay);
}
@@ -915,7 +915,7 @@ BSoundPlayer::_GetVolumeSlider()
void
BSoundPlayer::_Notify(sound_player_notification what, ...)
BSoundPlayer::Notify(sound_player_notification what, ...)
{
CALLED();
if (fLocker.Lock()) {
@@ -927,7 +927,7 @@ BSoundPlayer::_Notify(sound_player_notification what, ...)
void
BSoundPlayer::_PlayBuffer(void* buffer, size_t size,
BSoundPlayer::PlayBuffer(void* buffer, size_t size,
const media_raw_audio_format& format)
{
if (fLocker.Lock()) {