Codec Kit: Rename files

headers/os/codec/CodecRoster.h

@@ -7,9 +7,9 @@
 
 
 #include <MediaDefs.h>
-#include <ReaderPlugin.h>
-#include <StreamerPlugin.h>
-#include <WriterPlugin.h>
+#include <Reader.h>
+#include <Streamer.h>
+#include <Writer.h>
 
 
 namespace BPrivate {

headers/os/codec/MediaExtractor.h

@@ -10,8 +10,8 @@
 #define _MEDIA_EXTRACTOR_H
 
 
-#include "ReaderPlugin.h"
-#include "DecoderPlugin.h"
+#include <Decoder.h>
+#include <Reader.h>
 
 
 namespace BPrivate {

headers/os/codec/MediaStreamer.h

@@ -8,7 +8,7 @@
 
 #include <Url.h>
 
-#include "StreamerPlugin.h"
+#include "Streamer.h"
 
 
 namespace BPrivate {

headers/os/codec/MediaWriter.h

@@ -5,11 +5,11 @@
 #ifndef _MEDIA_WRITER_H
 #define _MEDIA_WRITER_H
 
+#include <Encoder.h>
 #include <MetaData.h>
+#include <Writer.h>
 
-#include "EncoderPlugin.h"
 #include "TList.h"
-#include "WriterPlugin.h"
 
 
 namespace BPrivate {

headers/private/codec/AddOnManager.h

@@ -16,14 +16,14 @@
 */
 
 
-#include "DataExchange.h"
-#include "TList.h"
+#include <Decoder.h>
+#include <Entry.h>
+#include <Encoder.h>
+#include <Reader.h>
+#include <Streamer.h>
+#include <Writer.h>
 
-#include "DecoderPlugin.h"
-#include "EncoderPlugin.h"
-#include "ReaderPlugin.h"
-#include "StreamerPlugin.h"
-#include "WriterPlugin.h"
+#include "TList.h"
 
 
 namespace BPrivate {

headers/private/codec/PluginManager.h

@@ -10,15 +10,14 @@
 
 #include <string.h>
 
-
-#include "DecoderPlugin.h"
-#include "EncoderPlugin.h"
-#include "ReaderPlugin.h"
-#include "StreamerPlugin.h"
-#include "WriterPlugin.h"
-
-#include <TList.h>
+#include <Decoder.h>
+#include <Encoder.h>
 #include <Locker.h>
+#include <Reader.h>
+#include <Streamer.h>
+#include <Writer.h>
+
+#include "TList.h"
 
 
 namespace BPrivate { namespace media {

src/add-ons/media/plugins/ape_reader/APEReader.h

@@ -6,7 +6,7 @@
 #include "MonkeysAudioMIMEType.h"
 #include "PositionBridgeIO.h"
 
-#include "ReaderPlugin.h"		// Haiku private header
+#include "Reader.h"		// Haiku private header
 
 
 const int32		BLOCK_COUNT = 1024*4;	// number of blocks, get from MACLib at once

src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h

@@ -13,8 +13,9 @@
 
 //! libavcodec based decoder for Haiku
 
-
+#include <Decoder.h>
 #include <MediaFormats.h>
+#include <Reader.h>
 
 
 extern "C" {
@@ -28,10 +29,6 @@ extern "C" {
 	#include "timestamp.h"
 }
 
-
-#include "DecoderPlugin.h"
-#include "ReaderPlugin.h"
-
 #include "CodecTable.h"
 #include "gfx_util.h"
 

src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h

@@ -6,16 +6,16 @@
 #define AVCODEC_ENCODER_H
 
 
+#include <Encoder.h>
 #include <MediaFormats.h>
 
+
 extern "C" {
 	#include "avcodec.h"
 	#include "swscale.h"
 	#include "libavutil/fifo.h"
 }
 
-#include "EncoderPlugin.h"
-
 
 typedef AVCodecID CodecID;
 

src/add-ons/media/plugins/ffmpeg/AVFormatReader.h

@@ -6,11 +6,10 @@
 #define AV_FORMAT_READER_H
 
 
+#include <Reader.h>
 #include <Locker.h>
 #include <String.h>
 
-#include "ReaderPlugin.h"
-
 
 class AVFormatReader : public Reader {
 public:

src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h

@@ -6,9 +6,9 @@
 #define AV_FORMAT_WRITER_H
 
 
+#include <Writer.h>
 #include <Locker.h>
 
-#include "WriterPlugin.h"
 
 extern "C" {
 	#include "avformat.h"

src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.h

@@ -12,10 +12,10 @@
 
 #include <MediaFormats.h>
 
-#include "DecoderPlugin.h"
-#include "EncoderPlugin.h"
-#include "ReaderPlugin.h"
-#include "WriterPlugin.h"
+#include <Decoder.h>
+#include <Encoder.h>
+#include <Reader.h>
+#include <Writer.h>
 
 
 class FFmpegPlugin : public ReaderPlugin, public DecoderPlugin,

src/kits/codec/ChunkCache.h

@@ -8,12 +8,11 @@
 
 #include <Locker.h>
 #include <MediaDefs.h>
+#include <Reader.h>
 #include <RealtimeAlloc.h>
 #include <queue>
 #include <deque>
 
-#include "ReaderPlugin.h"
-
 
 namespace BPrivate {
 namespace media {

src/kits/codec/Decoder.cpp

@@ -4,13 +4,13 @@
  */
 
 
-#include "DecoderPlugin.h"
+#include <Decoder.h>
+
+#include <MediaFormats.h>
 
 #include <stdio.h>
 #include <string.h>
 
-#include <MediaFormats.h>
-
 
 Decoder::Decoder()
 	:

src/kits/codec/Encoder.cpp

@@ -5,13 +5,13 @@
  */
 
 
-#include "EncoderPlugin.h"
+#include <Encoder.h>
+
+#include <MediaFormats.h>
 
 #include <stdio.h>
 #include <string.h>
 
-#include <MediaFormats.h>
-
 
 Encoder::Encoder()
 	:

src/kits/codec/Jamfile

@@ -10,6 +10,7 @@ local architectureObject ;
 for architectureObject in [ MultiArchSubDirSetup ] {
 	on $(architectureObject) {
 
+		# This will be removed someday
 		SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits media ] ;
 
 		SharedLibrary [ MultiArchDefaultGristFiles libcodec.so ] :
@@ -20,23 +21,23 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			# Support API
 			MetaData.cpp
 			CodecRoster.cpp
-
-			# Codec Plugin API
-			ChunkCache.cpp
-			DecoderPlugin.cpp
-			EncoderPlugin.cpp
 			MediaExtractor.cpp
-			MediaPlugin.cpp
 			MediaStreamer.cpp
 			MediaWriter.cpp
-			PluginManager.cpp
-			ReaderPlugin.cpp
-			StreamerPlugin.cpp
-			WriterPlugin.cpp
+
+			# Codec Plugin API
+			MediaPlugin.cpp
+			Decoder.cpp
+			Encoder.cpp
+			Reader.cpp
+			Streamer.cpp
+			Writer.cpp
 
 			# Internal Functionality
+			ChunkCache.cpp
 			AddOnManager.cpp
 			FormatManager.cpp
+			PluginManager.cpp
 
 			# We need this to do not depend on libmedia
 			# will be removed when libmedia2 is introduced

src/kits/codec/Reader.cpp

@@ -7,7 +7,7 @@
  */
 
 
-#include "ReaderPlugin.h"
+#include <Reader.h>
 
 #include <stdio.h>
 

src/kits/codec/Streamer.cpp

@@ -4,7 +4,7 @@
  */
 
 
-#include "StreamerPlugin.h"
+#include <Streamer.h>
 
 
 Streamer::Streamer()

src/kits/codec/Writer.cpp

@@ -5,7 +5,7 @@
  */
 
 
-#include "WriterPlugin.h"
+#include <Writer.h>
 
 #include <stdio.h>
 

src/kits/media/MediaDecoder.cpp

@@ -4,7 +4,7 @@
  *  DESCR: 
  ***********************************************************************/
 #include <MediaDecoder.h>
-#include <DecoderPlugin.h>
+#include <Decoder.h>
 #include <new>
 #include "PluginManager.h"
 #include "MediaDebug.h"

src/kits/media/MediaEncoder.cpp

@@ -9,7 +9,7 @@
 
 #include <MediaEncoder.h>
 
-#include <EncoderPlugin.h>
+#include <Encoder.h>
 #include <PluginManager.h>
 
 #include <new>