From 7561d9ac5d923cfbdd36a111157950f66264a601 Mon Sep 17 00:00:00 2001 From: Dario Casalinuovo Date: Mon, 16 Jan 2017 22:49:49 +0100 Subject: [PATCH] Populate media/experimental with future media_kit classes * Node implementations headers are move into src/kits/media. --- .../media/{ => experimental}/AdapterIO.h | 0 .../media/{ => experimental}/MediaClient.h | 3 +- .../{ => experimental}/MediaClientDefs.h | 0 .../{ => experimental}/MediaConnection.h | 4 +-- .../media/{ => experimental}/MediaIO.h | 0 .../{ => experimental}/SimpleMediaClient.h | 0 src/kits/media/Jamfile | 29 ++++++++++--------- .../kits}/media/MediaRecorderNode.h | 0 .../media/{ => experimental}/AdapterIO.cpp | 0 .../media/{ => experimental}/MediaClient.cpp | 2 ++ .../{ => experimental}/MediaClientDefs.cpp | 0 .../{ => experimental}/MediaClientNode.cpp | 0 .../media/experimental}/MediaClientNode.h | 0 .../{ => experimental}/MediaConnection.cpp | 2 ++ src/kits/media/{ => experimental}/MediaIO.cpp | 0 .../{ => experimental}/SimpleMediaClient.cpp | 0 src/tests/kits/media/media_client/Jamfile | 2 ++ 17 files changed, 25 insertions(+), 17 deletions(-) rename headers/private/media/{ => experimental}/AdapterIO.h (100%) rename headers/private/media/{ => experimental}/MediaClient.h (99%) rename headers/private/media/{ => experimental}/MediaClientDefs.h (100%) rename headers/private/media/{ => experimental}/MediaConnection.h (99%) rename headers/private/media/{ => experimental}/MediaIO.h (100%) rename headers/private/media/{ => experimental}/SimpleMediaClient.h (100%) rename {headers/private => src/kits}/media/MediaRecorderNode.h (100%) rename src/kits/media/{ => experimental}/AdapterIO.cpp (100%) rename src/kits/media/{ => experimental}/MediaClient.cpp (99%) rename src/kits/media/{ => experimental}/MediaClientDefs.cpp (100%) rename src/kits/media/{ => experimental}/MediaClientNode.cpp (100%) rename {headers/private/media => src/kits/media/experimental}/MediaClientNode.h (100%) rename src/kits/media/{ => experimental}/MediaConnection.cpp (99%) rename src/kits/media/{ => experimental}/MediaIO.cpp (100%) rename src/kits/media/{ => experimental}/SimpleMediaClient.cpp (100%) diff --git a/headers/private/media/AdapterIO.h b/headers/private/media/experimental/AdapterIO.h similarity index 100% rename from headers/private/media/AdapterIO.h rename to headers/private/media/experimental/AdapterIO.h diff --git a/headers/private/media/MediaClient.h b/headers/private/media/experimental/MediaClient.h similarity index 99% rename from headers/private/media/MediaClient.h rename to headers/private/media/experimental/MediaClient.h index bd3ccc04e3..19cd39c5f2 100755 --- a/headers/private/media/MediaClient.h +++ b/headers/private/media/experimental/MediaClient.h @@ -14,12 +14,11 @@ #include #include -#include "MediaClientNode.h" - namespace BPrivate { namespace media { +class BMediaClientNode; class BMediaConnection; class BMediaInput; class BMediaOutput; diff --git a/headers/private/media/MediaClientDefs.h b/headers/private/media/experimental/MediaClientDefs.h similarity index 100% rename from headers/private/media/MediaClientDefs.h rename to headers/private/media/experimental/MediaClientDefs.h diff --git a/headers/private/media/MediaConnection.h b/headers/private/media/experimental/MediaConnection.h similarity index 99% rename from headers/private/media/MediaConnection.h rename to headers/private/media/experimental/MediaConnection.h index 98bac5237f..785c180f15 100644 --- a/headers/private/media/MediaConnection.h +++ b/headers/private/media/experimental/MediaConnection.h @@ -12,11 +12,11 @@ #include #include -#include "MediaClientNode.h" - namespace BPrivate { namespace media { +class BMediaClientNode; + // The BMediaConnection class is the swiss knife of BMediaClient. // It represents a connection between two nodes and allow to create complex diff --git a/headers/private/media/MediaIO.h b/headers/private/media/experimental/MediaIO.h similarity index 100% rename from headers/private/media/MediaIO.h rename to headers/private/media/experimental/MediaIO.h diff --git a/headers/private/media/SimpleMediaClient.h b/headers/private/media/experimental/SimpleMediaClient.h similarity index 100% rename from headers/private/media/SimpleMediaClient.h rename to headers/private/media/experimental/SimpleMediaClient.h diff --git a/src/kits/media/Jamfile b/src/kits/media/Jamfile index 4e7f4708b4..d89aebf8e1 100644 --- a/src/kits/media/Jamfile +++ b/src/kits/media/Jamfile @@ -8,6 +8,7 @@ if $(TARGET_PLATFORM) != haiku { } UsePrivateHeaders app media shared ; +UsePrivateHeaders [ FDirName media experimental ] ; if $(CHECK_MALLOC) { SubDirC++Flags -D_NO_INLINE_ASM -fcheck-memory-usage ; @@ -17,21 +18,10 @@ local architectureObject ; for architectureObject in [ MultiArchSubDirSetup ] { on $(architectureObject) { + SEARCH_SOURCE += [ FDirName $(SUBDIR) experimental ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) legacy ] ; SharedLibrary [ MultiArchDefaultGristFiles libmedia.so ] : - # Private Media Kit - !missing_symbols.cpp - Deprecated.cpp - - AdapterIO.cpp - MediaIO.cpp - MediaClient.cpp - MediaClientDefs.cpp - MediaConnection.cpp - MediaRecorder.cpp - SimpleMediaClient.cpp - # Public Media Kit Buffer.cpp BufferConsumer.cpp @@ -48,6 +38,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { MediaFiles.cpp MediaFormats.cpp MediaNode.cpp + MediaRecorder.cpp MediaRoster.cpp MediaTheme.cpp MediaTrack.cpp @@ -61,6 +52,15 @@ for architectureObject in [ MultiArchSubDirSetup ] { TimedEventQueue.cpp TimeSource.cpp + # Experimental Media Kit + AdapterIO.cpp + MediaClient.cpp + MediaClientDefs.cpp + MediaClientNode.cpp + MediaConnection.cpp + MediaIO.cpp + SimpleMediaClient.cpp + # Internal Functionality AddOnManager.cpp BufferCache.cpp @@ -68,7 +68,6 @@ for architectureObject in [ MultiArchSubDirSetup ] { DefaultMediaTheme.cpp DormantNodeManager.cpp FormatManager.cpp - MediaClientNode.cpp MediaRecorderNode.cpp Notifications.cpp request_data.cpp @@ -98,6 +97,10 @@ for architectureObject in [ MultiArchSubDirSetup ] { ReaderPlugin.cpp StreamerPlugin.cpp WriterPlugin.cpp + + # Compat Media Kit + !missing_symbols.cpp + Deprecated.cpp : be localestub shared [ TargetLibsupc++ ] [ TargetLibstdc++ ] diff --git a/headers/private/media/MediaRecorderNode.h b/src/kits/media/MediaRecorderNode.h similarity index 100% rename from headers/private/media/MediaRecorderNode.h rename to src/kits/media/MediaRecorderNode.h diff --git a/src/kits/media/AdapterIO.cpp b/src/kits/media/experimental/AdapterIO.cpp similarity index 100% rename from src/kits/media/AdapterIO.cpp rename to src/kits/media/experimental/AdapterIO.cpp diff --git a/src/kits/media/MediaClient.cpp b/src/kits/media/experimental/MediaClient.cpp similarity index 99% rename from src/kits/media/MediaClient.cpp rename to src/kits/media/experimental/MediaClient.cpp index ebb95718d9..da7daeac43 100755 --- a/src/kits/media/MediaClient.cpp +++ b/src/kits/media/experimental/MediaClient.cpp @@ -10,6 +10,8 @@ #include #include +#include "MediaClientNode.h" + #include "debug.h" diff --git a/src/kits/media/MediaClientDefs.cpp b/src/kits/media/experimental/MediaClientDefs.cpp similarity index 100% rename from src/kits/media/MediaClientDefs.cpp rename to src/kits/media/experimental/MediaClientDefs.cpp diff --git a/src/kits/media/MediaClientNode.cpp b/src/kits/media/experimental/MediaClientNode.cpp similarity index 100% rename from src/kits/media/MediaClientNode.cpp rename to src/kits/media/experimental/MediaClientNode.cpp diff --git a/headers/private/media/MediaClientNode.h b/src/kits/media/experimental/MediaClientNode.h similarity index 100% rename from headers/private/media/MediaClientNode.h rename to src/kits/media/experimental/MediaClientNode.h diff --git a/src/kits/media/MediaConnection.cpp b/src/kits/media/experimental/MediaConnection.cpp similarity index 99% rename from src/kits/media/MediaConnection.cpp rename to src/kits/media/experimental/MediaConnection.cpp index f9c8ea8a4f..3907a55958 100644 --- a/src/kits/media/MediaConnection.cpp +++ b/src/kits/media/experimental/MediaConnection.cpp @@ -5,6 +5,8 @@ #include +#include "MediaClientNode.h" + #include "debug.h" diff --git a/src/kits/media/MediaIO.cpp b/src/kits/media/experimental/MediaIO.cpp similarity index 100% rename from src/kits/media/MediaIO.cpp rename to src/kits/media/experimental/MediaIO.cpp diff --git a/src/kits/media/SimpleMediaClient.cpp b/src/kits/media/experimental/SimpleMediaClient.cpp similarity index 100% rename from src/kits/media/SimpleMediaClient.cpp rename to src/kits/media/experimental/SimpleMediaClient.cpp diff --git a/src/tests/kits/media/media_client/Jamfile b/src/tests/kits/media/media_client/Jamfile index a488f7c471..260955b4c6 100644 --- a/src/tests/kits/media/media_client/Jamfile +++ b/src/tests/kits/media/media_client/Jamfile @@ -2,6 +2,8 @@ SubDir HAIKU_TOP src tests kits media media_client ; UsePrivateHeaders media ; +UsePrivateHeaders [ FDirName media experimental ] ; + SimpleTest media_client : media_client.cpp : libmedia.so be root [ TargetLibsupc++ ]