diff options
| author | Jordan Cristiano <jordan.cristi@gmail.com> | 2013-06-22 23:49:16 -0400 |
|---|---|---|
| committer | Jordan Cristiano <jordan.cristi@gmail.com> | 2013-06-22 23:49:16 -0400 |
| commit | fea1e3b698e75e29df7ccd2dbdd5717bf225147e (patch) | |
| tree | d087c958451a279c121adb4867f0b7595c1424a8 /Source/Core/AudioCommon/Src/PulseAudioStream.cpp | |
| parent | 0c9c3c97372836e35c75a67758f8276879ea0ac4 (diff) | |
| parent | 8cf515359c2474c9b304b99cf07bd88aa2b0f766 (diff) | |
Merge branch 'audio_misc'
- audio no longer stops playing when dolphin is in the background with the dsound backend
- wav audio dumps now have the correct sizes instead of an arbitrarily large size
Diffstat (limited to 'Source/Core/AudioCommon/Src/PulseAudioStream.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/Src/PulseAudioStream.cpp | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp b/Source/Core/AudioCommon/Src/PulseAudioStream.cpp index faa94c22e0..13307a8fe0 100644 --- a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp +++ b/Source/Core/AudioCommon/Src/PulseAudioStream.cpp @@ -1,19 +1,6 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #include <functional> |