diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-02-08 08:33:41 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-08 08:33:41 -0800 |
| commit | 86feafe15b3f9609e1e9f64184688c2b6f2e4834 (patch) | |
| tree | 281f6c3826240aeabc62820918b9e206a6cfb76e /services/audioflinger | |
| parent | e616d4e6de6d53ddebbc3d7fb381af94589c2232 (diff) | |
| parent | c19e22450e6e3d07594c935c7a9522e85e909e82 (diff) | |
| download | frameworks_av-86feafe15b3f9609e1e9f64184688c2b6f2e4834.zip frameworks_av-86feafe15b3f9609e1e9f64184688c2b6f2e4834.tar.gz frameworks_av-86feafe15b3f9609e1e9f64184688c2b6f2e4834.tar.bz2 | |
Merge "Use virtual destructors"
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 18 | ||||
| -rw-r--r-- | services/audioflinger/AudioMixer.h | 2 | ||||
| -rw-r--r-- | services/audioflinger/AudioResamplerSinc.h | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 96c5ceb..e127a6f 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -323,7 +323,7 @@ private: uint32_t flags, const sp<IMemory>& sharedBuffer, int sessionId); - ~TrackBase(); + virtual ~TrackBase(); virtual status_t start() = 0; virtual void stop() = 0; @@ -581,7 +581,7 @@ private: int frameCount, const sp<IMemory>& sharedBuffer, int sessionId); - ~Track(); + virtual ~Track(); void dump(char* buffer, size_t size); virtual status_t start(); @@ -664,7 +664,7 @@ private: audio_format_t format, uint32_t channelMask, int frameCount); - ~OutputTrack(); + virtual ~OutputTrack(); virtual status_t start(); virtual void stop(); @@ -845,7 +845,7 @@ private: public: DirectOutputThread (const sp<AudioFlinger>& audioFlinger, AudioStreamOut* output, int id, uint32_t device); - ~DirectOutputThread(); + virtual ~DirectOutputThread(); // Thread virtuals virtual bool threadLoop(); @@ -871,7 +871,7 @@ private: class DuplicatingThread : public MixerThread { public: DuplicatingThread (const sp<AudioFlinger>& audioFlinger, MixerThread* mainThread, int id); - ~DuplicatingThread(); + virtual ~DuplicatingThread(); // Thread virtuals virtual bool threadLoop(); @@ -946,7 +946,7 @@ private: int frameCount, uint32_t flags, int sessionId); - ~RecordTrack(); + virtual ~RecordTrack(); virtual status_t start(); virtual void stop(); @@ -975,7 +975,7 @@ private: uint32_t channels, int id, uint32_t device); - ~RecordThread(); + virtual ~RecordThread(); virtual bool threadLoop(); virtual status_t readyToRun(); @@ -1064,7 +1064,7 @@ private: effect_descriptor_t *desc, int id, int sessionId); - ~EffectModule(); + virtual ~EffectModule(); enum effect_state { IDLE, @@ -1241,7 +1241,7 @@ mutable Mutex mLock; // mutex for process, commands and handl class EffectChain: public RefBase { public: EffectChain(const wp<ThreadBase>& wThread, int sessionId); - ~EffectChain(); + virtual ~EffectChain(); // special key used for an entry in mSuspendedEffects keyed vector // corresponding to a suspend all request. diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h index 84f6330..40a508e 100644 --- a/services/audioflinger/AudioMixer.h +++ b/services/audioflinger/AudioMixer.h @@ -33,7 +33,7 @@ class AudioMixer public: AudioMixer(size_t frameCount, uint32_t sampleRate); - ~AudioMixer(); + /*virtual*/ ~AudioMixer(); // non-virtual saves a v-table, restore if sub-classed static const uint32_t MAX_NUM_TRACKS = 32; static const uint32_t MAX_NUM_CHANNELS = 2; diff --git a/services/audioflinger/AudioResamplerSinc.h b/services/audioflinger/AudioResamplerSinc.h index 0e1bc44..f0a07b8 100644 --- a/services/audioflinger/AudioResamplerSinc.h +++ b/services/audioflinger/AudioResamplerSinc.h @@ -31,7 +31,7 @@ class AudioResamplerSinc : public AudioResampler { public: AudioResamplerSinc(int bitDepth, int inChannelCount, int32_t sampleRate); - ~AudioResamplerSinc(); + virtual ~AudioResamplerSinc(); virtual void resample(int32_t* out, size_t outFrameCount, AudioBufferProvider* provider); |