From 226be01113fed43246a777e5f04a3063feeaf9d5 Mon Sep 17 00:00:00 2001
From: Dario Casalinuovo <b.vitruvio@gmail.com>
Date: Sat, 5 Dec 2015 18:56:03 +0100
Subject: [PATCH] media_kit: General maintainance

* Move !missing_symbols.cpp in the legacy directory.
* Move useless methods in a Deprecated.cpp file.
* SetRealtimeFlags / GetRealtimeFlags are useless, they
don't make sense nowadays.
* The symbols are anyway preserved.
---
 headers/os/media/MediaRoster.h                | 19 ++++---
 src/kits/media/Jamfile                        |  1 +
 src/kits/media/MediaRoster.cpp                | 57 -------------------
 .../media/{ => legacy}/!missing_symbols.cpp   |  0
 4 files changed, 12 insertions(+), 65 deletions(-)
 rename src/kits/media/{ => legacy}/!missing_symbols.cpp (100%)

diff --git a/headers/os/media/MediaRoster.h b/headers/os/media/MediaRoster.h
index fcf3af1a0a..477c7966ba 100644
--- a/headers/os/media/MediaRoster.h
+++ b/headers/os/media/MediaRoster.h
@@ -320,9 +320,7 @@ public:
 										// _inOutCount defaults to 1
 										// if unspecified (NULL).
 
-	// General MediaKit configuration:
-			status_t			SetRealtimeFlags(uint32 enabledFlags);
-			status_t			GetRealtimeFlags(uint32* _enabledFlags);
+	// Returns the preferred audio buffer size
 			ssize_t				AudioBufferSizeFor(int32 channelCount,
 									uint32 sampleFormat, float frameRate,
 									bus_type busType = B_UNKNOWN_BUS);
@@ -345,10 +343,6 @@ public:
 	virtual						~BMediaRoster();
 
 private:
-	// This method is deprecated:
-			status_t			SetOutputBuffersFor(const media_source& output,
-									BBufferGroup* group,
-									bool willReclaim = false);
 
 	// Reserving virtual function slots.
 	virtual	status_t			_Reserved_MediaRoster_0(void*);
@@ -367,13 +361,22 @@ private:
 	// Roster() or CurrentRoster().
 								BMediaRoster();
 
-	// TODO: Looks like these can be safely removed:
+	// Those methods are deprecated or considered useless
+	// NOTE: planned to be removed once we break the API.
+			status_t			SetOutputBuffersFor(const media_source& output,
+									BBufferGroup* group,
+									bool willReclaim = false);
+
+			status_t			SetRealtimeFlags(uint32 enabledFlags);
+			status_t			GetRealtimeFlags(uint32* _enabledFlags);
+
 	static	status_t			ParseCommand(BMessage& reply);
 
 			status_t			GetDefaultInfo(media_node_id forDefault,
 									BMessage& _config);
 			status_t			SetRunningDefault(media_node_id forDefault,
 									const media_node& node);
+	// End of deprecated methods
 
 private:
 			uint32				_reserved_media_roster_[67];
diff --git a/src/kits/media/Jamfile b/src/kits/media/Jamfile
index 35cf1d556b..d885f46b3b 100644
--- a/src/kits/media/Jamfile
+++ b/src/kits/media/Jamfile
@@ -22,6 +22,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 		SharedLibrary [ MultiArchDefaultGristFiles libmedia.so ] :
 			# Private Media Kit
 			!missing_symbols.cpp
+			Deprecated.cpp
 			MediaRecorder.cpp
 
 			# Public Media Kit
diff --git a/src/kits/media/MediaRoster.cpp b/src/kits/media/MediaRoster.cpp
index 35c1ac4b25..95b37e6cb1 100644
--- a/src/kits/media/MediaRoster.cpp
+++ b/src/kits/media/MediaRoster.cpp
@@ -3344,22 +3344,6 @@ BMediaRoster::IsRunning()
 }
 
 
-status_t
-BMediaRoster::SetRealtimeFlags(uint32 enabled)
-{
-	UNIMPLEMENTED();
-	return B_ERROR;
-}
-
-
-status_t
-BMediaRoster::GetRealtimeFlags(uint32* _enabled)
-{
-	UNIMPLEMENTED();
-	return B_ERROR;
-}
-
-
 ssize_t
 BMediaRoster::AudioBufferSizeFor(int32 channelCount, uint32 sampleFormat,
 	float frameRate, bus_type busKind)
@@ -3585,21 +3569,8 @@ BMediaRoster::~BMediaRoster()
 	sDefaultInstance = NULL;
 }
 
-
 //	#pragma mark - private BMediaRoster
 
-
-//! Deprecated call.
-status_t
-BMediaRoster::SetOutputBuffersFor(const media_source& output,
-	BBufferGroup* group, bool willReclaim)
-{
-	UNIMPLEMENTED();
-	debugger("BMediaRoster::SetOutputBuffersFor missing\n");
-	return B_ERROR;
-}
-
-
 // FBC reserved virtuals
 status_t BMediaRoster::_Reserved_MediaRoster_0(void*) { return B_ERROR; }
 status_t BMediaRoster::_Reserved_MediaRoster_1(void*) { return B_ERROR; }
@@ -3622,34 +3593,6 @@ BMediaRoster::BMediaRoster()
 	Run();
 }
 
-
-// TODO: Looks like these can be safely removed:
-/*static*/ status_t
-BMediaRoster::ParseCommand(BMessage& reply)
-{
-	UNIMPLEMENTED();
-	return B_ERROR;
-}
-
-
-status_t
-BMediaRoster::GetDefaultInfo(media_node_id forDefault, BMessage& config)
-{
-	UNIMPLEMENTED();
-	return B_ERROR;
-}
-
-
-status_t
-BMediaRoster::SetRunningDefault(media_node_id forDefault,
-	const media_node& node)
-{
-	UNIMPLEMENTED();
-	return B_ERROR;
-}
-
-
 // #pragma mark - static variables
 
-
 BMediaRoster* BMediaRoster::sDefaultInstance = NULL;
diff --git a/src/kits/media/!missing_symbols.cpp b/src/kits/media/legacy/!missing_symbols.cpp
similarity index 100%
rename from src/kits/media/!missing_symbols.cpp
rename to src/kits/media/legacy/!missing_symbols.cpp