wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-31 11:37:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #80 - De-unify dom/media part 2

Browse source
This commit is contained in:
Moonchild 2020-04-22 11:13:13 +00:00 • committed by Roy Tam
commit 730d952e1b
4 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dom/media/standalone/moz.build
View file

@ -7,7 +7,7 @@
if CONFIG['OS_TARGET'] != 'WINNT': if CONFIG['OS_TARGET'] != 'WINNT':
Library('media_standalone') Library('media_standalone')
UNIFIED_SOURCES += [ SOURCES += [
'../AudioChannelFormat.cpp', '../AudioChannelFormat.cpp',
'../AudioSegment.cpp', '../AudioSegment.cpp',
'../SimpleImageBuffer.cpp', '../SimpleImageBuffer.cpp',

1
dom/media/systemservices/MediaParent.cpp
View file

@ -23,6 +23,7 @@
#include "nsAppDirectoryServiceDefs.h" #include "nsAppDirectoryServiceDefs.h"
#include "nsISupportsImpl.h" #include "nsISupportsImpl.h"
#include "mozilla/Logging.h" #include "mozilla/Logging.h"
#include "mozilla/MediaManager.h"
#undef LOG #undef LOG
mozilla::LazyLogModule gMediaParentLog("MediaParent"); mozilla::LazyLogModule gMediaParentLog("MediaParent");

1
dom/media/systemservices/MediaSystemResourceManager.cpp
View file

@ -7,6 +7,7 @@
#include "mozilla/TaskQueue.h" #include "mozilla/TaskQueue.h"
#include "gfxPrefs.h" #include "gfxPrefs.h"
#include "MediaSystemResourceClient.h"
#include "MediaSystemResourceManagerChild.h" #include "MediaSystemResourceManagerChild.h"
#include "mozilla/layers/ImageBridgeChild.h" #include "mozilla/layers/ImageBridgeChild.h"

12
dom/media/systemservices/moz.build
View file

@ -12,7 +12,7 @@ if CONFIG['MOZ_WEBRTC']:
'LoadManagerFactory.h', 'LoadManagerFactory.h',
'LoadMonitor.h', 'LoadMonitor.h',
] ]
UNIFIED_SOURCES += [ SOURCES += [
'CamerasChild.cpp', 'CamerasChild.cpp',
'CamerasParent.cpp', 'CamerasParent.cpp',
'LoadManager.cpp', 'LoadManager.cpp',
@ -24,6 +24,7 @@ if CONFIG['MOZ_WEBRTC']:
'/media/webrtc/signaling', '/media/webrtc/signaling',
'/media/webrtc/trunk', '/media/webrtc/trunk',
] ]
if CONFIG['OS_TARGET'] == 'WINNT': if CONFIG['OS_TARGET'] == 'WINNT':
DEFINES['WEBRTC_WIN'] = True DEFINES['WEBRTC_WIN'] = True
else: else:
@ -34,12 +35,12 @@ if CONFIG['OS_TARGET'] == 'Android':
EXPORTS += [ EXPORTS += [
'OpenSLESProvider.h' 'OpenSLESProvider.h'
] ]
UNIFIED_SOURCES += [ SOURCES += [
'OpenSLESProvider.cpp', 'OpenSLESProvider.cpp',
] ]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
UNIFIED_SOURCES += ['OSXRunLoopSingleton.cpp'] SOURCES += ['OSXRunLoopSingleton.cpp']
EXPORTS += ['OSXRunLoopSingleton.h'] EXPORTS += ['OSXRunLoopSingleton.h']
if CONFIG['_MSC_VER']: if CONFIG['_MSC_VER']:
@ -66,7 +67,8 @@ EXPORTS.mozilla.media += ['CamerasTypes.h',
'MediaTaskUtils.h', 'MediaTaskUtils.h',
'MediaUtils.h', 'MediaUtils.h',
] ]
UNIFIED_SOURCES += [
SOURCES += [
'MediaChild.cpp', 'MediaChild.cpp',
'MediaParent.cpp', 'MediaParent.cpp',
'MediaSystemResourceClient.cpp', 'MediaSystemResourceClient.cpp',
@ -76,11 +78,13 @@ UNIFIED_SOURCES += [
'MediaSystemResourceService.cpp', 'MediaSystemResourceService.cpp',
'MediaUtils.cpp', 'MediaUtils.cpp',
] ]
IPDL_SOURCES += [ IPDL_SOURCES += [
'PCameras.ipdl', 'PCameras.ipdl',
'PMedia.ipdl', 'PMedia.ipdl',
'PMediaSystemResourceManager.ipdl', 'PMediaSystemResourceManager.ipdl',
] ]
# /dom/base needed for nsGlobalWindow.h in MediaChild.cpp # /dom/base needed for nsGlobalWindow.h in MediaChild.cpp
LOCAL_INCLUDES += [ LOCAL_INCLUDES += [
'/dom/base', '/dom/base',