diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-03-21 16:15:54 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2021-03-21 16:15:54 +0000 |
| commit | b59777a67b8e0180eed34d43117db73186c7e1e1 (patch) | |
| tree | d895127d670bb13d41ec6de6234cbd8ef3362932 /dom | |
| parent | a94a86ff785e246caa9c71b2914e0bb5f7b03333 (diff) | |
| download | uxp-b59777a67b8e0180eed34d43117db73186c7e1e1.tar.gz | |
Issue #1053 - Remove __ANDROID__ defines (except in third party code)
Diffstat (limited to 'dom')
| -rw-r--r-- | dom/media/AudioStream.cpp | 7 | ||||
| -rw-r--r-- | dom/media/GraphDriver.cpp | 8 |
2 files changed, 0 insertions, 15 deletions
diff --git a/dom/media/AudioStream.cpp b/dom/media/AudioStream.cpp index 4b1d82c37f..77ed512eee 100644 --- a/dom/media/AudioStream.cpp +++ b/dom/media/AudioStream.cpp @@ -331,13 +331,6 @@ AudioStream::Init(uint32_t aNumChannels, uint32_t aRate, cubeb_stream_params params; params.rate = aRate; params.channels = mOutChannels; -#if defined(__ANDROID__) - params.stream_type = CUBEB_STREAM_TYPE_MUSIC; - - if (params.stream_type == CUBEB_STREAM_TYPE_MAX) { - return NS_ERROR_INVALID_ARG; - } -#endif params.format = ToCubebFormat<AUDIO_OUTPUT_FORMAT>::value; mAudioClock.Init(aRate); diff --git a/dom/media/GraphDriver.cpp b/dom/media/GraphDriver.cpp index fe40c82e24..e8b71a2318 100644 --- a/dom/media/GraphDriver.cpp +++ b/dom/media/GraphDriver.cpp @@ -630,15 +630,7 @@ AudioCallbackDriver::Init() mSampleRate = output.rate = CubebUtils::PreferredSampleRate(); -#if defined(__ANDROID__) - output.stream_type = CUBEB_STREAM_TYPE_MUSIC; - if (output.stream_type == CUBEB_STREAM_TYPE_MAX) { - NS_WARNING("Bad stream type"); - return; - } -#else (void)mAudioChannel; -#endif output.channels = mGraphImpl->AudioChannelCount(); if (AUDIO_OUTPUT_FORMAT == AUDIO_FORMAT_S16) { |