From 082e4ae4a7423032dc9217490284c10e4a18b9f5 Mon Sep 17 00:00:00 2001 From: Barrett17 Date: Sun, 25 Nov 2018 11:59:45 +0100 Subject: [PATCH] Codec Kit: Rename files --- headers/os/codec/CodecRoster.h | 6 +++--- .../os/codec/{DecoderPlugin.h => Decoder.h} | 0 .../os/codec/{EncoderPlugin.h => Encoder.h} | 0 headers/os/codec/MediaExtractor.h | 4 ++-- headers/os/codec/MediaStreamer.h | 2 +- headers/os/codec/MediaWriter.h | 4 ++-- headers/os/codec/{ReaderPlugin.h => Reader.h} | 0 .../os/codec/{StreamerPlugin.h => Streamer.h} | 0 headers/os/codec/{WriterPlugin.h => Writer.h} | 0 headers/private/codec/AddOnManager.h | 14 ++++++------- headers/private/codec/PluginManager.h | 15 +++++++------ .../media/plugins/ape_reader/APEReader.h | 2 +- .../media/plugins/ffmpeg/AVCodecDecoder.h | 7 ++----- .../media/plugins/ffmpeg/AVCodecEncoder.h | 4 ++-- .../media/plugins/ffmpeg/AVFormatReader.h | 3 +-- .../media/plugins/ffmpeg/AVFormatWriter.h | 2 +- .../media/plugins/ffmpeg/FFmpegPlugin.h | 8 +++---- src/kits/codec/ChunkCache.h | 3 +-- .../codec/{DecoderPlugin.cpp => Decoder.cpp} | 6 +++--- .../codec/{EncoderPlugin.cpp => Encoder.cpp} | 6 +++--- src/kits/codec/Jamfile | 21 ++++++++++--------- .../codec/{ReaderPlugin.cpp => Reader.cpp} | 2 +- .../{StreamerPlugin.cpp => Streamer.cpp} | 2 +- .../codec/{WriterPlugin.cpp => Writer.cpp} | 2 +- src/kits/media/MediaDecoder.cpp | 2 +- src/kits/media/MediaEncoder.cpp | 2 +- 26 files changed, 56 insertions(+), 61 deletions(-) rename headers/os/codec/{DecoderPlugin.h => Decoder.h} (100%) rename headers/os/codec/{EncoderPlugin.h => Encoder.h} (100%) rename headers/os/codec/{ReaderPlugin.h => Reader.h} (100%) rename headers/os/codec/{StreamerPlugin.h => Streamer.h} (100%) rename headers/os/codec/{WriterPlugin.h => Writer.h} (100%) rename src/kits/codec/{DecoderPlugin.cpp => Decoder.cpp} (97%) rename src/kits/codec/{EncoderPlugin.cpp => Encoder.cpp} (98%) rename src/kits/codec/{ReaderPlugin.cpp => Reader.cpp} (97%) rename src/kits/codec/{StreamerPlugin.cpp => Streamer.cpp} (93%) rename src/kits/codec/{WriterPlugin.cpp => Writer.cpp} (96%) diff --git a/headers/os/codec/CodecRoster.h b/headers/os/codec/CodecRoster.h index 92432a86d9..687c7431be 100644 --- a/headers/os/codec/CodecRoster.h +++ b/headers/os/codec/CodecRoster.h @@ -7,9 +7,9 @@ #include -#include -#include -#include +#include +#include +#include namespace BPrivate { diff --git a/headers/os/codec/DecoderPlugin.h b/headers/os/codec/Decoder.h similarity index 100% rename from headers/os/codec/DecoderPlugin.h rename to headers/os/codec/Decoder.h diff --git a/headers/os/codec/EncoderPlugin.h b/headers/os/codec/Encoder.h similarity index 100% rename from headers/os/codec/EncoderPlugin.h rename to headers/os/codec/Encoder.h diff --git a/headers/os/codec/MediaExtractor.h b/headers/os/codec/MediaExtractor.h index 38360c091a..10395e231c 100644 --- a/headers/os/codec/MediaExtractor.h +++ b/headers/os/codec/MediaExtractor.h @@ -10,8 +10,8 @@ #define _MEDIA_EXTRACTOR_H -#include "ReaderPlugin.h" -#include "DecoderPlugin.h" +#include +#include namespace BPrivate { diff --git a/headers/os/codec/MediaStreamer.h b/headers/os/codec/MediaStreamer.h index 89f4af58c2..3ba3964bb4 100644 --- a/headers/os/codec/MediaStreamer.h +++ b/headers/os/codec/MediaStreamer.h @@ -8,7 +8,7 @@ #include -#include "StreamerPlugin.h" +#include "Streamer.h" namespace BPrivate { diff --git a/headers/os/codec/MediaWriter.h b/headers/os/codec/MediaWriter.h index 30f9be51dd..1dd4872d00 100644 --- a/headers/os/codec/MediaWriter.h +++ b/headers/os/codec/MediaWriter.h @@ -5,11 +5,11 @@ #ifndef _MEDIA_WRITER_H #define _MEDIA_WRITER_H +#include #include +#include -#include "EncoderPlugin.h" #include "TList.h" -#include "WriterPlugin.h" namespace BPrivate { diff --git a/headers/os/codec/ReaderPlugin.h b/headers/os/codec/Reader.h similarity index 100% rename from headers/os/codec/ReaderPlugin.h rename to headers/os/codec/Reader.h diff --git a/headers/os/codec/StreamerPlugin.h b/headers/os/codec/Streamer.h similarity index 100% rename from headers/os/codec/StreamerPlugin.h rename to headers/os/codec/Streamer.h diff --git a/headers/os/codec/WriterPlugin.h b/headers/os/codec/Writer.h similarity index 100% rename from headers/os/codec/WriterPlugin.h rename to headers/os/codec/Writer.h diff --git a/headers/private/codec/AddOnManager.h b/headers/private/codec/AddOnManager.h index b947fc5d7b..1ead4ba48f 100644 --- a/headers/private/codec/AddOnManager.h +++ b/headers/private/codec/AddOnManager.h @@ -16,14 +16,14 @@ */ -#include "DataExchange.h" -#include "TList.h" +#include +#include +#include +#include +#include +#include -#include "DecoderPlugin.h" -#include "EncoderPlugin.h" -#include "ReaderPlugin.h" -#include "StreamerPlugin.h" -#include "WriterPlugin.h" +#include "TList.h" namespace BPrivate { diff --git a/headers/private/codec/PluginManager.h b/headers/private/codec/PluginManager.h index 7b863b7928..b18b740e09 100644 --- a/headers/private/codec/PluginManager.h +++ b/headers/private/codec/PluginManager.h @@ -10,15 +10,14 @@ #include - -#include "DecoderPlugin.h" -#include "EncoderPlugin.h" -#include "ReaderPlugin.h" -#include "StreamerPlugin.h" -#include "WriterPlugin.h" - -#include +#include +#include #include +#include +#include +#include + +#include "TList.h" namespace BPrivate { namespace media { diff --git a/src/add-ons/media/plugins/ape_reader/APEReader.h b/src/add-ons/media/plugins/ape_reader/APEReader.h index 8ca5333cbc..f68dfea00b 100644 --- a/src/add-ons/media/plugins/ape_reader/APEReader.h +++ b/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 diff --git a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h index 322cda65f6..d19a2f5142 100644 --- a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h +++ b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h @@ -13,8 +13,9 @@ //! libavcodec based decoder for Haiku - +#include #include +#include extern "C" { @@ -28,10 +29,6 @@ extern "C" { #include "timestamp.h" } - -#include "DecoderPlugin.h" -#include "ReaderPlugin.h" - #include "CodecTable.h" #include "gfx_util.h" diff --git a/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h b/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h index f120c7c88e..4de06fcdb1 100644 --- a/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h +++ b/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h @@ -6,16 +6,16 @@ #define AVCODEC_ENCODER_H +#include #include + extern "C" { #include "avcodec.h" #include "swscale.h" #include "libavutil/fifo.h" } -#include "EncoderPlugin.h" - typedef AVCodecID CodecID; diff --git a/src/add-ons/media/plugins/ffmpeg/AVFormatReader.h b/src/add-ons/media/plugins/ffmpeg/AVFormatReader.h index f812fe526f..e88b450518 100644 --- a/src/add-ons/media/plugins/ffmpeg/AVFormatReader.h +++ b/src/add-ons/media/plugins/ffmpeg/AVFormatReader.h @@ -6,11 +6,10 @@ #define AV_FORMAT_READER_H +#include #include #include -#include "ReaderPlugin.h" - class AVFormatReader : public Reader { public: diff --git a/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h b/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h index 2a70076abf..5d680ba355 100644 --- a/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h +++ b/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h @@ -6,9 +6,9 @@ #define AV_FORMAT_WRITER_H +#include #include -#include "WriterPlugin.h" extern "C" { #include "avformat.h" diff --git a/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.h b/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.h index 66c0935750..f7cf62c6ec 100644 --- a/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.h +++ b/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.h @@ -12,10 +12,10 @@ #include -#include "DecoderPlugin.h" -#include "EncoderPlugin.h" -#include "ReaderPlugin.h" -#include "WriterPlugin.h" +#include +#include +#include +#include class FFmpegPlugin : public ReaderPlugin, public DecoderPlugin, diff --git a/src/kits/codec/ChunkCache.h b/src/kits/codec/ChunkCache.h index 0083fdd28b..a90b8431c6 100644 --- a/src/kits/codec/ChunkCache.h +++ b/src/kits/codec/ChunkCache.h @@ -8,12 +8,11 @@ #include #include +#include #include #include #include -#include "ReaderPlugin.h" - namespace BPrivate { namespace media { diff --git a/src/kits/codec/DecoderPlugin.cpp b/src/kits/codec/Decoder.cpp similarity index 97% rename from src/kits/codec/DecoderPlugin.cpp rename to src/kits/codec/Decoder.cpp index a5506af09f..34309e0a44 100644 --- a/src/kits/codec/DecoderPlugin.cpp +++ b/src/kits/codec/Decoder.cpp @@ -4,13 +4,13 @@ */ -#include "DecoderPlugin.h" +#include + +#include #include #include -#include - Decoder::Decoder() : diff --git a/src/kits/codec/EncoderPlugin.cpp b/src/kits/codec/Encoder.cpp similarity index 98% rename from src/kits/codec/EncoderPlugin.cpp rename to src/kits/codec/Encoder.cpp index 42fc7ba4a6..a9f67d308d 100644 --- a/src/kits/codec/EncoderPlugin.cpp +++ b/src/kits/codec/Encoder.cpp @@ -5,13 +5,13 @@ */ -#include "EncoderPlugin.h" +#include + +#include #include #include -#include - Encoder::Encoder() : diff --git a/src/kits/codec/Jamfile b/src/kits/codec/Jamfile index 2b46be1559..ddf4814fcb 100644 --- a/src/kits/codec/Jamfile +++ b/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 diff --git a/src/kits/codec/ReaderPlugin.cpp b/src/kits/codec/Reader.cpp similarity index 97% rename from src/kits/codec/ReaderPlugin.cpp rename to src/kits/codec/Reader.cpp index 42711b04ca..ec4ff802e6 100644 --- a/src/kits/codec/ReaderPlugin.cpp +++ b/src/kits/codec/Reader.cpp @@ -7,7 +7,7 @@ */ -#include "ReaderPlugin.h" +#include #include diff --git a/src/kits/codec/StreamerPlugin.cpp b/src/kits/codec/Streamer.cpp similarity index 93% rename from src/kits/codec/StreamerPlugin.cpp rename to src/kits/codec/Streamer.cpp index 77e210e3af..b447122367 100644 --- a/src/kits/codec/StreamerPlugin.cpp +++ b/src/kits/codec/Streamer.cpp @@ -4,7 +4,7 @@ */ -#include "StreamerPlugin.h" +#include Streamer::Streamer() diff --git a/src/kits/codec/WriterPlugin.cpp b/src/kits/codec/Writer.cpp similarity index 96% rename from src/kits/codec/WriterPlugin.cpp rename to src/kits/codec/Writer.cpp index fc2d127c75..f681b072da 100644 --- a/src/kits/codec/WriterPlugin.cpp +++ b/src/kits/codec/Writer.cpp @@ -5,7 +5,7 @@ */ -#include "WriterPlugin.h" +#include #include diff --git a/src/kits/media/MediaDecoder.cpp b/src/kits/media/MediaDecoder.cpp index 868d178b40..eba8aee072 100644 --- a/src/kits/media/MediaDecoder.cpp +++ b/src/kits/media/MediaDecoder.cpp @@ -4,7 +4,7 @@ * DESCR: ***********************************************************************/ #include -#include +#include #include #include "PluginManager.h" #include "MediaDebug.h" diff --git a/src/kits/media/MediaEncoder.cpp b/src/kits/media/MediaEncoder.cpp index 4030efb93e..fd8b32407c 100644 --- a/src/kits/media/MediaEncoder.cpp +++ b/src/kits/media/MediaEncoder.cpp @@ -9,7 +9,7 @@ #include -#include +#include #include #include