The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-27 08:15:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'audio_misc'

Browse Source 
- 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
This commit is contained in:
Jordan Cristiano 2013-06-22 23:49:16 -04:00
commit fea1e3b698
10 changed files with 31 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Core/AudioCommon/Src/AlsaSoundStream.cpp
View File

@ -1,19 +1,6 @@
// Copyright (C) 2003 Dolphin Project. // Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// This program is free software: you can redistribute it and/or modify // Refer to the license.txt file included.
// 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/
#include <functional> #include <functional>

19
Source/Core/AudioCommon/Src/AlsaSoundStream.h
View File

@ -1,19 +1,6 @@
// Copyright (C) 2003 Dolphin Project. // Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// This program is free software: you can redistribute it and/or modify // Refer to the license.txt file included.
// 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/
#ifndef _ALSA_SOUND_STREAM_H #ifndef _ALSA_SOUND_STREAM_H
#define _ALSA_SOUND_STREAM_H #define _ALSA_SOUND_STREAM_H

19
Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp
View File

@ -1,19 +1,6 @@
// Copyright (C) 2003 Dolphin Project. // Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// This program is free software: you can redistribute it and/or modify // Refer to the license.txt file included.
// 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/
#include <CoreServices/CoreServices.h> #include <CoreServices/CoreServices.h>

19
Source/Core/AudioCommon/Src/CoreAudioSoundStream.h
View File

@ -1,19 +1,6 @@
// Copyright (C) 2003 Dolphin Project. // Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// This program is free software: you can redistribute it and/or modify // Refer to the license.txt file included.
// 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/
#ifndef _COREAUDIO_SOUND_STREAM_H #ifndef _COREAUDIO_SOUND_STREAM_H
#define _COREAUDIO_SOUND_STREAM_H #define _COREAUDIO_SOUND_STREAM_H

2
Source/Core/AudioCommon/Src/DSoundStream.cpp
View File

@ -28,7 +28,7 @@ bool DSound::CreateBuffer()
// Fill out DSound buffer description. // Fill out DSound buffer description.
dsbdesc.dwSize = sizeof(DSBUFFERDESC); dsbdesc.dwSize = sizeof(DSBUFFERDESC);
dsbdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_STICKYFOCUS | DSBCAPS_CTRLVOLUME; dsbdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_CTRLVOLUME | DSBCAPS_GLOBALFOCUS;
dsbdesc.dwBufferBytes = bufferSize = BUFSIZE; dsbdesc.dwBufferBytes = bufferSize = BUFSIZE;
dsbdesc.lpwfxFormat = (WAVEFORMATEX *)&pcmwf; dsbdesc.lpwfxFormat = (WAVEFORMATEX *)&pcmwf;
dsbdesc.guid3DAlgorithm = DS3DALG_DEFAULT; dsbdesc.guid3DAlgorithm = DS3DALG_DEFAULT;

19
Source/Core/AudioCommon/Src/OpenSLESStream.cpp
View File

@ -1,19 +1,6 @@
// Copyright (C) 2003 Dolphin Project. // Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// This program is free software: you can redistribute it and/or modify // Refer to the license.txt file included.
// 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/
#ifdef ANDROID #ifdef ANDROID
#include "Common.h" #include "Common.h"

19
Source/Core/AudioCommon/Src/OpenSLESStream.h
View File

@ -1,19 +1,6 @@
// Copyright (C) 2003 Dolphin Project. // Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// This program is free software: you can redistribute it and/or modify // Refer to the license.txt file included.
// 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/
#ifndef _OPENSLSTREAM_H_ #ifndef _OPENSLSTREAM_H_
#define _OPENSLSTREAM_H_ #define _OPENSLSTREAM_H_

19
Source/Core/AudioCommon/Src/PulseAudioStream.cpp
View File

@ -1,19 +1,6 @@
// Copyright (C) 2003 Dolphin Project. // Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// This program is free software: you can redistribute it and/or modify // Refer to the license.txt file included.
// 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/
#include <functional> #include <functional>

19
Source/Core/AudioCommon/Src/PulseAudioStream.h
View File

@ -1,19 +1,6 @@
// Copyright (C) 2003 Dolphin Project. // Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// This program is free software: you can redistribute it and/or modify // Refer to the license.txt file included.
// 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/
#ifndef _PULSE_AUDIO_STREAM_H #ifndef _PULSE_AUDIO_STREAM_H
#define _PULSE_AUDIO_STREAM_H #define _PULSE_AUDIO_STREAM_H

9
Source/Core/AudioCommon/Src/WaveFile.cpp
View File

@ -8,10 +8,11 @@
enum {BUF_SIZE = 32*1024}; enum {BUF_SIZE = 32*1024};
WaveFileWriter::WaveFileWriter() WaveFileWriter::WaveFileWriter():
skip_silence(false),
audio_size(0),
conv_buffer(NULL)
{ {
conv_buffer = 0;
skip_silence = false;
} }
WaveFileWriter::~WaveFileWriter() WaveFileWriter::~WaveFileWriter()
@ -39,6 +40,8 @@ bool WaveFileWriter::Start(const char *filename, unsigned int HLESampleRate)
return false; return false;
} }
audio_size = 0;
// ----------------- // -----------------
// Write file header // Write file header
// ----------------- // -----------------