From 15c81466c473ec4607aa3a160e0e8fcead2173ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Tue, 13 Apr 2010 13:01:56 +0000
Subject: [PATCH] * Reverted part of r34474 that broke binary compatibility.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36212 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/os/media/SoundPlayer.h   | 7 ++++---
 src/kits/media/SoundPlayNode.cpp | 2 +-
 src/kits/media/SoundPlayer.cpp   | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/headers/os/media/SoundPlayer.h b/headers/os/media/SoundPlayer.h
index 9938739ac8..a939552996 100644
--- a/headers/os/media/SoundPlayer.h
+++ b/headers/os/media/SoundPlayer.h
@@ -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:
diff --git a/src/kits/media/SoundPlayNode.cpp b/src/kits/media/SoundPlayNode.cpp
index 7c81f799e2..3d7f8209ea 100644
--- a/src/kits/media/SoundPlayNode.cpp
+++ b/src/kits/media/SoundPlayNode.cpp
@@ -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);
diff --git a/src/kits/media/SoundPlayer.cpp b/src/kits/media/SoundPlayer.cpp
index 541bf17abc..c37d400328 100644
--- a/src/kits/media/SoundPlayer.cpp
+++ b/src/kits/media/SoundPlayer.cpp
@@ -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()) {