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

b=1033122 be consistent about speex_resampler symbol visibility r=khuey

Browse Source 
When "speex/speex_resampler.h" was included, another exported header (in
dist/include) would find the speex/speex_resampler.h in dist/include before
dist/system_wrappers.  Visibility of undefined symbols depended on the order
of includes.

This patch changes includes to <speex/speex_resampler.h> so that
WRAP_SYSTEM_INCLUDES works as expected but removes the wrapper when not using
GKMEDIAS_SHARED_LIBRARY.

--HG--
extra : rebase_source : 93ca1dbdd6b489647624326e78539f44c60d0b34
This commit is contained in:
Karl Tomlinson 2014-07-02 14:21:34 +12:00
parent ac97af274c
commit 39582dd9ce
11 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/system-headers
View File

@ -1263,7 +1263,6 @@ X11/Xlocale.h
X11/Xos.h X11/Xos.h
X11/Xutil.h X11/Xutil.h
zmouse.h zmouse.h
speex/speex_resampler.h
soundtouch/SoundTouch.h soundtouch/SoundTouch.h
#if MOZ_NATIVE_PNG==1 #if MOZ_NATIVE_PNG==1
png.h png.h
@ -1325,6 +1324,7 @@ vpx_mem/vpx_mem.h
vorbis/codec.h vorbis/codec.h
theora/theoradec.h theora/theoradec.h
tremor/ivorbiscodec.h tremor/ivorbiscodec.h
speex/speex_resampler.h
ogg/ogg.h ogg/ogg.h
ogg/os_types.h ogg/os_types.h
nestegg/nestegg.h nestegg/nestegg.h

1
content/media/AudioNodeExternalInputStream.cpp
View File

@ -6,7 +6,6 @@
#include "AudioNodeEngine.h" #include "AudioNodeEngine.h"
#include "AudioNodeExternalInputStream.h" #include "AudioNodeExternalInputStream.h"
#include "AudioChannelFormat.h" #include "AudioChannelFormat.h"
#include "speex/speex_resampler.h"
#include "mozilla/dom/MediaStreamAudioSourceNode.h" #include "mozilla/dom/MediaStreamAudioSourceNode.h"
using namespace mozilla::dom; using namespace mozilla::dom;

2
content/media/AudioSegment.cpp
View File

@ -9,7 +9,7 @@
#include "AudioMixer.h" #include "AudioMixer.h"
#include "AudioChannelFormat.h" #include "AudioChannelFormat.h"
#include "Latency.h" #include "Latency.h"
#include "speex/speex_resampler.h" #include <speex/speex_resampler.h>
namespace mozilla { namespace mozilla {

1
content/media/MediaStreamGraph.cpp
View File

@ -28,7 +28,6 @@
#include "DOMMediaStream.h" #include "DOMMediaStream.h"
#include "GeckoProfiler.h" #include "GeckoProfiler.h"
#include "mozilla/unused.h" #include "mozilla/unused.h"
#include "speex/speex_resampler.h"
#ifdef MOZ_WEBRTC #ifdef MOZ_WEBRTC
#include "AudioOutputObserver.h" #include "AudioOutputObserver.h"
#endif #endif

2
content/media/MediaStreamGraph.h
View File

@ -17,7 +17,7 @@
#include "VideoSegment.h" #include "VideoSegment.h"
#include "MainThreadUtils.h" #include "MainThreadUtils.h"
#include "nsAutoRef.h" #include "nsAutoRef.h"
#include "speex/speex_resampler.h" #include <speex/speex_resampler.h>
#include "AudioMixer.h" #include "AudioMixer.h"
#include "mozilla/dom/AudioChannelBinding.h" #include "mozilla/dom/AudioChannelBinding.h"

1
content/media/webaudio/AudioBufferSourceNode.cpp
View File

@ -12,7 +12,6 @@
#include "AudioNodeStream.h" #include "AudioNodeStream.h"
#include "AudioDestinationNode.h" #include "AudioDestinationNode.h"
#include "AudioParamTimeline.h" #include "AudioParamTimeline.h"
#include "speex/speex_resampler.h"
#include <limits> #include <limits>
namespace mozilla { namespace mozilla {

1
content/media/webaudio/WaveShaperNode.cpp
View File

@ -10,7 +10,6 @@
#include "AudioNodeEngine.h" #include "AudioNodeEngine.h"
#include "AudioNodeStream.h" #include "AudioNodeStream.h"
#include "mozilla/PodOperations.h" #include "mozilla/PodOperations.h"
#include "speex/speex_resampler.h"
namespace mozilla { namespace mozilla {
namespace dom { namespace dom {

1
content/media/webaudio/WebAudioUtils.cpp
View File

@ -8,7 +8,6 @@
#include "AudioNodeStream.h" #include "AudioNodeStream.h"
#include "AudioParamTimeline.h" #include "AudioParamTimeline.h"
#include "blink/HRTFDatabaseLoader.h" #include "blink/HRTFDatabaseLoader.h"
#include "speex/speex_resampler.h"
namespace mozilla { namespace mozilla {

2
content/media/webaudio/blink/HRTFElevation.cpp
View File

@ -28,7 +28,7 @@
#include "HRTFElevation.h" #include "HRTFElevation.h"
#include "speex/speex_resampler.h" #include <speex/speex_resampler.h>
#include "mozilla/PodOperations.h" #include "mozilla/PodOperations.h"
#include "AudioSampleFormat.h" #include "AudioSampleFormat.h"

6
media/libspeex_resampler/src/moz.build
View File

@ -24,8 +24,12 @@ FINAL_LIBRARY = 'gkmedias'
# We don't compile the full speex codec, only the resampler. # We don't compile the full speex codec, only the resampler.
DEFINES['OUTSIDE_SPEEX'] = True DEFINES['OUTSIDE_SPEEX'] = True
# We don't use -fvisibility=hidden
# Visibility is handled through VISIBILITY_FLAGS and
# layout/media/symbols.def.in.
DEFINES['EXPORT'] = '' DEFINES['EXPORT'] = ''
if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
NO_VISIBILITY_FLAGS = True
if CONFIG['OS_TARGET'] == 'Android': if CONFIG['OS_TARGET'] == 'Android':
DEFINES['FIXED_POINT'] = True DEFINES['FIXED_POINT'] = True

2
media/webrtc/trunk/webrtc/common_audio/resampler/include/resampler.h
View File

@ -17,7 +17,7 @@
#define WEBRTC_RESAMPLER_RESAMPLER_H_ #define WEBRTC_RESAMPLER_RESAMPLER_H_
#include "webrtc/typedefs.h" #include "webrtc/typedefs.h"
#include "speex/speex_resampler.h" #include <speex/speex_resampler.h>
namespace webrtc namespace webrtc
{ {