diff --git a/build/jam/HeadersRules b/build/jam/HeadersRules index ac4d4cb6c1..e04edac5c2 100644 --- a/build/jam/HeadersRules +++ b/build/jam/HeadersRules @@ -436,9 +436,9 @@ rule FStandardOSHeaders local osIncludes = add-ons add-ons/file_system add-ons/graphics add-ons/input_server add-ons/registrar add-ons/screen_saver - add-ons/tracker app device drivers game interface - kernel locale media mail midi midi2 net storage - support translation ; + add-ons/tracker app codec device drivers game + interface kernel locale media mail midi midi2 + net storage support translation ; return [ FDirName $(HAIKU_TOP) headers os ] [ PublicHeaders $(osIncludes) ] ; @@ -450,9 +450,9 @@ rule FStandardHeaders architecture local osIncludes = add-ons add-ons/file_system add-ons/graphics add-ons/input_server add-ons/registrar add-ons/screen_saver - add-ons/tracker app device drivers game interface - kernel locale media mail midi midi2 net storage - support translation ; + add-ons/tracker app device drivers game codec + interface kernel locale media mail midi midi2 + net storage support translation ; local headers = ; diff --git a/build/jam/images/definitions/regular b/build/jam/images/definitions/regular index 9ce83e43b4..6deb65c75e 100644 --- a/build/jam/images/definitions/regular +++ b/build/jam/images/definitions/regular @@ -72,6 +72,7 @@ rule HaikuImageGetSystemLibs libalm.so libbe.so libbsd.so libbnetapi.so libbluetooth.so + libcodec.so libdebug.so libdebugger.so@primary libdevice.so diff --git a/src/kits/media/AddOnManager.h b/headers/os/codec/AddOnManager.h similarity index 100% rename from src/kits/media/AddOnManager.h rename to headers/os/codec/AddOnManager.h diff --git a/headers/private/media/DecoderPlugin.h b/headers/os/codec/DecoderPlugin.h similarity index 100% rename from headers/private/media/DecoderPlugin.h rename to headers/os/codec/DecoderPlugin.h diff --git a/headers/private/media/EncoderPlugin.h b/headers/os/codec/EncoderPlugin.h similarity index 100% rename from headers/private/media/EncoderPlugin.h rename to headers/os/codec/EncoderPlugin.h diff --git a/src/kits/media/FormatManager.h b/headers/os/codec/FormatManager.h similarity index 100% rename from src/kits/media/FormatManager.h rename to headers/os/codec/FormatManager.h diff --git a/headers/private/media/MediaExtractor.h b/headers/os/codec/MediaExtractor.h similarity index 100% rename from headers/private/media/MediaExtractor.h rename to headers/os/codec/MediaExtractor.h diff --git a/headers/private/media/MediaPlugin.h b/headers/os/codec/MediaPlugin.h similarity index 100% rename from headers/private/media/MediaPlugin.h rename to headers/os/codec/MediaPlugin.h diff --git a/headers/private/media/MediaStreamer.h b/headers/os/codec/MediaStreamer.h similarity index 100% rename from headers/private/media/MediaStreamer.h rename to headers/os/codec/MediaStreamer.h diff --git a/headers/private/media/MediaWriter.h b/headers/os/codec/MediaWriter.h similarity index 100% rename from headers/private/media/MediaWriter.h rename to headers/os/codec/MediaWriter.h diff --git a/headers/private/media/PluginManager.h b/headers/os/codec/PluginManager.h similarity index 100% rename from headers/private/media/PluginManager.h rename to headers/os/codec/PluginManager.h diff --git a/headers/private/media/ReaderPlugin.h b/headers/os/codec/ReaderPlugin.h similarity index 100% rename from headers/private/media/ReaderPlugin.h rename to headers/os/codec/ReaderPlugin.h diff --git a/headers/private/media/StreamerPlugin.h b/headers/os/codec/StreamerPlugin.h similarity index 100% rename from headers/private/media/StreamerPlugin.h rename to headers/os/codec/StreamerPlugin.h diff --git a/headers/private/media/WriterPlugin.h b/headers/os/codec/WriterPlugin.h similarity index 100% rename from headers/private/media/WriterPlugin.h rename to headers/os/codec/WriterPlugin.h diff --git a/src/kits/Jamfile b/src/kits/Jamfile index cd091b3611..48b8634871 100644 --- a/src/kits/Jamfile +++ b/src/kits/Jamfile @@ -106,6 +106,7 @@ DoCatalogs libbe.so SubInclude HAIKU_TOP src kits app ; SubInclude HAIKU_TOP src kits bluetooth ; +SubInclude HAIKU_TOP src kits codec ; SubInclude HAIKU_TOP src kits debug ; SubInclude HAIKU_TOP src kits debugger ; SubInclude HAIKU_TOP src kits device ; diff --git a/src/kits/media/AddOnManager.cpp b/src/kits/codec/AddOnManager.cpp similarity index 100% rename from src/kits/media/AddOnManager.cpp rename to src/kits/codec/AddOnManager.cpp diff --git a/src/kits/media/ChunkCache.cpp b/src/kits/codec/ChunkCache.cpp similarity index 100% rename from src/kits/media/ChunkCache.cpp rename to src/kits/codec/ChunkCache.cpp diff --git a/src/kits/media/ChunkCache.h b/src/kits/codec/ChunkCache.h similarity index 100% rename from src/kits/media/ChunkCache.h rename to src/kits/codec/ChunkCache.h diff --git a/src/kits/media/DecoderPlugin.cpp b/src/kits/codec/DecoderPlugin.cpp similarity index 100% rename from src/kits/media/DecoderPlugin.cpp rename to src/kits/codec/DecoderPlugin.cpp diff --git a/src/kits/media/EncoderPlugin.cpp b/src/kits/codec/EncoderPlugin.cpp similarity index 100% rename from src/kits/media/EncoderPlugin.cpp rename to src/kits/codec/EncoderPlugin.cpp diff --git a/src/kits/media/FormatManager.cpp b/src/kits/codec/FormatManager.cpp similarity index 100% rename from src/kits/media/FormatManager.cpp rename to src/kits/codec/FormatManager.cpp diff --git a/src/kits/codec/Jamfile b/src/kits/codec/Jamfile new file mode 100644 index 0000000000..a3bae80bdb --- /dev/null +++ b/src/kits/codec/Jamfile @@ -0,0 +1,45 @@ +SubDir HAIKU_TOP src kits codec ; + +UsePrivateHeaders media shared ; +UsePrivateHeaders [ FDirName media experimental ] ; + +if $(CHECK_MALLOC) { + SubDirC++Flags -D_NO_INLINE_ASM -fcheck-memory-usage ; +} + +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + + SharedLibrary [ MultiArchDefaultGristFiles libcodec.so ] : + # Experimental Media Kit + #AdapterIO.cpp + #MediaClient.cpp + #MediaClientDefs.cpp + #MediaClientNode.cpp + #MediaConnection.cpp + #MediaIO.cpp + #SimpleMediaClient.cpp + + # Internal Functionality + AddOnManager.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 + + : + be localestub shared + [ TargetLibsupc++ ] [ TargetLibstdc++ ] + ; + } +} diff --git a/src/kits/media/MediaExtractor.cpp b/src/kits/codec/MediaExtractor.cpp similarity index 100% rename from src/kits/media/MediaExtractor.cpp rename to src/kits/codec/MediaExtractor.cpp diff --git a/src/kits/media/MediaPlugin.cpp b/src/kits/codec/MediaPlugin.cpp similarity index 100% rename from src/kits/media/MediaPlugin.cpp rename to src/kits/codec/MediaPlugin.cpp diff --git a/src/kits/media/MediaStreamer.cpp b/src/kits/codec/MediaStreamer.cpp similarity index 100% rename from src/kits/media/MediaStreamer.cpp rename to src/kits/codec/MediaStreamer.cpp diff --git a/src/kits/media/MediaWriter.cpp b/src/kits/codec/MediaWriter.cpp similarity index 100% rename from src/kits/media/MediaWriter.cpp rename to src/kits/codec/MediaWriter.cpp diff --git a/src/kits/media/PluginManager.cpp b/src/kits/codec/PluginManager.cpp similarity index 100% rename from src/kits/media/PluginManager.cpp rename to src/kits/codec/PluginManager.cpp diff --git a/src/kits/media/ReaderPlugin.cpp b/src/kits/codec/ReaderPlugin.cpp similarity index 100% rename from src/kits/media/ReaderPlugin.cpp rename to src/kits/codec/ReaderPlugin.cpp diff --git a/src/kits/media/StreamerPlugin.cpp b/src/kits/codec/StreamerPlugin.cpp similarity index 100% rename from src/kits/media/StreamerPlugin.cpp rename to src/kits/codec/StreamerPlugin.cpp diff --git a/src/kits/media/WriterPlugin.cpp b/src/kits/codec/WriterPlugin.cpp similarity index 100% rename from src/kits/media/WriterPlugin.cpp rename to src/kits/codec/WriterPlugin.cpp diff --git a/src/kits/media/Jamfile b/src/kits/media/Jamfile index beb0781f86..ad070aa2f1 100644 --- a/src/kits/media/Jamfile +++ b/src/kits/media/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src kits media ; SetSubDirSupportedPlatformsBeOSCompatible ; -UsePrivateHeaders app media shared ; +UsePrivateHeaders app codec media shared ; UsePrivateHeaders [ FDirName media experimental ] ; if $(CHECK_MALLOC) { @@ -57,12 +57,10 @@ for architectureObject in [ MultiArchSubDirSetup ] { SimpleMediaClient.cpp # Internal Functionality - AddOnManager.cpp BufferCache.cpp DataExchange.cpp DefaultMediaTheme.cpp DormantNodeManager.cpp - FormatManager.cpp MediaRecorderNode.cpp Notifications.cpp request_data.cpp @@ -81,24 +79,11 @@ for architectureObject in [ MultiArchSubDirSetup ] { OldMediaModule.cpp OldSubscriber.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 - # Compat Media Kit !missing_symbols.cpp Deprecated.cpp : - be localestub shared + be codec localestub shared [ TargetLibsupc++ ] [ TargetLibstdc++ ] ; }