$OpenBSD$ index f56cb44..12bce50 100644 --- dom/media/MediaManager.h.orig Fri Feb 20 15:40:37 2015 +++ dom/media/MediaManager.h Fri Feb 20 15:40:37 2015 @@ -470,6 +470,12 @@ public: MediaEngineAudioSource* GetSource(); }; +// we could add MediaManager if needed +typedef void (*WindowListenerCallback)(MediaManager *aThis, + uint64_t aWindowID, + StreamListeners *aListeners, + void *aData); + class MediaManager MOZ_FINAL : public nsIMediaManagerService, public nsIObserver { @@ -481,6 +487,11 @@ public: // from MediaManager thread. static MediaManager* Get(); + static bool Exists() + { + return !!sSingleton; + } + static nsIThread* GetThread() { return Get()->mMediaThread; } @@ -542,8 +553,9 @@ private: ~MediaManager() {} - nsresult MediaCaptureWindowStateInternal(nsIDOMWindow* aWindow, bool* aVideo, - bool* aAudio); + void IterateWindowListeners(nsPIDOMWindow *aWindow, + WindowListenerCallback aCallback, + void *aData); void StopMediaStreams();