hrev52434 adds 9 changesets to branch 'master'
old head: 8922fc0a9e55012bd1b2ba1fe4a928d3e30f2903
new head: de42fb602e38b1449022d13b897aee886302bf28
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=de42fb602e38+%5E8922fc0a9e55
----------------------------------------------------------------------------
1275248a772a: codec_kit: First half
* Move all codec stuff into libcodec.so
df2639bf609a: Move adapter_kit API to libcodec.so
50cb5283a06f: media/codec: Share media_format defs until libmedia2.so
ac52fcf75eb0: ffmpeg: Use the codec_kit
4419ea5bc660: echo: Use private audio headers
f9fc9494399c: MediaTest: Use MediaDebug.h
7a28e2cbb5b1: ape_reader: Link to the codec_kit
8f99629d87ef: http_streamer: Use MediaDebug.h
de42fb602e38: Welcome Codec Kit!
* Fix MediaDebug header.
* Add codec lib name mapping.
[ Barrett17 <b.vitruvio@xxxxxxxxx> ]
----------------------------------------------------------------------------
49 files changed, 324 insertions(+), 272 deletions(-)
build/jam/ArchitectureRules | 4 +-
build/jam/HeadersRules | 12 +-
build/jam/images/definitions/regular | 1 +
.../media/experimental => os/codec}/AdapterIO.h | 0
.../media => headers/os/codec}/AddOnManager.h | 0
.../{private/media => os/codec}/DecoderPlugin.h | 0
.../{private/media => os/codec}/EncoderPlugin.h | 0
.../media => headers/os/codec}/FormatManager.h | 0
.../{private/media => os/codec}/MediaExtractor.h | 0
.../media/experimental => os/codec}/MediaIO.h | 0
.../{private/media => os/codec}/MediaPlugin.h | 0
.../{private/media => os/codec}/MediaStreamer.h | 0
.../{private/media => os/codec}/MediaWriter.h | 0
.../{private/media => os/codec}/PluginManager.h | 0
.../{private/media => os/codec}/ReaderPlugin.h | 0
.../{private/media => os/codec}/StreamerPlugin.h | 0
.../{private/media => os/codec}/WriterPlugin.h | 0
src/add-ons/kernel/drivers/audio/echo/24/Jamfile | 2 +-
src/add-ons/kernel/drivers/audio/echo/3g/Jamfile | 2 +-
.../kernel/drivers/audio/echo/gals/Jamfile | 2 +-
.../kernel/drivers/audio/echo/indigo/Jamfile | 2 +-
src/add-ons/media/plugins/ape_reader/Jamfile | 2 +-
src/add-ons/media/plugins/ffmpeg/Jamfile | 4 +-
.../media/plugins/http_streamer/HTTPMediaIO.cpp | 2 +-
.../plugins/http_streamer/HTTPStreamerPlugin.cpp | 2 +-
src/add-ons/media/plugins/http_streamer/Jamfile | 2 +-
src/add-ons/media/plugins/raw_decoder/Jamfile | 2 +-
src/bin/media_client/MediaTest.cpp | 3 +-
src/kits/Jamfile | 1 +
.../{media/experimental => codec}/AdapterIO.cpp | 0
src/kits/{media => codec}/AddOnManager.cpp | 0
src/kits/{media => codec}/ChunkCache.cpp | 0
src/kits/{media => codec}/ChunkCache.h | 0
src/kits/{media => codec}/DecoderPlugin.cpp | 0
src/kits/{media => codec}/EncoderPlugin.cpp | 0
src/kits/{media => codec}/FormatManager.cpp | 0
src/kits/codec/Jamfile | 48 ++++
src/kits/{media => codec}/MediaExtractor.cpp | 0
.../{media/experimental => codec}/MediaIO.cpp | 0
src/kits/{media => codec}/MediaPlugin.cpp | 0
src/kits/{media => codec}/MediaStreamer.cpp | 0
src/kits/{media => codec}/MediaWriter.cpp | 0
src/kits/{media => codec}/PluginManager.cpp | 0
src/kits/{media => codec}/ReaderPlugin.cpp | 0
src/kits/{media => codec}/StreamerPlugin.cpp | 0
src/kits/{media => codec}/WriterPlugin.cpp | 0
src/kits/media/Jamfile | 22 +-
src/kits/media/MediaDefs.cpp | 233 -----------------
src/kits/media/MediaDefsNotify.cpp | 250 +++++++++++++++++++
############################################################################
Commit: 1275248a772a2b9605ba5c6e2d7d97e4b9b81feb
URL: https://git.haiku-os.org/haiku/commit/?id=1275248a772a
Author: Barrett17 <b.vitruvio@xxxxxxxxx>
Date: Wed Oct 24 09:36:56 2018 UTC
codec_kit: First half
* Move all codec stuff into libcodec.so
----------------------------------------------------------------------------
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++ ]
;
}
############################################################################
Commit: df2639bf609ad25078e83bea707328eca8b61b25
URL: https://git.haiku-os.org/haiku/commit/?id=df2639bf609a
Author: Barrett17 <b.vitruvio@xxxxxxxxx>
Date: Wed Oct 24 10:07:30 2018 UTC
Move adapter_kit API to libcodec.so
----------------------------------------------------------------------------
diff --git a/headers/private/media/experimental/AdapterIO.h
b/headers/os/codec/AdapterIO.h
similarity index 100%
rename from headers/private/media/experimental/AdapterIO.h
rename to headers/os/codec/AdapterIO.h
diff --git a/headers/private/media/experimental/MediaIO.h
b/headers/os/codec/MediaIO.h
similarity index 100%
rename from headers/private/media/experimental/MediaIO.h
rename to headers/os/codec/MediaIO.h
diff --git a/src/kits/media/experimental/AdapterIO.cpp
b/src/kits/codec/AdapterIO.cpp
similarity index 100%
rename from src/kits/media/experimental/AdapterIO.cpp
rename to src/kits/codec/AdapterIO.cpp
diff --git a/src/kits/codec/Jamfile b/src/kits/codec/Jamfile
index a3bae80bdb..33c5565eeb 100644
--- a/src/kits/codec/Jamfile
+++ b/src/kits/codec/Jamfile
@@ -1,28 +1,22 @@
SubDir HAIKU_TOP src kits codec ;
-UsePrivateHeaders media shared ;
-UsePrivateHeaders [ FDirName media experimental ] ;
+UsePrivateHeaders app media shared ;
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
+SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits media ] ;
- # Internal Functionality
- AddOnManager.cpp
+ SharedLibrary [ MultiArchDefaultGristFiles libcodec.so ] :
+ # Adapter Kit
+ AdapterIO.cpp
+ MediaIO.cpp
# Codec Plugin API
ChunkCache.cpp
@@ -37,6 +31,15 @@ for architectureObject in [ MultiArchSubDirSetup ] {
StreamerPlugin.cpp
WriterPlugin.cpp
+ # Internal Functionality
+ AddOnManager.cpp
+ FormatManager.cpp
+
+ # We need this to do not depend on libmedia
+ # will be removed when libmedia2 is introduced
+ RealtimeAlloc.cpp
+ MediaFormats.cpp
+
:
be localestub shared
[ TargetLibsupc++ ] [ TargetLibstdc++ ]
diff --git a/src/kits/media/experimental/MediaIO.cpp
b/src/kits/codec/MediaIO.cpp
similarity index 100%
rename from src/kits/media/experimental/MediaIO.cpp
rename to src/kits/codec/MediaIO.cpp
diff --git a/src/kits/media/Jamfile b/src/kits/media/Jamfile
index ad070aa2f1..79cd511185 100644
--- a/src/kits/media/Jamfile
+++ b/src/kits/media/Jamfile
@@ -48,12 +48,10 @@ for architectureObject in [ MultiArchSubDirSetup ] {
TimeSource.cpp
# Experimental Media Kit
- AdapterIO.cpp
MediaClient.cpp
MediaClientDefs.cpp
MediaClientNode.cpp
MediaConnection.cpp
- MediaIO.cpp
SimpleMediaClient.cpp
# Internal Functionality
@@ -83,7 +81,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
!missing_symbols.cpp
Deprecated.cpp
:
- be codec localestub shared
+ be libcodec.so localestub shared
[ TargetLibsupc++ ] [ TargetLibstdc++ ]
;
}
############################################################################
Commit: 50cb5283a06f41b436e6802962c72452905dfab4
URL: https://git.haiku-os.org/haiku/commit/?id=50cb5283a06f
Author: Barrett17 <b.vitruvio@xxxxxxxxx>
Date: Wed Oct 24 10:27:14 2018 UTC
media/codec: Share media_format defs until libmedia2.so
----------------------------------------------------------------------------
diff --git a/src/kits/codec/Jamfile b/src/kits/codec/Jamfile
index 33c5565eeb..51141de33e 100644
--- a/src/kits/codec/Jamfile
+++ b/src/kits/codec/Jamfile
@@ -6,12 +6,11 @@ if $(CHECK_MALLOC) {
SubDirC++Flags -D_NO_INLINE_ASM -fcheck-memory-usage ;
}
-
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
-SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits media ] ;
+ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits media ] ;
SharedLibrary [ MultiArchDefaultGristFiles libcodec.so ] :
# Adapter Kit
@@ -37,8 +36,9 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits media ] ;
# We need this to do not depend on libmedia
# will be removed when libmedia2 is introduced
- RealtimeAlloc.cpp
+ MediaDefs.cpp
MediaFormats.cpp
+ RealtimeAlloc.cpp
:
be localestub shared
diff --git a/src/kits/media/Jamfile b/src/kits/media/Jamfile
index 79cd511185..9a15c68130 100644
--- a/src/kits/media/Jamfile
+++ b/src/kits/media/Jamfile
@@ -27,6 +27,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
MediaAddOn.cpp
MediaDecoder.cpp
MediaDefs.cpp
+ MediaDefsNotify.cpp
MediaEncoder.cpp
MediaEventLooper.cpp
MediaFile.cpp
diff --git a/src/kits/media/MediaDefs.cpp b/src/kits/media/MediaDefs.cpp
index d69846832b..d6106ebd4e 100644
--- a/src/kits/media/MediaDefs.cpp
+++ b/src/kits/media/MediaDefs.cpp
@@ -13,13 +13,11 @@
#include <Application.h>
#include <Bitmap.h>
#include <Catalog.h>
-#include <IconUtils.h>
#include <LaunchRoster.h>
#include <Locale.h>
#include <MediaNode.h>
#include <MediaRoster.h>
#include <Node.h>
-#include <Notification.h>
#include <Roster.h>
#include <inttypes.h>
@@ -1233,237 +1231,6 @@ get_next_file_format(int32* cookie, media_file_format*
mff)
}
-// #pragma mark -
-
-
-// final & verified
-const char* B_MEDIA_SERVER_SIGNATURE = "application/x-vnd.Be.media-server";
-const char* B_MEDIA_ADDON_SERVER_SIGNATURE = "application/x-vnd.Be.addon-host";
-
-const type_code B_CODEC_TYPE_INFO = 0x040807b2;
-
-
-// #pragma mark -
-
-
-// shutdown_media_server() and launch_media_server()
-// are provided by libbe.so in BeOS R5
-
-#define MEDIA_SERVICE_NOTIFICATION_ID "MediaServiceNotificationID"
-
-
-void
-notify_system(float progress, const char* message)
-{
- BNotification notification(B_PROGRESS_NOTIFICATION);
- notification.SetMessageID(MEDIA_SERVICE_NOTIFICATION_ID);
- notification.SetProgress(progress);
- notification.SetGroup(B_TRANSLATE("Media Service"));
- notification.SetContent(message);
-
- app_info info;
- be_app->GetAppInfo(&info);
- BBitmap icon(BRect(0, 0, 32, 32), B_RGBA32);
- BNode node(&info.ref);
- BIconUtils::GetVectorIcon(&node, "BEOS:ICON", &icon);
- notification.SetIcon(&icon);
-
- notification.Send();
-}
-
-
-void
-progress_shutdown(int stage,
- bool (*progress)(int stage, const char* message, void* cookie),
- void* cookie)
-{
- // parameter "message" is no longer used. It is kept for compatibility
with
- // BeOS as this is used as a shutdown_media_server callback.
-
- TRACE("stage: %i\n", stage);
- const char* string = "Unknown stage";
- switch (stage) {
- case 10:
- string = B_TRANSLATE("Stopping media server"
B_UTF8_ELLIPSIS);
- break;
- case 20:
- string = B_TRANSLATE("Waiting for media_server to
quit.");
- break;
- case 40:
- string = B_TRANSLATE("Telling media_addon_server to
quit.");
- break;
- case 50:
- string = B_TRANSLATE("Waiting for media_addon_server to
quit.");
- break;
- case 70:
- string = B_TRANSLATE("Cleaning up.");
- break;
- case 100:
- string = B_TRANSLATE("Done shutting down.");
- break;
- }
-
- if (progress == NULL)
- notify_system(stage / 100.0f, string);
- else
- progress(stage, string, cookie);
-}
-
-
-status_t
-shutdown_media_server(bigtime_t timeout,
- bool (*progress)(int stage, const char* message, void* cookie),
- void* cookie)
-{
- BMessage msg(B_QUIT_REQUESTED);
- status_t err = B_MEDIA_SYSTEM_FAILURE;
- bool shutdown = false;
-
- BMediaRoster* roster = BMediaRoster::Roster(&err);
- if (roster == NULL || err != B_OK)
- return err;
-
- if (progress == NULL && roster->Lock()) {
- MediaRosterEx(roster)->EnableLaunchNotification(true, true);
- roster->Unlock();
- }
-
- if ((err = msg.AddBool("be:_user_request", true)) != B_OK)
- return err;
-
- team_id mediaServer = be_roster->TeamFor(B_MEDIA_SERVER_SIGNATURE);
- team_id addOnServer =
be_roster->TeamFor(B_MEDIA_ADDON_SERVER_SIGNATURE);
-
- if (mediaServer != B_ERROR) {
- BMessage reply;
- BMessenger messenger(B_MEDIA_SERVER_SIGNATURE, mediaServer);
- progress_shutdown(10, progress, cookie);
-
- err = messenger.SendMessage(&msg, &reply, 2000000, 2000000);
- reply.FindBool("_shutdown", &shutdown);
- if (err == B_TIMED_OUT || shutdown == false) {
- if (messenger.IsValid())
- kill_team(mediaServer);
- } else if (err != B_OK)
- return err;
-
- progress_shutdown(20, progress, cookie);
-
- int32 rv;
- if (reply.FindInt32("error", &rv) == B_OK && rv != B_OK)
- return rv;
- }
-
- if (addOnServer != B_ERROR) {
- shutdown = false;
- BMessage reply;
- BMessenger messenger(B_MEDIA_ADDON_SERVER_SIGNATURE,
addOnServer);
- progress_shutdown(40, progress, cookie);
-
- // The media_server usually shutdown the media_addon_server,
- // if not let's do something.
- if (messenger.IsValid()) {
- err = messenger.SendMessage(&msg, &reply, 2000000,
2000000);
- reply.FindBool("_shutdown", &shutdown);
- if (err == B_TIMED_OUT || shutdown == false) {
- if (messenger.IsValid())
- kill_team(addOnServer);
- } else if (err != B_OK)
- return err;
-
- progress_shutdown(50, progress, cookie);
-
- int32 rv;
- if (reply.FindInt32("error", &rv) == B_OK && rv != B_OK)
- return rv;
- }
- }
-
- progress_shutdown(100, progress, cookie);
- return B_OK;
-}
-
-
-void
-progress_startup(int stage,
- bool (*progress)(int stage, const char* message, void* cookie),
- void* cookie)
-{
- // parameter "message" is no longer used. It is kept for compatibility
with
- // BeOS as this is used as a shutdown_media_server callback.
-
- TRACE("stage: %i\n", stage);
- const char* string = "Unknown stage";
- switch (stage) {
- case 10:
- string = B_TRANSLATE("Stopping media server"
B_UTF8_ELLIPSIS);
- break;
- case 20:
- string = B_TRANSLATE("Stopping media_addon_server.");
- break;
- case 50:
- string = B_TRANSLATE("Starting media_services.");
- break;
- case 90:
- string = B_TRANSLATE("Error occurred starting media
services.");
- break;
- case 100:
- string = B_TRANSLATE("Ready for use.");
- break;
- }
-
- if (progress == NULL)
- notify_system(stage / 100.0f, string);
- else
- progress(stage, string, cookie);
-}
-
-
-status_t
-launch_media_server(bigtime_t timeout,
- bool (*progress)(int stage, const char* message, void* cookie),
- void* cookie, uint32 flags)
-{
- if (BMediaRoster::IsRunning())
- return B_ALREADY_RUNNING;
-
- status_t err = B_MEDIA_SYSTEM_FAILURE;
- BMediaRoster* roster = BMediaRoster::Roster(&err);
- if (roster == NULL || err != B_OK)
- return err;
-
- if (progress == NULL && roster->Lock()) {
- MediaRosterEx(roster)->EnableLaunchNotification(true, true);
- roster->Unlock();
- }
-
- // The media_server crashed
- if (be_roster->IsRunning(B_MEDIA_ADDON_SERVER_SIGNATURE)) {
- progress_startup(10, progress, cookie);
- kill_team(be_roster->TeamFor(B_MEDIA_ADDON_SERVER_SIGNATURE));
- }
-
- // The media_addon_server crashed
- if (be_roster->IsRunning(B_MEDIA_SERVER_SIGNATURE)) {
- progress_startup(20, progress, cookie);
- kill_team(be_roster->TeamFor(B_MEDIA_SERVER_SIGNATURE));
- }
-
- progress_startup(50, progress, cookie);
-
- err = BLaunchRoster().Start(B_MEDIA_SERVER_SIGNATURE);
-
- if (err != B_OK)
- progress_startup(90, progress, cookie);
- else if (progress != NULL) {
- progress_startup(100, progress, cookie);
- err = B_OK;
- }
-
- return err;
-}
-
-
// #pragma mark - media_encode_info
diff --git a/src/kits/media/MediaDefsNotify.cpp
b/src/kits/media/MediaDefsNotify.cpp
new file mode 100644
index 0000000000..b661e3941a
--- /dev/null
+++ b/src/kits/media/MediaDefsNotify.cpp
@@ -0,0 +1,250 @@
+/*
+ * Copyright 2015, Dario Casalinuovo
+ * Copyright 2004, 2006, Jérôme Duval.
+ * Copyright 2003-2004, Andrew Bachmann.
+ * Copyright 2002-2004, 2006 Marcus Overhagen.
+ * Copyright 2002, Eric Jaessler.
+ * All rights reserved. Distributed under the terms of the MIT license.
+ */
+
+
+#include <MediaDefs.h>
+
+#include <Application.h>
+#include <Bitmap.h>
+#include <Catalog.h>
+#include <IconUtils.h>
+#include <LaunchRoster.h>
+#include <Locale.h>
+#include <MediaRoster.h>
+#include <Notification.h>
+#include <Roster.h>
+
+#include "MediaRosterEx.h"
+
+
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MediaDefs"
+
+// final & verified
+const char* B_MEDIA_SERVER_SIGNATURE = "application/x-vnd.Be.media-server";
+const char* B_MEDIA_ADDON_SERVER_SIGNATURE = "application/x-vnd.Be.addon-host";
+
+const type_code B_CODEC_TYPE_INFO = 0x040807b2;
+
+// shutdown_media_server() and launch_media_server()
+// are provided by libbe.so in BeOS R5
+
+#define MEDIA_SERVICE_NOTIFICATION_ID "MediaServiceNotificationID"
+
+
+void
+notify_system(float progress, const char* message)
+{
+ BNotification notification(B_PROGRESS_NOTIFICATION);
+ notification.SetMessageID(MEDIA_SERVICE_NOTIFICATION_ID);
+ notification.SetProgress(progress);
+ notification.SetGroup(B_TRANSLATE("Media Service"));
+ notification.SetContent(message);
+
+ app_info info;
+ be_app->GetAppInfo(&info);
+ BBitmap icon(BRect(0, 0, 32, 32), B_RGBA32);
+ BNode node(&info.ref);
+ BIconUtils::GetVectorIcon(&node, "BEOS:ICON", &icon);
+ notification.SetIcon(&icon);
+
+ notification.Send();
+}
+
+
+void
+progress_shutdown(int stage,
+ bool (*progress)(int stage, const char* message, void* cookie),
+ void* cookie)
+{
+ // parameter "message" is no longer used. It is kept for compatibility
with
+ // BeOS as this is used as a shutdown_media_server callback.
+
+ TRACE("stage: %i\n", stage);
+ const char* string = "Unknown stage";
+ switch (stage) {
+ case 10:
+ string = B_TRANSLATE("Stopping media server"
B_UTF8_ELLIPSIS);
+ break;
+ case 20:
+ string = B_TRANSLATE("Waiting for media_server to
quit.");
+ break;
+ case 40:
+ string = B_TRANSLATE("Telling media_addon_server to
quit.");
+ break;
+ case 50:
+ string = B_TRANSLATE("Waiting for media_addon_server to
quit.");
+ break;
+ case 70:
+ string = B_TRANSLATE("Cleaning up.");
+ break;
+ case 100:
+ string = B_TRANSLATE("Done shutting down.");
+ break;
+ }
+
+ if (progress == NULL)
+ notify_system(stage / 100.0f, string);
+ else
+ progress(stage, string, cookie);
+}
+
+
+status_t
+shutdown_media_server(bigtime_t timeout,
+ bool (*progress)(int stage, const char* message, void* cookie),
+ void* cookie)
+{
+ BMessage msg(B_QUIT_REQUESTED);
+ status_t err = B_MEDIA_SYSTEM_FAILURE;
+ bool shutdown = false;
+
+ BMediaRoster* roster = BMediaRoster::Roster(&err);
+ if (roster == NULL || err != B_OK)
+ return err;
+
+ if (progress == NULL && roster->Lock()) {
+ MediaRosterEx(roster)->EnableLaunchNotification(true, true);
+ roster->Unlock();
+ }
+
+ if ((err = msg.AddBool("be:_user_request", true)) != B_OK)
+ return err;
+
+ team_id mediaServer = be_roster->TeamFor(B_MEDIA_SERVER_SIGNATURE);
+ team_id addOnServer =
be_roster->TeamFor(B_MEDIA_ADDON_SERVER_SIGNATURE);
+
+ if (mediaServer != B_ERROR) {
+ BMessage reply;
+ BMessenger messenger(B_MEDIA_SERVER_SIGNATURE, mediaServer);
+ progress_shutdown(10, progress, cookie);
+
+ err = messenger.SendMessage(&msg, &reply, 2000000, 2000000);
+ reply.FindBool("_shutdown", &shutdown);
+ if (err == B_TIMED_OUT || shutdown == false) {
+ if (messenger.IsValid())
+ kill_team(mediaServer);
+ } else if (err != B_OK)
+ return err;
+
+ progress_shutdown(20, progress, cookie);
+
+ int32 rv;
+ if (reply.FindInt32("error", &rv) == B_OK && rv != B_OK)
+ return rv;
+ }
+
+ if (addOnServer != B_ERROR) {
+ shutdown = false;
+ BMessage reply;
+ BMessenger messenger(B_MEDIA_ADDON_SERVER_SIGNATURE,
addOnServer);
+ progress_shutdown(40, progress, cookie);
+
+ // The media_server usually shutdown the media_addon_server,
+ // if not let's do something.
+ if (messenger.IsValid()) {
+ err = messenger.SendMessage(&msg, &reply, 2000000,
2000000);
+ reply.FindBool("_shutdown", &shutdown);
+ if (err == B_TIMED_OUT || shutdown == false) {
+ if (messenger.IsValid())
+ kill_team(addOnServer);
+ } else if (err != B_OK)
+ return err;
+
+ progress_shutdown(50, progress, cookie);
+
+ int32 rv;
+ if (reply.FindInt32("error", &rv) == B_OK && rv != B_OK)
+ return rv;
+ }
+ }
+
+ progress_shutdown(100, progress, cookie);
+ return B_OK;
+}
+
+
+void
+progress_startup(int stage,
+ bool (*progress)(int stage, const char* message, void* cookie),
+ void* cookie)
+{
+ // parameter "message" is no longer used. It is kept for compatibility
with
+ // BeOS as this is used as a shutdown_media_server callback.
+
+ TRACE("stage: %i\n", stage);
+ const char* string = "Unknown stage";
+ switch (stage) {
+ case 10:
+ string = B_TRANSLATE("Stopping media server"
B_UTF8_ELLIPSIS);
+ break;
+ case 20:
+ string = B_TRANSLATE("Stopping media_addon_server.");
+ break;
+ case 50:
+ string = B_TRANSLATE("Starting media_services.");
+ break;
+ case 90:
+ string = B_TRANSLATE("Error occurred starting media
services.");
+ break;
+ case 100:
+ string = B_TRANSLATE("Ready for use.");
+ break;
+ }
+
+ if (progress == NULL)
+ notify_system(stage / 100.0f, string);
+ else
+ progress(stage, string, cookie);
+}
+
+
+status_t
+launch_media_server(bigtime_t timeout,
+ bool (*progress)(int stage, const char* message, void* cookie),
+ void* cookie, uint32 flags)
+{
+ if (BMediaRoster::IsRunning())
+ return B_ALREADY_RUNNING;
+
+ status_t err = B_MEDIA_SYSTEM_FAILURE;
+ BMediaRoster* roster = BMediaRoster::Roster(&err);
+ if (roster == NULL || err != B_OK)
+ return err;
+
+ if (progress == NULL && roster->Lock()) {
+ MediaRosterEx(roster)->EnableLaunchNotification(true, true);
+ roster->Unlock();
+ }
+
+ // The media_server crashed
+ if (be_roster->IsRunning(B_MEDIA_ADDON_SERVER_SIGNATURE)) {
+ progress_startup(10, progress, cookie);
+ kill_team(be_roster->TeamFor(B_MEDIA_ADDON_SERVER_SIGNATURE));
+ }
+
+ // The media_addon_server crashed
+ if (be_roster->IsRunning(B_MEDIA_SERVER_SIGNATURE)) {
+ progress_startup(20, progress, cookie);
+ kill_team(be_roster->TeamFor(B_MEDIA_SERVER_SIGNATURE));
+ }
+
+ progress_startup(50, progress, cookie);
+
+ err = BLaunchRoster().Start(B_MEDIA_SERVER_SIGNATURE);
+
+ if (err != B_OK)
+ progress_startup(90, progress, cookie);
+ else if (progress != NULL) {
+ progress_startup(100, progress, cookie);
+ err = B_OK;
+ }
+
+ return err;
+}
############################################################################
Commit: ac52fcf75eb098e493a9d5fff70d5ccd01c8bf0f
URL: https://git.haiku-os.org/haiku/commit/?id=ac52fcf75eb0
Author: Barrett17 <b.vitruvio@xxxxxxxxx>
Date: Wed Oct 24 10:40:37 2018 UTC
ffmpeg: Use the codec_kit
----------------------------------------------------------------------------
diff --git a/src/add-ons/media/plugins/ffmpeg/Jamfile
b/src/add-ons/media/plugins/ffmpeg/Jamfile
index ebac868479..f1b15a16f8 100644
--- a/src/add-ons/media/plugins/ffmpeg/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/Jamfile
@@ -2,8 +2,7 @@ SubDir HAIKU_TOP src add-ons media plugins ffmpeg ;
SetSubDirSupportedPlatformsBeOSCompatible ;
-UsePrivateHeaders media shared ;
-UsePrivateHeaders [ FDirName media experimental ] ;
+UsePrivateHeaders shared ;
SubDirC++Flags -D__STDC_CONSTANT_MACROS -Wdeprecated ;
@@ -58,6 +57,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
be
media
+ libcodec.so
[ TargetLibsupc++ ]
;
}
############################################################################
Commit: 4419ea5bc660992921218aaa60ba1d508ac7fae3
URL: https://git.haiku-os.org/haiku/commit/?id=4419ea5bc660
Author: Barrett17 <b.vitruvio@xxxxxxxxx>
Date: Wed Oct 24 11:15:11 2018 UTC
echo: Use private audio headers
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/audio/echo/24/Jamfile
b/src/add-ons/kernel/drivers/audio/echo/24/Jamfile
index 20c4d8313d..dc41deeb64 100644
--- a/src/add-ons/kernel/drivers/audio/echo/24/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/echo/24/Jamfile
@@ -9,7 +9,7 @@ SubDirHdrs $(HAIKU_TOP) src add-ons kernel drivers audio echo
generic ASIC ;
UsePrivateSystemHeaders ;
UsePrivateHeaders kernel # For kernel_cpp.cpp
- media ;
+ audio ;
# set some additional defines
SubDirCcFlags -DECHO_BEOS -DECHO24_FAMILY ;
diff --git a/src/add-ons/kernel/drivers/audio/echo/3g/Jamfile
b/src/add-ons/kernel/drivers/audio/echo/3g/Jamfile
index 39e1322501..7448fb7027 100644
--- a/src/add-ons/kernel/drivers/audio/echo/3g/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/echo/3g/Jamfile
@@ -9,7 +9,7 @@ SubDirHdrs $(HAIKU_TOP) src add-ons kernel drivers audio echo
generic ASIC ;
UsePrivateSystemHeaders ;
UsePrivateHeaders kernel # For kernel_cpp.cpp
- media ;
+ audio ;
# set some additional defines
SubDirCcFlags -DECHO_BEOS -DECHO3G_FAMILY ;
diff --git a/src/add-ons/kernel/drivers/audio/echo/gals/Jamfile
b/src/add-ons/kernel/drivers/audio/echo/gals/Jamfile
index 87caf21828..d1a025a174 100644
--- a/src/add-ons/kernel/drivers/audio/echo/gals/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/echo/gals/Jamfile
@@ -9,7 +9,7 @@ SubDirHdrs $(HAIKU_TOP) src add-ons kernel drivers audio echo
generic ASIC ;
UsePrivateSystemHeaders ;
UsePrivateHeaders kernel # For kernel_cpp.cpp
- media ;
+ audio ;
# set some additional defines
SubDirCcFlags -DECHO_BEOS -DECHOGALS_FAMILY ;
diff --git a/src/add-ons/kernel/drivers/audio/echo/indigo/Jamfile
b/src/add-ons/kernel/drivers/audio/echo/indigo/Jamfile
index ea4f8de49b..d1585c16f9 100644
--- a/src/add-ons/kernel/drivers/audio/echo/indigo/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/echo/indigo/Jamfile
@@ -9,7 +9,7 @@ SubDirHdrs $(HAIKU_TOP) src add-ons kernel drivers audio echo
generic ASIC ;
UsePrivateSystemHeaders ;
UsePrivateHeaders kernel # For kernel_cpp.cpp
- media ;
+ audio ;
# set some additional defines
SubDirCcFlags -DECHO_BEOS -DINDIGO_FAMILY -DCARDBUS ;
############################################################################
Commit: f9fc9494399cac59db670c3af55adb728c90f376
URL: https://git.haiku-os.org/haiku/commit/?id=f9fc9494399c
Author: Barrett17 <b.vitruvio@xxxxxxxxx>
Date: Wed Oct 24 11:17:29 2018 UTC
MediaTest: Use MediaDebug.h
----------------------------------------------------------------------------
diff --git a/src/bin/media_client/MediaTest.cpp
b/src/bin/media_client/MediaTest.cpp
index d940ca80da..e3371ded2d 100644
--- a/src/bin/media_client/MediaTest.cpp
+++ b/src/bin/media_client/MediaTest.cpp
@@ -12,7 +12,8 @@
#include <assert.h>
#include <stdio.h>
-#include <debug.h>
+#include <MediaDebug.h>
+
#ifdef DEBUG
#define DELAYED_MODE 1
############################################################################
Commit: 7a28e2cbb5b14cdbb53f0f3ce22c5f781103f79b
URL: https://git.haiku-os.org/haiku/commit/?id=7a28e2cbb5b1
Author: Barrett17 <b.vitruvio@xxxxxxxxx>
Date: Wed Oct 24 11:32:58 2018 UTC
ape_reader: Link to the codec_kit
----------------------------------------------------------------------------
diff --git a/src/add-ons/media/plugins/ape_reader/Jamfile
b/src/add-ons/media/plugins/ape_reader/Jamfile
index af9b74cdff..886ace5299 100644
--- a/src/add-ons/media/plugins/ape_reader/Jamfile
+++ b/src/add-ons/media/plugins/ape_reader/Jamfile
@@ -14,7 +14,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
Addon [ MultiArchDefaultGristFiles ape_reader ] :
APEReader.cpp
: [ MultiArchDefaultGristFiles libMonkeysAudio.a
MAClib.a ]
- be media [ TargetLibsupc++ ]
+ be libcodec.so media [ TargetLibsupc++ ]
;
}
}
############################################################################
Commit: 8f99629d87efdd0cef4a01a38375cd0ddb604f9e
URL: https://git.haiku-os.org/haiku/commit/?id=8f99629d87ef
Author: Barrett17 <b.vitruvio@xxxxxxxxx>
Date: Wed Oct 24 12:14:41 2018 UTC
http_streamer: Use MediaDebug.h
----------------------------------------------------------------------------
diff --git a/src/add-ons/media/plugins/http_streamer/HTTPMediaIO.cpp
b/src/add-ons/media/plugins/http_streamer/HTTPMediaIO.cpp
index b7f08e3791..1cabcd2211 100644
--- a/src/add-ons/media/plugins/http_streamer/HTTPMediaIO.cpp
+++ b/src/add-ons/media/plugins/http_streamer/HTTPMediaIO.cpp
@@ -10,7 +10,7 @@
#include <HttpRequest.h>
#include <UrlProtocolRoster.h>
-#include "debug.h"
+#include "MediaDebug.h"
// 10 seconds timeout
diff --git a/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.cpp
b/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.cpp
index c821b3d12a..40a3f46df5 100644
--- a/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.cpp
+++ b/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.cpp
@@ -8,7 +8,7 @@
#include "HTTPMediaIO.h"
-#include "debug.h"
+#include "MediaDebug.h"
HTTPStreamer::HTTPStreamer()
############################################################################
Revision: hrev52434
Commit: de42fb602e38b1449022d13b897aee886302bf28
URL: https://git.haiku-os.org/haiku/commit/?id=de42fb602e38
Author: Barrett17 <b.vitruvio@xxxxxxxxx>
Date: Wed Oct 24 12:29:28 2018 UTC
Welcome Codec Kit!
* Fix MediaDebug header.
* Add codec lib name mapping.
----------------------------------------------------------------------------
diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index a371c2df01..c153a6d131 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -202,8 +202,8 @@ rule ArchitectureSetup architecture
libraryGrist = $(architecture) ;
}
local i ;
- for i in be bnetapi debug device game locale mail media midi midi2
- network package root screensaver textencoding tracker
+ for i in be bnetapi codec debug device game locale mail media midi
+ midi2 network package root screensaver textencoding
tracker
translation z {
local library = lib$(i).so ;
HAIKU_LIBRARY_NAME_MAP_$(architecture)_$(i)
diff --git a/src/add-ons/media/plugins/ape_reader/Jamfile
b/src/add-ons/media/plugins/ape_reader/Jamfile
index 886ace5299..8b8a555e8b 100644
--- a/src/add-ons/media/plugins/ape_reader/Jamfile
+++ b/src/add-ons/media/plugins/ape_reader/Jamfile
@@ -14,7 +14,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
Addon [ MultiArchDefaultGristFiles ape_reader ] :
APEReader.cpp
: [ MultiArchDefaultGristFiles libMonkeysAudio.a
MAClib.a ]
- be libcodec.so media [ TargetLibsupc++ ]
+ be codec media [ TargetLibsupc++ ]
;
}
}
diff --git a/src/add-ons/media/plugins/ffmpeg/Jamfile
b/src/add-ons/media/plugins/ffmpeg/Jamfile
index f1b15a16f8..0ddcaa0ef0 100644
--- a/src/add-ons/media/plugins/ffmpeg/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/Jamfile
@@ -57,7 +57,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
be
media
- libcodec.so
+ codec
[ TargetLibsupc++ ]
;
}
diff --git a/src/add-ons/media/plugins/http_streamer/Jamfile
b/src/add-ons/media/plugins/http_streamer/Jamfile
index c8180ce131..3c0ad7f32e 100644
--- a/src/add-ons/media/plugins/http_streamer/Jamfile
+++ b/src/add-ons/media/plugins/http_streamer/Jamfile
@@ -9,7 +9,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
Addon [ MultiArchDefaultGristFiles http_streamer ] :
HTTPStreamerPlugin.cpp
HTTPMediaIO.cpp
- : be media bnetapi shared
+ : be codec media bnetapi shared
[ TargetLibsupc++ ]
;
}
diff --git a/src/add-ons/media/plugins/raw_decoder/Jamfile
b/src/add-ons/media/plugins/raw_decoder/Jamfile
index c67c61c6c7..2e88804eee 100644
--- a/src/add-ons/media/plugins/raw_decoder/Jamfile
+++ b/src/add-ons/media/plugins/raw_decoder/Jamfile
@@ -10,7 +10,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
Addon [ MultiArchDefaultGristFiles raw_decoder ] :
AudioConversion.cpp
RawDecoderPlugin.cpp
- : be media [ TargetLibsupc++ ]
+ : be codec media [ TargetLibsupc++ ]
;
}
}
diff --git a/src/kits/media/Jamfile b/src/kits/media/Jamfile
index 9a15c68130..40f3207a68 100644
--- a/src/kits/media/Jamfile
+++ b/src/kits/media/Jamfile
@@ -82,7 +82,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
!missing_symbols.cpp
Deprecated.cpp
:
- be libcodec.so localestub shared
+ be codec localestub shared
[ TargetLibsupc++ ] [ TargetLibstdc++ ]
;
}
