Expose the capture-side AudioProcessing object and allow it to be injected.
* Clean up the configuration code, including removing most of the weird defines.
* Add a unit test.
Review URL: https://webrtc-codereview.appspot.com/1152005
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3605 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/voice_engine/shared_data.h b/voice_engine/shared_data.h
index 191e369..cce6368 100644
--- a/voice_engine/shared_data.h
+++ b/voice_engine/shared_data.h
@@ -11,14 +11,13 @@
#ifndef WEBRTC_VOICE_ENGINE_SHARED_DATA_H
#define WEBRTC_VOICE_ENGINE_SHARED_DATA_H
-#include "voice_engine_defines.h"
-
-#include "channel_manager.h"
-#include "statistics.h"
-#include "process_thread.h"
-
-#include "audio_device.h"
-#include "audio_processing.h"
+#include "webrtc/modules/audio_device/include/audio_device.h"
+#include "webrtc/modules/audio_processing/include/audio_processing.h"
+#include "webrtc/modules/utility/interface/process_thread.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/voice_engine/channel_manager.h"
+#include "webrtc/voice_engine/statistics.h"
+#include "webrtc/voice_engine/voice_engine_defines.h"
class ProcessThread;
@@ -39,7 +38,7 @@
ChannelManager& channel_manager() { return _channelManager; }
AudioDeviceModule* audio_device() { return _audioDevicePtr; }
void set_audio_device(AudioDeviceModule* audio_device);
- AudioProcessing* audio_processing() { return _audioProcessingModulePtr; }
+ AudioProcessing* audio_processing() { return audioproc_.get(); }
void set_audio_processing(AudioProcessing* audio_processing);
TransmitMixer* transmit_mixer() { return _transmitMixerPtr; }
OutputMixer* output_mixer() { return _outputMixerPtr; }
@@ -72,7 +71,7 @@
AudioDeviceModule* _audioDevicePtr;
OutputMixer* _outputMixerPtr;
TransmitMixer* _transmitMixerPtr;
- AudioProcessing* _audioProcessingModulePtr;
+ scoped_ptr<AudioProcessing> audioproc_;
ProcessThread* _moduleProcessThreadPtr;
bool _externalRecording;