wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 1190285 move GraphTime definition to avoid GraphDriver.h includes r=padenot

Browse Source
This commit is contained in:
Karl Tomlinson 2015-07-23 11:48:47 +12:00
parent 61dea3e1f1
commit d8f7539bcf
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/media/GraphDriver.h
View File

@ -52,12 +52,6 @@ static const int AUDIO_TARGET_MS = 2*MEDIA_GRAPH_TARGET_PERIOD_MS +
class MediaStreamGraphImpl; class MediaStreamGraphImpl;
/**
* Microseconds relative to the start of the graph timeline.
*/
typedef int64_t GraphTime;
const GraphTime GRAPH_TIME_MAX = MEDIA_TIME_MAX;
class AudioCallbackDriver; class AudioCallbackDriver;
class OfflineClockDriver; class OfflineClockDriver;

6
dom/media/MediaSegment.h
View File

@ -48,6 +48,12 @@ const int64_t MEDIA_TIME_MAX = TRACK_TICKS_MAX;
typedef MediaTime StreamTime; typedef MediaTime StreamTime;
const StreamTime STREAM_TIME_MAX = MEDIA_TIME_MAX; const StreamTime STREAM_TIME_MAX = MEDIA_TIME_MAX;
/**
* Media time relative to the start of the graph timeline.
*/
typedef MediaTime GraphTime;
const GraphTime GRAPH_TIME_MAX = MEDIA_TIME_MAX;
/** /**
* A MediaSegment is a chunk of media data sequential in time. Different * A MediaSegment is a chunk of media data sequential in time. Different
* types of data have different subclasses of MediaSegment, all inheriting * types of data have different subclasses of MediaSegment, all inheriting

2
dom/media/MediaStreamGraph.h
View File

@ -12,6 +12,7 @@
#include "mozilla/dom/AudioChannelBinding.h" #include "mozilla/dom/AudioChannelBinding.h"
#include "AudioSegment.h"
#include "AudioStream.h" #include "AudioStream.h"
#include "nsTArray.h" #include "nsTArray.h"
#include "nsIRunnable.h" #include "nsIRunnable.h"
@ -21,7 +22,6 @@
#include "VideoSegment.h" #include "VideoSegment.h"
#include "MainThreadUtils.h" #include "MainThreadUtils.h"
#include "nsAutoRef.h" #include "nsAutoRef.h"
#include "GraphDriver.h"
#include <speex/speex_resampler.h> #include <speex/speex_resampler.h>
#include "DOMMediaStream.h" #include "DOMMediaStream.h"
#include "AudioContext.h" #include "AudioContext.h"

1
dom/media/moz.build
View File

@ -110,7 +110,6 @@ EXPORTS += [
'DOMMediaStream.h', 'DOMMediaStream.h',
'EncodedBufferCache.h', 'EncodedBufferCache.h',
'FileBlockCache.h', 'FileBlockCache.h',
'GraphDriver.h',
'Intervals.h', 'Intervals.h',
'Latency.h', 'Latency.h',
'MediaCache.h', 'MediaCache.h',