Media Kit: Update private code

headers/os/media/MediaDecoder.h

@@ -5,12 +5,12 @@
 #include <MediaFormats.h>
 
 namespace BPrivate {
-	class Decoder;
+	class BDecoder;
 }
 namespace BPrivate {
 	namespace media {
-		class Decoder;
-		class DecoderPlugin;
+		class BDecoder;
+		class BDecoderPlugin;
 	}
 }
 
@@ -47,7 +47,7 @@ class BMediaDecoder {
 
 		status_t AttachToDecoder();
 
-		BPrivate::media::Decoder	*fDecoder;
+		BPrivate::media::BDecoder* fDecoder;
 		status_t			fInitStatus;
 
 		/* fbc data and virtuals */

headers/os/media/MediaEncoder.h

@@ -10,8 +10,8 @@
 
 namespace BPrivate {
 	namespace media {
-		class Encoder;
-		class EncoderPlugin;
+		class BEncoder;
+		class BEncoderPlugin;
 	}
 }
 
@@ -84,7 +84,7 @@ private:
 			void				ReleaseEncoder();
 
 			uint32				_reserved_was_fEncoderMgr;
-			Encoder*			fEncoder;
+			BEncoder*			fEncoder;
 
 			int32				fEncoderID;
 			bool				fFormatValid;

headers/os/media/MediaFile.h

@@ -15,9 +15,9 @@
 
 namespace BPrivate {
 	namespace media {
-		class MediaExtractor;
-		class MediaStreamer;
-		class MediaWriter;
+		class BMediaExtractor;
+		class BMediaStreamer;
+		class BMediaWriter;
 	}
 	class _AddonManager;
 }
@@ -162,18 +162,18 @@ private:
 			status_t			ControlFile(int32 selector, void* ioData,
 									size_t size);
 
-			BPrivate::media::MediaExtractor* fExtractor;
+			BPrivate::media::BMediaExtractor* fExtractor;
 			int32				_reserved_BMediaFile_was_fExtractorID;
 			int32				fTrackNum;
 			status_t			fErr;
 
 			BPrivate::_AddonManager* fEncoderMgr;
 			BPrivate::_AddonManager* fWriterMgr;
-			BPrivate::media::MediaWriter* fWriter;
+			BPrivate::media::BMediaWriter* fWriter;
 			int32				fWriterID;
 			media_file_format	fMFI;
 
-			BPrivate::media::MediaStreamer* fStreamer;
+			BPrivate::media::BMediaStreamer* fStreamer;
 
 			bool				fFileClosed;
 			bool				fDeleteSource;

headers/os/media/MediaTrack.h

@@ -10,10 +10,10 @@
 
 
 namespace BPrivate { namespace media {
-	class Decoder;
-	class Encoder;
-	class MediaExtractor;
-	class MediaWriter;
+	class BDecoder;
+	class BEncoder;
+	class BMediaExtractor;
+	class BMediaWriter;
 } }
 
 class BMessage;
@@ -219,12 +219,12 @@ private:
 
 	// For read-only access to a BMediaTrack
 								BMediaTrack(
-									BPrivate::media::MediaExtractor* extractor,
+									BPrivate::media::BMediaExtractor* extractor,
 									int32 streamIndex);
 
 	// For write-only access to a BMediaTrack
 								BMediaTrack(
-									BPrivate::media::MediaWriter* writer,
+									BPrivate::media::BMediaWriter* writer,
 									int32 streamIndex, media_format* format,
 									const media_codec_info* codecInfo);
 
@@ -235,9 +235,9 @@ private:
 
 private:
 			status_t			fInitStatus;
-			BPrivate::media::Decoder* fDecoder;
-			BPrivate::media::Decoder* fRawDecoder;
-			BPrivate::media::MediaExtractor* fExtractor;
+			BPrivate::media::BDecoder* fDecoder;
+			BPrivate::media::BDecoder* fRawDecoder;
+			BPrivate::media::BMediaExtractor* fExtractor;
 
 			int32				fStream;
 			int64				fCurrentFrame;
@@ -245,9 +245,9 @@ private:
 
 			media_codec_info	fCodecInfo;
 
-			BPrivate::media::Encoder* fEncoder;
+			BPrivate::media::BEncoder* fEncoder;
 			int32				fEncoderID;
-			BPrivate::media::MediaWriter* fWriter;
+			BPrivate::media::BMediaWriter* fWriter;
 			media_format		fFormat;
 
 			uint32				fWorkaroundFlags;

src/kits/media/MediaDecoder.cpp

@@ -199,7 +199,7 @@ BMediaDecoder::BMediaDecoder & operator=(const BMediaDecoder &);
 status_t
 BMediaDecoder::AttachToDecoder()
 {
-	class MediaDecoderChunkProvider : public ChunkProvider {
+	class MediaDecoderChunkProvider : public BChunkProvider {
 	private:
 		BMediaDecoder * fDecoder;
 	public:

src/kits/media/MediaEncoder.cpp

@@ -226,7 +226,7 @@ BMediaEncoder::ReleaseEncoder()
 status_t
 BMediaEncoder::_AttachToEncoder()
 {
-	class MediaEncoderChunkWriter : public ChunkWriter {
+	class MediaEncoderChunkWriter : public BChunkWriter {
 		public:
 			MediaEncoderChunkWriter(BMediaEncoder* encoder)
 			{

src/kits/media/MediaFile.cpp

@@ -526,7 +526,7 @@ BMediaFile::_InitReader(BDataIO* source, const BUrl* url, int32 flags)
 	if (fErr != B_OK)
 		return;
 
-	fExtractor = new(std::nothrow) MediaExtractor(source, flags);
+	fExtractor = new(std::nothrow) BMediaExtractor(source, flags);
 
 	if (fExtractor == NULL)
 		fErr = B_NO_MEMORY;
@@ -574,7 +574,7 @@ BMediaFile::_InitWriter(BDataIO* target, const BUrl* url,
 			return;
 	}
 
-	fWriter = new(std::nothrow) MediaWriter(target, fMFI);
+	fWriter = new(std::nothrow) BMediaWriter(target, fMFI);
 
 	if (fWriter == NULL)
 		fErr = B_NO_MEMORY;
@@ -597,7 +597,7 @@ BMediaFile::_InitStreamer(const BUrl& url, BDataIO** adapter)
 
 	TRACE(url.UrlString());
 
-	fStreamer = new(std::nothrow) MediaStreamer(url);
+	fStreamer = new(std::nothrow) BMediaStreamer(url);
 	if (fStreamer == NULL) {
 		fErr = B_NO_MEMORY;
 		return;

src/kits/media/MediaTrack.cpp

@@ -58,9 +58,9 @@ enum {
 	// TODO: move this (after name change?) to MediaDefs.h
 
 
-class RawDecoderChunkProvider : public ChunkProvider {
+class RawDecoderChunkProvider : public BChunkProvider {
 public:
-							RawDecoderChunkProvider(Decoder* decoder,
+							RawDecoderChunkProvider(BDecoder* decoder,
 								int buffer_size, int frame_size);
 	virtual					~RawDecoderChunkProvider();
 
@@ -69,7 +69,7 @@ public:
 								media_header* mediaHeader);
 
 private:
-			Decoder*		fDecoder;
+			BDecoder*		fDecoder;
 			void*			fBuffer;
 			int				fBufferSize;
 			int				fFrameSize;
@@ -839,7 +839,7 @@ BMediaTrack::Perform(int32 selector, void* data)
 // #pragma mark - private
 
 
-BMediaTrack::BMediaTrack(BPrivate::media::MediaExtractor* extractor,
+BMediaTrack::BMediaTrack(BPrivate::media::BMediaExtractor* extractor,
 	int32 stream)
 {
 	CALLED();
@@ -871,7 +871,7 @@ BMediaTrack::BMediaTrack(BPrivate::media::MediaExtractor* extractor,
 }
 
 
-BMediaTrack::BMediaTrack(BPrivate::media::MediaWriter* writer,
+BMediaTrack::BMediaTrack(BPrivate::media::BMediaWriter* writer,
 	int32 streamIndex, media_format* format,
 	const media_codec_info* codecInfo)
 {
@@ -971,7 +971,7 @@ BMediaTrack::SetupFormatTranslation(const media_format &from, media_format* to)
 		* from.u.raw_audio.channel_count;
 	media_format fromNotConst = from;
 
-	ChunkProvider* chunkProvider
+	BChunkProvider* chunkProvider
 		= new (std::nothrow) RawDecoderChunkProvider(fDecoder, buffer_size,
 			frame_size);
 	if (chunkProvider == NULL) {
@@ -1087,7 +1087,7 @@ status_t BMediaTrack::_Reserved_BMediaTrack_46(int32 arg, ...) { return B_ERROR;
 status_t BMediaTrack::_Reserved_BMediaTrack_47(int32 arg, ...) { return B_ERROR; }
 
 
-RawDecoderChunkProvider::RawDecoderChunkProvider(Decoder* decoder,
+RawDecoderChunkProvider::RawDecoderChunkProvider(BDecoder* decoder,
 	int buffer_size, int frame_size)
 {
 //	printf("RawDecoderChunkProvider: buffer_size %d, frame_size %d\n",