summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-04-22 11:13:13 +0000
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-26 10:18:45 +0200
commit3652cd0f998b0499c3ed1d03d2042bbaf69e0699 (patch)
treecdd152d64852fe88798c9caf68a61fa31c9dab73
parentb738ccc61b05e4848c0e8d0400a8aee770f591a2 (diff)
downloadUXP-3652cd0f998b0499c3ed1d03d2042bbaf69e0699.tar
UXP-3652cd0f998b0499c3ed1d03d2042bbaf69e0699.tar.gz
UXP-3652cd0f998b0499c3ed1d03d2042bbaf69e0699.tar.lz
UXP-3652cd0f998b0499c3ed1d03d2042bbaf69e0699.tar.xz
UXP-3652cd0f998b0499c3ed1d03d2042bbaf69e0699.zip
Issue #80 - De-unify dom/media part 2
-rw-r--r--dom/media/standalone/moz.build2
-rw-r--r--dom/media/systemservices/MediaParent.cpp1
-rw-r--r--dom/media/systemservices/MediaSystemResourceManager.cpp1
-rw-r--r--dom/media/systemservices/moz.build12
4 files changed, 11 insertions, 5 deletions
diff --git a/dom/media/standalone/moz.build b/dom/media/standalone/moz.build
index 959703765..a3cc3545f 100644
--- a/dom/media/standalone/moz.build
+++ b/dom/media/standalone/moz.build
@@ -7,7 +7,7 @@
if CONFIG['OS_TARGET'] != 'WINNT':
Library('media_standalone')
-UNIFIED_SOURCES += [
+SOURCES += [
'../AudioChannelFormat.cpp',
'../AudioSegment.cpp',
'../SimpleImageBuffer.cpp',
diff --git a/dom/media/systemservices/MediaParent.cpp b/dom/media/systemservices/MediaParent.cpp
index 89a495f6a..16c399f37 100644
--- a/dom/media/systemservices/MediaParent.cpp
+++ b/dom/media/systemservices/MediaParent.cpp
@@ -23,6 +23,7 @@
#include "nsAppDirectoryServiceDefs.h"
#include "nsISupportsImpl.h"
#include "mozilla/Logging.h"
+#include "mozilla/MediaManager.h"
#undef LOG
mozilla::LazyLogModule gMediaParentLog("MediaParent");
diff --git a/dom/media/systemservices/MediaSystemResourceManager.cpp b/dom/media/systemservices/MediaSystemResourceManager.cpp
index 29db0ef3e..a66e946eb 100644
--- a/dom/media/systemservices/MediaSystemResourceManager.cpp
+++ b/dom/media/systemservices/MediaSystemResourceManager.cpp
@@ -7,6 +7,7 @@
#include "mozilla/TaskQueue.h"
#include "gfxPrefs.h"
+#include "MediaSystemResourceClient.h"
#include "MediaSystemResourceManagerChild.h"
#include "mozilla/layers/ImageBridgeChild.h"
diff --git a/dom/media/systemservices/moz.build b/dom/media/systemservices/moz.build
index 82a5c5e72..c582b7ba1 100644
--- a/dom/media/systemservices/moz.build
+++ b/dom/media/systemservices/moz.build
@@ -12,7 +12,7 @@ if CONFIG['MOZ_WEBRTC']:
'LoadManagerFactory.h',
'LoadMonitor.h',
]
- UNIFIED_SOURCES += [
+ SOURCES += [
'CamerasChild.cpp',
'CamerasParent.cpp',
'LoadManager.cpp',
@@ -24,6 +24,7 @@ if CONFIG['MOZ_WEBRTC']:
'/media/webrtc/signaling',
'/media/webrtc/trunk',
]
+
if CONFIG['OS_TARGET'] == 'WINNT':
DEFINES['WEBRTC_WIN'] = True
else:
@@ -34,12 +35,12 @@ if CONFIG['OS_TARGET'] == 'Android':
EXPORTS += [
'OpenSLESProvider.h'
]
- UNIFIED_SOURCES += [
+ SOURCES += [
'OpenSLESProvider.cpp',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
- UNIFIED_SOURCES += ['OSXRunLoopSingleton.cpp']
+ SOURCES += ['OSXRunLoopSingleton.cpp']
EXPORTS += ['OSXRunLoopSingleton.h']
if CONFIG['_MSC_VER']:
@@ -66,7 +67,8 @@ EXPORTS.mozilla.media += ['CamerasTypes.h',
'MediaTaskUtils.h',
'MediaUtils.h',
]
-UNIFIED_SOURCES += [
+
+SOURCES += [
'MediaChild.cpp',
'MediaParent.cpp',
'MediaSystemResourceClient.cpp',
@@ -76,11 +78,13 @@ UNIFIED_SOURCES += [
'MediaSystemResourceService.cpp',
'MediaUtils.cpp',
]
+
IPDL_SOURCES += [
'PCameras.ipdl',
'PMedia.ipdl',
'PMediaSystemResourceManager.ipdl',
]
+
# /dom/base needed for nsGlobalWindow.h in MediaChild.cpp
LOCAL_INCLUDES += [
'/dom/base',