diff options
| author | robert.nagy@gmail.com <robert.nagy@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 21:45:43 +0000 |
|---|---|---|
| committer | robert.nagy@gmail.com <robert.nagy@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 21:45:43 +0000 |
| commit | cbb5635117d92850377a52fc4e1f2f1f064b5012 (patch) | |
| tree | cd15669b05f542c278c6cb9ea9215e6909748fe4 /media | |
| parent | 8370213599729eca93b6ba51ef996b4650f2d483 (diff) | |
| download | chromium_src-cbb5635117d92850377a52fc4e1f2f1f064b5012.zip chromium_src-cbb5635117d92850377a52fc4e1f2f1f064b5012.tar.gz chromium_src-cbb5635117d92850377a52fc4e1f2f1f064b5012.tar.bz2 | |
OpenBSD patches for media, split from CR #8275005
Sync the dummy OpenBSD audio manager and exclude -mssse3 from
cflags on OpenBSD since it's not supported in the used gcc version.
BUG=
TEST=
Review URL: http://codereview.chromium.org/8329024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106590 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/audio/openbsd/audio_manager_openbsd.cc | 8 | ||||
| -rw-r--r-- | media/audio/openbsd/audio_manager_openbsd.h | 10 | ||||
| -rw-r--r-- | media/media.gyp | 8 |
3 files changed, 10 insertions, 16 deletions
diff --git a/media/audio/openbsd/audio_manager_openbsd.cc b/media/audio/openbsd/audio_manager_openbsd.cc index cb94324..cb18768 100644 --- a/media/audio/openbsd/audio_manager_openbsd.cc +++ b/media/audio/openbsd/audio_manager_openbsd.cc @@ -4,10 +4,6 @@ #include "media/audio/openbsd/audio_manager_openbsd.h" -#include "base/logging.h" - -static AudioManagerOpenBSD* g_audio_manager = NULL; - // Implementation of AudioManager. bool AudioManagerOpenBSD::HasAudioOutputDevices() { NOTIMPLEMENTED(); @@ -37,10 +33,6 @@ AudioManagerOpenBSD::AudioManagerOpenBSD() { AudioManagerOpenBSD::~AudioManagerOpenBSD() { } -void AudioManagerOpenBSD::Init() { - AudioManagerBase::Init(); -} - void AudioManagerOpenBSD::MuteAll() { NOTIMPLEMENTED(); } diff --git a/media/audio/openbsd/audio_manager_openbsd.h b/media/audio/openbsd/audio_manager_openbsd.h index 8f7c412..b9f19c6 100644 --- a/media/audio/openbsd/audio_manager_openbsd.h +++ b/media/audio/openbsd/audio_manager_openbsd.h @@ -5,16 +5,13 @@ #ifndef MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_ #define MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_ -#include "base/compiler_specific.h" -#include "media/audio/audio_io.h" +#include "base/basictypes.h" +#include "media/audio/audio_manager_base.h" class AudioManagerOpenBSD : public AudioManagerBase { public: AudioManagerOpenBSD(); - // Call before using a newly created AudioManagerOpenBSD instance. - virtual void Init(); - // Implementation of AudioManager. virtual bool HasAudioOutputDevices() OVERRIDE; virtual bool HasAudioInputDevices() OVERRIDE; @@ -26,10 +23,9 @@ class AudioManagerOpenBSD : public AudioManagerBase { virtual void MuteAll() OVERRIDE; virtual void UnMuteAll() OVERRIDE; - protected: + private: virtual ~AudioManagerOpenBSD(); - private: DISALLOW_COPY_AND_ASSIGN(AudioManagerOpenBSD); }; diff --git a/media/media.gyp b/media/media.gyp index ae6e396..5fcebf7 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -447,6 +447,12 @@ '-mssse3', ], }], + [ 'OS == "openbsd"', { + # OpenBSD's gcc (4.2.1) does not support -mssse3 + 'cflags!': [ + '-mssse3', + ], + }], [ 'OS == "mac"', { 'configurations': { 'Debug': { @@ -479,7 +485,7 @@ ], }, }], - [ 'OS=="linux"', { + [ 'os_posix==1 and OS!="mac"', { 'variables': { 'conditions': [ [ 'target_arch=="ia32"', { |