Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2530)

Unified Diff: media/audio/win/audio_manager_win.h

Issue 9570014: Move some generic functions to AudioManagerBase to be inherited by platform-specific AudioManager*** (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix the memory leak in the alsa unittests Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/audio/win/audio_manager_win.h
diff --git a/media/audio/win/audio_manager_win.h b/media/audio/win/audio_manager_win.h
index 594e5351092b4c2b82c0e1c174da5b6497a6f5eb..63e4027a861707715463da1eb6c9e5ea745a1672 100644
--- a/media/audio/win/audio_manager_win.h
+++ b/media/audio/win/audio_manager_win.h
@@ -24,10 +24,6 @@ class MEDIA_EXPORT AudioManagerWin : public AudioManagerBase {
// Implementation of AudioManager.
virtual bool HasAudioOutputDevices() OVERRIDE;
virtual bool HasAudioInputDevices() OVERRIDE;
- virtual AudioOutputStream* MakeAudioOutputStream(
- const AudioParameters& params) OVERRIDE;
- virtual AudioInputStream* MakeAudioInputStream(
- const AudioParameters& params, const std::string& device_id) OVERRIDE;
virtual void MuteAll() OVERRIDE;
virtual void UnMuteAll() OVERRIDE;
virtual string16 GetAudioInputDeviceModel() OVERRIDE;
@@ -36,12 +32,16 @@ class MEDIA_EXPORT AudioManagerWin : public AudioManagerBase {
virtual void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names)
OVERRIDE;
- // Windows-only methods to free a stream created in MakeAudioStream. These
- // are called internally by the audio stream when it has been closed.
- void ReleaseOutputStream(AudioOutputStream* stream);
-
- // Called internally by the audio stream when it has been closed.
- void ReleaseInputStream(AudioInputStream* stream);
+ // Implementation of AudioManagerBase.
+ virtual int GetMaxAudioOutputStreamsAllowed() OVERRIDE;
+ virtual AudioOutputStream* MakeAudioLinearOutputStream(
+ const AudioParameters& params) OVERRIDE;
+ virtual AudioOutputStream* MakeAudioLowLatencyOutputStream(
+ const AudioParameters& params) OVERRIDE;
+ virtual AudioInputStream* MakeAudioLinearInputStream(
+ const AudioParameters& params, const std::string& device_id) OVERRIDE;
+ virtual AudioInputStream* MakeAudioLowLatencyInputStream(
+ const AudioParameters& params, const std::string& device_id) OVERRIDE;
protected:
virtual ~AudioManagerWin();
@@ -62,9 +62,6 @@ class MEDIA_EXPORT AudioManagerWin : public AudioManagerBase {
enumeration_type_ = type;
}
- // Number of currently open output streams.
- int num_output_streams_;
-
DISALLOW_COPY_AND_ASSIGN(AudioManagerWin);
};

Powered by Google App Engine
This is Rietveld 408576698