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;