4f324ad742
Clean Up
2015-01-24 17:10:21 -06:00
6e99accf06
Merge pull request #1917 from adamdmoss/no-lfe
...
Remove explicit subwoofer/LFE channel from Pulseaudio and OpenAL
2015-01-23 12:30:48 +11:00
05d2bf6060
Audio: Drop the LFE/subwoofer channel from the decoded surround
...
DPL2Decode still doesn't decode 5.1 properly, leaving bass in all channels, but its 5.0 is pretty good, so leave it at that.
2015-01-19 10:24:44 +00:00
cb86db7b68
Minor consistency changes
...
Mostly small changes, like capitalization and spelling
2015-01-12 15:18:18 -05:00
f7f70f9039
Merge pull request #1847 from adamdmoss/openal-floatfix
...
OpenAL: Fix volume of sample conversion
2015-01-10 12:16:05 +11:00
530f894d87
Merge pull request #1845 from adamdmoss/lfe1
...
Audio: Fix subwoofer output in software 5.1 decoding
2015-01-09 11:59:29 +11:00
ac33423db5
Merge pull request #1835 from adamdmoss/master
...
Pulseaudio: Support 5-channel surround, optional in UI
2015-01-09 11:59:02 +11:00
95c912310d
PulseAudio: Support 5.1 surround, optional in UI
2015-01-08 11:10:34 +00:00
b1c9f56acd
Audio: Fix warning in DPL2 subwoofer change
2015-01-08 10:48:30 +00:00
25c6f6e6a1
Merge pull request #1782 from FL-dolphinemu/master
...
Issue 7968: Added keybinds for increasing, decreasing, and muting audio.
2015-01-08 14:09:18 +11:00
2c892c7b68
OpenAL: Fix volume of sample conversion
2015-01-07 12:34:02 +00:00
7580069dea
Audio: Fuller subwoofer processing for software 5.1 decode
...
Code was only using front-left and front-right to calculate bass, but
HRTF code - which this was once based on - uses all five channels and
this sounds fuller.
2015-01-07 11:58:02 +00:00
f324f3f68f
Audio: Fix subwoofer output in software 5.1 decoding
...
The FIR filter was only using the first sample of each input packet.
2015-01-07 10:24:25 +00:00
6bcdb10eee
CMake: simplify some expressions
2015-01-03 13:17:57 +01:00
78f8bf7423
Issue 7968: Added keybinds for increasing, decreasing, and muting audio.
2014-12-28 22:03:21 +01:00
b36b55cfcb
Upgrade AudioUnit API usage.
...
weird that such a simple change doesn't seem to have any obvious
documentation on Apple's website or elsewhere...
2014-11-25 00:42:21 -05:00
aae234c5d7
Fix name conflict between SoundTouch BOOL and ObjC BOOL.
2014-11-25 00:27:13 -05:00
b25e1a2eb4
Various formatting and consistency fixes
2014-11-13 22:42:18 -05:00
5204acd5ee
Fixes OpenSLES's sample rate.
...
I was statically setting the sample rate to 44.1Khz when we default to run at 48Khz.
This was causing audio to sound much too low.
2014-10-23 11:29:49 -05:00
73512ad38f
Fix a race condition in our OpenSL ES audio backend.
...
After calling enqueue the callback would fire before we had assigned g_mixer a value.
This would cause a fun crash to happen.
2014-10-18 08:32:14 -05:00
0d1f8527c7
Merge pull request #1297 from RisingFog/audio-dump-during-emulation
...
Start/Stop Audio Dump During Emulation
2014-10-18 13:16:41 +11:00
108087bb68
Flipped Wave File Channels
...
This change was done because with the previous method of dumping audio, the mixer would handle switching the RL being emitted by the DSP to LR, and thus would provide the proper channel orientation. Because we're now dumping directly from PushSamples() and PushStreamingSamples(), it was writing the right channel to the left channel of the wave file and vice versa.
2014-10-15 23:16:48 -04:00
f2ed533841
Start/Stop Audio Dump During Emulation
2014-10-15 20:50:38 -04:00
fc4125cdd1
Proper Audio/Video Dumping
2014-10-09 00:06:04 -04:00
7f7fb5e70c
AudioCommon: Prefix soundStream global with g_
2014-09-30 03:06:16 -04:00
46057db37d
Fix build failing when disabling precompiled headers.
2014-09-19 18:17:51 -04:00
71cb09f1ca
Merge pull request #1027 from rohit-n/change-include
...
Include CommonTypes.h instead of Common.h.
2014-09-10 00:35:16 -05:00
f93aa7087c
Kill Core::g_CoreStartupParameter.
2014-09-09 00:24:49 -04:00
fbc64984ca
Include CommonTypes.h instead of Common.h.
2014-09-08 15:39:58 -04:00
789a500ddc
AudioCommon: Remove unnecessary usages of mem_fn
2014-09-08 13:41:02 -04:00
8abe9622fd
Route the wiimote speaker to the sound mixer (the host system's speakers). Emulated Wiimote speaker sounds will go to the host system's speakers. Real Wiimotes will continue to use their own speaker for Wiimote speaker sounds. All Wiimote speaker sound can be disabled by unchecking the "Enable Speaker Data" option.
...
Each emulated Wiimote can have its speaker routed from left to right via the "Speaker Pan" setting in the emulated wiimote settings dialog. Use any value from -127 for leftmost to 127 for rightmost with 0 being the centre.
Added code in the InputConfig to use a spin control for non-boolean values.
Defaulted the setting of "Enable Speaker Data" to disabled.
2014-09-07 14:16:20 +10:00
3caab10df8
Hooked up the emulated Wiimote speaker.
...
The Wiimotes are positioned as follows:
Wiimote 0 = Center
Wiimote 1 = Left
Wiimote 2 = Right
Wiimote 3 = Center
The Wiimote speaker output can be disabled via the "Enable Speaker Data" checkbox in the Wiimote settings.
2014-09-07 14:16:20 +10:00
daddc3317e
AudioCommon: Use std::string for the filename parameter of StartLogAudio
2014-09-06 23:26:08 -04:00
27cecf46a8
AudioCommon: Make WaveFileWriter inherit NonCopyable
2014-09-06 11:27:36 -04:00
019ef844d4
AudioCommon: Remove unused parameter from OpenSLESStream constructor
2014-09-06 01:42:56 -04:00
e10b0d1008
Merge pull request #930 from skidau/openal-seq-ms
...
Removed the auto setting of SEQUENCE_MS because the synchronised audio c...
2014-09-02 09:56:46 -04:00
266992684d
msvc: remove some remnants of SDL and DSound from projects and general cleanup.
2014-09-01 21:27:44 -07:00
c2d7801ceb
Removed the auto setting of SEQUENCE_MS because the synchronised audio code has made it unnecessary.
2014-09-01 20:28:29 +10:00
377a1c8f20
AudioCommon: Get rid of now unused handle param for InitSoundStream()
2014-08-30 23:36:00 -04:00
2f7df4a803
AudioCommon: Declare iterator variable in loop body in DPL2Decoder
2014-08-30 21:10:18 -04:00
f94e764df5
AudioCommon: Clean up brace placements
2014-08-30 18:06:42 -04:00
af2405eefd
Remove dsound audio backend.
...
There isn't any reason to use dsound over xaudio.
2014-08-23 11:19:19 -07:00
1332805bb6
Add headers required by XAudio2_7 to externals.
...
This makes all builds' audio compatible with downlevel Windows and removes
the need for developers to install the June 2010 DirectX SDK.
2014-08-23 11:03:07 -07:00
4759510f70
Get rid of instances of "using namespace std;" in the project
2014-08-17 02:05:33 -04:00
d18d3e1f3e
Common: Get rid of StdConditionVariable, StdMutex, and StdThread.
...
All of the compilers we support have support for these now.
2014-08-16 23:33:19 -04:00
f1b82a34b2
Windows: Use a shared precompiled header for dolphin code under Source/
2014-08-14 23:51:13 -07:00
87e7c1ee46
Merge pull request #724 from lioncash/mem_fn
...
AudioCommon: Get rid of some unnecessary mem_fn calls
2014-08-03 21:25:24 -07:00
47847bc8dd
AudioCommon: Remove an unnecessary parameter from the OpenAL constructor
...
This wouldn't even be saved to anything.
2014-08-02 23:48:26 -04:00
17e79a966a
AudioCommon: Get rid of some unnecessary mem_fn calls
2014-08-02 23:42:34 -04:00
9c7d4b6408
Merge pull request #667 from RachelBryk/remove-audio-limit
...
Remove audio frame limit.
2014-07-28 14:38:35 +02:00
4fa71dd59e
Remove fakepoll.h.
...
It was only used for Windows XP and lower.
This also bumps the _WIN32_WINNT define in the stdafx precompiled headers to set the minimum version as Windows Vista.
2014-07-26 22:53:40 -04:00
acaac51077
Remove audio frame limit.
...
It serves no purpose and causes bugs and confusion for users.
2014-07-25 12:17:10 -04:00
7d920bbb3a
AudioCommon/Mixer: Allow input sample rate changes
2014-07-24 22:42:29 +08:00
48afab2685
Correct left/right volume for padded samples.
2014-07-17 18:41:18 +12:00
a0101c5d29
Audio Mixer: move Static variable to a member variable.
...
The two instances of this class were sharing a frac variable causing
audio glitches when both were running (which is now all the time).
Fixes issue 7463 (Since DTK merge, audio has staic in it).
2014-07-17 18:26:21 +12:00
2c73472671
Correct the function casing for DPL2Decoder
...
Brings it more in-line with the rest of the codebase.
2014-07-14 03:34:40 -04:00
0ccee6c87b
Fix warnings unearthed by #579
2014-07-13 02:16:51 +02:00
6d3f249dcc
mark all local variables as static
2014-07-11 16:10:20 +02:00
22e1aa5bb4
mark all local functions as static
2014-07-11 16:07:23 +02:00
b0b70381f7
Revert "Don't add segfault handler in interpreter mode"
2014-07-07 05:30:06 +02:00
20a16beabd
enum CPUState: rename CPU_* to STATE_*
2014-07-05 11:01:49 +02:00
d3fa8a6167
Reorder class initializer lists
2014-07-04 03:53:22 +02:00
11d304ae29
Merge pull request #259 from magumagu/dtk-rewrite
...
DTK rewrite
2014-06-26 20:01:07 -04:00
ca0203a1cc
AudioCommon: restore support for DTK volume setting.
2014-06-26 16:56:57 -07:00
8b13afbb8e
Remove the 32-bit config platform from the VS solution and projects
2014-06-24 22:07:26 -04:00
affb7c17fc
Audio mixer: fix a couple compiler warnings.
2014-06-15 14:51:33 -07:00
40e2ce4f27
Audio mixer: remove check for ratio > 1.0.
...
The code actually handles this case correctly; the algorithm is linear
interpolation between the two closest samples, and the way it is written
should work correctly with any ratio.
2014-06-15 14:51:20 -07:00
d43ecd0bd1
Rewrite handling of DTK (streaming) audio.
...
The primary motivation here is to make sure we submit samples from the
CPU thread. This makes sure the timing of related interrupts accurate,
and generally keeps the different kinds of audio synchronized. This will also
allow improvements to audio dumping functionality.
The new code is also more concise because it gets rid of some duplicated
audio mixing code.
2014-06-14 15:55:20 -07:00
87a804fdfc
Revert "DSound: use DSound notifications to produce sound."
...
This reverts commit 4990b8910b
2014-05-31 13:35:46 -07:00
49b0eef393
Remove the min/max functions in CommonFuncs.
...
The algorithm header has the same functions.
2014-05-29 21:44:41 -04:00
ca3002977b
Merge pull request #256 from magumagu/dsound-notify
...
DSound: use DSound notifications to produce sound.
2014-05-23 17:02:55 -07:00
30586f4d29
Add set/get functions for IsFramelimiterTempDisabled
2014-04-30 12:51:13 +02:00
8483811b39
Add a hotkey for disabling the framelimit.
...
Atm this is hardcoded to '\t'.
2014-04-30 12:50:53 +02:00
6bdcbad3e4
Common: Move the Event class to a separate file, and add tests for it. Fix includes everywhere to match this.
2014-04-14 10:54:07 +02:00
4990b8910b
DSound: use DSound notifications to produce sound.
...
Pretty straightforward; IDirectSoundNotify lets you register for
notifications after a certain amount of sound has played, so use that
instead of depending on Update() notifications from the CPU thread.
Also, while I'm here, reduce the buffer size by a factor of 4; this seems
to reduce the latency, although the difference is sort of subtle.
2014-04-09 13:41:27 -07:00
e79895e372
Replace use of the deprecated mem_fun function with mem_fn.
2014-04-01 12:09:22 -04:00
76fafb1c7b
Merge pull request #220 from magumagu/audio-handling-cleanup-v2
...
Audio handling cleanup v2
2014-03-30 13:24:52 +02:00
3afa17f752
Move audio handling out of DSP emulation.
...
This is good for a couple of reasons: one, it gets rid of duplicated code,
and two, DSP emulation shouldn't need to interact with audio in the first
place.
2014-03-29 11:19:32 -07:00
78499e5b7c
Delete AudioCommon::UseJIT().
2014-03-29 11:19:31 -07:00
102ea55f20
Move mixer construction to AudioCommon.cpp.
2014-03-29 11:19:30 -07:00
aac4206664
Move UDSPControl structure into DSP.h .
2014-03-29 11:19:19 -07:00
664c8d30a0
Remove all trailing whitespaces from our codebase.
2014-03-29 11:05:44 +01:00
ae9367a89b
Delete a bunch of old audio HLE cruft.
...
This commit intentionally breaks audio output from HLE Zelda UCode; no other functional change.
2014-03-26 11:17:19 -07:00
aecc8ea666
Remove usesMixer function from the sound streams.
...
This isn't used anywhere in the codebase. Not even the base SoundStream has it as part of its interface.
2014-03-18 10:42:07 -04:00
5e5ab61d0c
Mark the audio streams as final.
...
These aren't intended to be continually extended.
2014-03-18 10:37:45 -04:00
a82675b7d5
Kill off some usages of c_str.
...
Also changes some function params, but this is ok.
Some simplifications were also able to be made (ie. killing off strcmps with ==, etc).
2014-03-14 13:51:23 -04:00
31cfc73a09
Fixes spacing for "for", "while", "switch" and "if"
...
Also moved && and || to ends of lines instead of start.
Fixed misc vertical alignments and some { needed newlining.
2014-03-11 00:35:07 +13:00
d802d39281
clang-modernize -use-nullptr
...
and s/\bNULL\b/nullptr/g for *.cpp/h/mm files not compiled on my machine
2014-03-09 21:14:26 +01:00
f28116b7da
clang-modernize -add-override
2014-03-09 21:12:01 +01:00
c89f04a7c5
clang-modernize -loop-convert
...
and some manual adjustments
2014-03-09 21:11:59 +01:00
315a8ba1c0
Various changes suggested by cppcheck
...
- remove unused variables
- reduce the scope where it makes sense
- correct limits (did you know that strcat()'s last parameter does not
include the \0 that is always added?)
- set some free()'d pointers to NULL
2014-02-28 12:43:20 +01:00
6914eca167
Fix various warnings reported by clang
...
- mostly remove unused variables
- rename some generic JIT identifiers
2014-02-28 12:28:19 +01:00
fca12c4c4e
Fix more header sorting issues in AudioCommon/ (now check-includes clean).
2014-02-20 01:01:10 +01:00
2afe215271
Convert all includes to relative paths.
2014-02-18 02:19:10 -05:00
3fd87a7636
Second and final pass of clearing out tabs.
2014-02-17 02:19:41 -05:00
6c4ee1753a
Fix some vertical alignments
...
ie. uses spaces for alignment.
2014-02-16 20:12:05 -05:00
9e56b1d343
Disable framerate correction for OpenAL
...
OpenAL itself stretch the time on slowdowns, so the Mixer isn't allowed also to change the rate.
2014-02-13 13:22:29 +01:00
bbd58b8f6a
change AI sampling rate based on framelimit
2014-02-11 14:53:53 +01:00
ca9fd64df9
controll the interpolation frac by the fifo size
2014-02-11 14:35:19 +01:00
d20dbbc92f
audiocommon: sync mixer by fifo instead of estimate values
2014-02-11 07:25:58 +01:00
2956ffa5be
audiocommon: remove 1:1 interpolation
...
The usual one is 32->48 khz interpolation. So there is no need in a special 1:1 interpolation only for performance.
2014-02-11 07:25:58 +01:00
d2038049f5
Replace all include guard ifdefs with "#pragma once"
2014-02-10 18:07:16 -05:00
ab124b96c4
Atomic Stores / Loads
2014-02-07 00:20:10 +01:00
5c646d334a
Pulseaudio: rewrite the pa backend with the async api
...
The default async api allow us to set some latency options. The old one (simple API) was the lazy way to go for usual audio where latency doesn't matter.
This also streams audio, so it should be a bit faster then the old one.
2014-02-07 00:20:10 +01:00
249b00c469
Change the modified parameter in the Clamp function to be a pointer.
...
Makes it easier to identify the one being modified.
2014-02-05 04:04:35 -05:00
6b87a0ef20
Introduce a generic clamp function to clean up some similarly duplicated code.
2014-02-04 20:43:07 -05:00
34692ab826
Remove unnecessary Src/ folders
2013-12-31 14:03:19 -05:00
43e618682e
Convert all vcxproj files to UNIX line endings
2013-12-31 14:03:18 -05:00
e0aa674c72
Minor const-correctness for some functions in FifoPlayer and some AudioCommon headers.
2013-12-11 08:43:58 -05:00
33d56f50a4
Re-plumb window handle to the dsound backend.
...
Reverts parts of commit 71c01d83ab614b9e0c421d03ca694713dbabff48.
Fixes issue 6800
2013-11-07 09:24:56 -08:00
c579637eaf
Run code through the advanced tool 'sed' to remove trailing whitespace.
2013-11-03 20:54:05 -05:00
965b32be9c
Run code through clang-modernize -loop-convert to create range-based for loops, and manually fix some stuff up.
2013-11-03 20:54:01 -05:00
ccd30024b3
Update to VS2013 and a slew of build-related updates. Notes:
...
* Currently there is no DEBUGFAST configuration. Defining DEBUGFAST as a preprocessor definition in Base.props (or a global header) enables it for now, pending a better method. This was done to make managing the build harder to screw up. However it may not even be an issue anymore with the new .props usage.
* D3DX11SaveTextureToFile usage is dropped and not replaced.
* If you have $(DXSDK_DIR) in your global property sheets (Microsoft.Cpp.$(PlatformName).user), you need to remove it. The build will error out with a message if it's configured incorrectly.
* If you are on Windows 8 or above, you no longer need the June 2010 DirectX SDK installed to build dolphin. If you are in this situation, it is still required if you want your built binaries to be able to use XAudio2 and XInput on previous Windows versions.
* GLew updated to 1.10.0
* compiler switches added: /volatile:iso, /d2Zi+
* LTCG available via msbuild property: DolphinRelease
* SDL updated to 2.0.0
* All Externals (excl. OpenAL and SDL) are built from source.
* Now uses STL version of std::{mutex,condition_variable,thread}
* Now uses Build as root directory for *all* intermediate files
* Binary directory is populated as post-build msbuild action
* .gitignore is simplified
* UnitTests project is no longer compiled
2013-10-26 17:55:38 -07:00
1f0710caf7
Remove some more includes.
2013-10-19 19:59:03 -04:00
97cd42f5c3
Remove some unnecessary includes as well as simplifying exisiting ones if possible.
2013-10-19 19:58:56 -04:00
de1773affb
Basic precompiled header support for Linux/OS X. Shaves 20-30% off full rebuild time on my system.
2013-10-17 00:07:35 -04:00
f3af8ee0f0
Revert "Remove some unnecessary includes."
...
Turns out this explodes on Linux.
This reverts commit c4696568cc
2013-10-14 04:05:38 -04:00
c4696568cc
Remove some unnecessary includes.
2013-10-14 04:01:57 -04:00
fd7cf5bb71
A bunch of trivial changes to fix clang warnings.
2013-09-01 22:58:33 -04:00
a1822a3aca
fix AudioCommon::Mixer Buffer indices
...
This fix the 1h32 audio bug which outputs static sound after 1h32.
The mixer is used for 32->48kHz resampling and as output buffer for the async audio backends.
So this buffer was indiced by a writing and a reading pointer and the count of samples in it.
As this is redundant and the sample count isn't accurate calculateable because of the interpolation,
both indices gets out of sync. So after some time (~92min), this buffer overflows and return only garbage.
thx @ moosehunter + delroth for debugging on this issue. You did the most work :-)
2013-07-11 21:22:38 +02:00
7d6b36bf73
Fix most ARM warnings
2013-07-05 19:56:15 -05:00
eb579e4264
Merge in JP's change to fix audio stuttering with OpenAL.
2013-06-23 02:46:45 -05:00
8cf515359c
fixed uninitialzed audio_size variable in WaveFileWriter
2013-06-22 23:24:05 -04:00
fafdc4fcef
DSBCAPS_GLOBALFOCUS allows sound to still play when the application is in the background. Other backends do this, so why not let dsound do it too.
2013-06-22 23:23:53 -04:00
911d73d85a
added new license header to missed audio source files
2013-06-22 23:20:48 -04:00
5bd44d7e3f
Build fix
2013-06-13 18:38:05 +02:00
adb83cfabe
Clarifying the OpenAL loop
...
because it isn't as clear as it can be
2013-06-13 18:04:02 +02:00
d244bca1f5
Fix a bunch of random typos in comments and logging.
...
Also update the comment headers for two functions in GCMemcard.cpp.
2013-04-19 09:21:45 -04:00
bab9963b00
New license header introduced for DiscIO, AudioCommon, InputCommon, VideoCommon, and Common projects.
2013-04-17 23:09:55 -04:00
ef85b9af45
Update the license file text (change SVN to Git) in all projects except Core since I was told a merge was happening soon. So for the sake of the merge going smoothly, I'll fix that when I remove the tab/space mismatches from the Core project.
...
Also, some tab/space mismatches removed from VideoOGL, and some places I missed in VideoDX[number] projects.
Now, the Core is literally the only project with tab/space mismatches (on a large scale).
2013-04-15 16:28:55 -04:00
58159a1693
Some more logging typos and clarifications. Missed these in my last commit.
...
This commit mainly elaborates on some messages a little more. Also fixes some typos that slipped through the last commit.
A large change in text can be seen in EXI_DeviceMemoryCard.cpp. I added more info as to why a write to a memory card may fail. (This actually was a reason I was unable to write to a memcard recently).
Elaborations can be seen in WGL.cpp
I did change some comments in some files that I was correcting logging messages in, however this is only if I spot a typo or if an abbreviation is lower-cased. Even in that case, the amount of changes done to comments is very minimal.
2013-04-01 00:10:54 -04:00
f432d6038e
Fix some typos and correct some capitalizations in the log messages.
...
Makes the logging look more orderly and less spammy when spitting out things.
2013-03-31 19:13:30 -04:00
edd9d0e0ef
Clean up more space/tab mismatches in AudioCommon, Common, and VideoCommon.
...
Not planning to touch Core since it's the most actively changed part of the project.
2013-03-19 21:51:12 -04:00
717b976875
ARM Support without GLSL
2013-02-26 13:49:00 -06:00
718a1b5ded
Fixed a buffer overflow in the OpenAL buffer.
2013-02-19 23:18:13 +11:00
0ffdd2607f
Fix the majority of the compiler warnings unearthed by the addition of
...
the new warning flags.
2013-01-29 23:24:51 -06:00
fe7e691d77
Revert "mem_fun -> mem_fn."
...
This reverts commit b7d32b0a3d
2013-01-23 23:38:49 -05:00
b7d32b0a3d
mem_fun -> mem_fn.
...
mem_fun is deprecated in C++11. Also it does everything mem_fun can do, but more conveniently.
2013-01-23 23:29:50 -05:00
c4bd6329c0
Fully fix that clear bug in aldlist.cpp. Seems I missed part. Corrected it.
2013-01-18 23:42:37 -05:00
196c2867ad
Move DSP settings to dolphin.ini
2013-01-16 20:17:44 -05:00
1cf7cbb936
Fix a clear bug in aldlist.cpp.
...
Properly clears itself now.
2013-01-15 12:47:13 -05:00
7402a89e6e
OSX build fix
2013-01-16 00:14:31 +11:00
a9388ce2e2
Added backwards compatibility with old OpenAL drivers.
2013-01-16 00:10:49 +11:00
799b032b98
Readd the OpenAL option.
...
The OpenAL backend requires OpenAL Soft to be installed: http://kcat.strangesoft.net/openal.html
You may need to rename soft_oal.dll to OpenAL32.dll in the Dolphin folder.
Windows users may also need to update their OpenAL drivers by downloading them from
http://connect.creativelabs.com/openal/Downloads/oalinst.zip
2013-01-15 23:14:11 +11:00
0a4272c96b
Merge branch 'OpenAL'
...
* OpenAL:
Changed SoundTouch to use float samples, allowing SSE to be used. Made the DPL2 decoder disabled by default. Re-added the audio hack used by the Accurate VBeam emulation option.
Added a latency setting to the audio settings. Removed the Sample Rate setting. It is now hardcoded to 48000hz (accurate audio timing).
Skipped timestretching if the emulator is running below 10% speed to prevent buffer overflows.
Removed the synchronisation between the CPU thread and the audio thread. Added code to detect and resume from buffer underruns. Disabled the ability to change the DPL2 option after the game has started. Fixed a memory leak that occurred in the DPL2 decoder. Fixed the OSX build.
Build fix
Added a Dolby Pro Logic II (DPL2) decoder in the OpenAL backend. DPL2 audio is decoded to 5.1. Code adapted from ffdshow. Added an option in the DSP settings to disable the DPL2 decoder in case Dolphin incorrectly detects a 5.1 audio system. Updated the OpenAL files to OpenAL Soft 1.15.1 in the Windows build.
Removed the system timing hack which was activated when the Accurate VBeam option was enabled.
Fixed the include directories in Audio Common for the Windows 32bit build.
Fixed the include directories in Audio Common for the Windows build.
Messed up the static include line
Fix include paths and compiling in Linux. Externals soundtouch is 1.7.1, while Ubuntu 12.10 is 1.6.x. Externals soundtouch is compiled with integer samples, while ubuntu is compiled with float samples. Float samples is probably the more common route. If you're going to use soundtouch, you should probably use SAMPLETYPE instead of explicitly choosing short. This probably breaks the windows build since its includes aren't setup.
OSX: typedef signed char BOOL
OSX build fix
Build fix
Added audio time stretching by using the SoundTouch library.
Implemented correct audio timing.
OpenAL for Windows initial commit
2013-01-15 22:40:12 +11:00
6d4a566bc4
Changed SoundTouch to use float samples, allowing SSE to be used.
...
Made the DPL2 decoder disabled by default.
Re-added the audio hack used by the Accurate VBeam emulation option.
2013-01-15 22:29:26 +11:00
020ab743a9
re-enable PulseAudio backend
2013-01-13 22:22:06 -06:00
13469f2db4
Merge branch 'pulseaudio-simple'
2013-01-13 21:36:26 -06:00
1c462a1eca
Added a latency setting to the audio settings.
...
Removed the Sample Rate setting. It is now hardcoded to 48000hz (accurate audio timing).
Fixes issue 5672.
2013-01-13 00:05:30 +11:00
dcc216a027
'count' parameter for AddStereoSamples and AddStereoSamplesBE in WaveFile should be unsigned. Doesn't make sense to have them signed.
2013-01-11 22:22:55 -05:00
73140c7da7
Skipped timestretching if the emulator is running below 10% speed to prevent buffer overflows.
2013-01-11 23:06:20 +11:00
3632ce6df5
Removed the synchronisation between the CPU thread and the audio thread.
...
Added code to detect and resume from buffer underruns.
Disabled the ability to change the DPL2 option after the game has started.
Fixed a memory leak that occurred in the DPL2 decoder.
Fixed the OSX build.
2013-01-11 19:42:03 +11:00
ed5a68a504
Build fix
2013-01-11 14:20:22 +11:00
80f4475e76
Added a Dolby Pro Logic II (DPL2) decoder in the OpenAL backend. DPL2 audio is decoded to 5.1. Code adapted from ffdshow.
...
Added an option in the DSP settings to disable the DPL2 decoder in case Dolphin incorrectly detects a 5.1 audio system.
Updated the OpenAL files to OpenAL Soft 1.15.1 in the Windows build.
Fixes issue 3023.
2013-01-11 14:03:09 +11:00
202c005e61
Remove commented code. No longer supporting setting volume with PulseAudio.
2013-01-10 13:01:22 -06:00
2c1c538fda
Disable the OpenAL and Pulseaudio audio backends
...
They are currently broken and cause sound issues which are not present in other
backends:
* OpenAL plays music 2x too fast in Zelda UCode games with HLE
* Pulse backend uses a lot of CPU power and slows down emulation significantly
Both backends are currently being re-implemented in separate branches of
Dolphin, so this should be a temporary removal.
2013-01-10 18:43:15 +01:00
5c371549d3
fix cmake hacks
2013-01-09 18:39:28 -06:00
488a679ca7
use pulseaudio "simple" api
2013-01-09 17:45:16 -06:00
ad28986d51
Fixed the include directories in Audio Common for the Windows 32bit build.
2013-01-10 07:55:13 +11:00
d34c847edd
Fixed the include directories in Audio Common for the Windows build.
2013-01-10 07:43:59 +11:00
01f4d9f386
Fix include paths and compiling in Linux. Externals soundtouch is 1.7.1, while Ubuntu 12.10 is 1.6.x. Externals soundtouch is compiled with integer samples, while ubuntu is compiled with float samples. Float samples is probably the more common route. If you're going to use soundtouch, you should probably use SAMPLETYPE instead of explicitly choosing short. This probably breaks the windows build since its includes aren't setup.
2013-01-09 10:26:12 -06:00
8494a439c7
OSX build fix
2013-01-10 00:06:35 +11:00
91fe5cc821
Build fix
...
Added SoundTouch as a dependency of AudioCommon.
Removed the "soundtouch_config.h" include on Linux and OSX.
2013-01-09 23:45:13 +11:00
63b38be97c
Added audio time stretching by using the SoundTouch library.
2013-01-09 22:57:32 +11:00
c8c78e0aa9
Implemented correct audio timing.
...
Fixes issue 5493.
2013-01-07 15:37:08 +11:00
6df1dacca8
OpenAL for Windows initial commit
2013-01-07 12:16:04 +11:00
88b890824b
(CoreAudio) Retain volume value until initialization. Makes volume slider work when game isn't running. Fixes issue 5383.
2012-12-14 12:15:01 -06:00
e85438cba0
Clean up gcc/g++ compiler warnings that have accumulated.
2012-12-10 00:40:28 -06:00
9070e7ff8c
misc movie cleanup and fixes
2012-10-20 22:26:40 -04:00
c57640dfbd
Implemented proper timing in the "No audio output" back-end.
2012-07-01 17:07:58 +10:00
a81631b58e
made savestates synchronous and immediate. this allows saving or loading while the emulator is paused, fixes issues where savestate hotkeys would get ignored if pressed too close together, might speed up savestates in some cases, and hopefully makes savestates more stable too.
...
the intent is to replace the haphazard scheduling and finger-crossing associated with saving/loading with the correct and minimal necessary wait for each thread to reach a known safe location before commencing the savestate operation, and for any already-paused components to not need to be resumed to do so.
2012-05-26 13:09:38 +10:00
5ceef0c513
Removed the DTK Music option. It is now always enabled.
2012-04-23 05:02:43 +10:00
56b1373baf
Remove scons-related files
2012-03-25 12:55:02 -07:00
c5d746f3d8
remove scons files from VS projects
2012-03-18 06:41:12 -07:00
6f1b2d7748
name all audio threads (that I know how to) for debugging, as suggested in response to revision d00b719966.
2012-01-01 14:28:19 -08:00
ba545ec1e9
Build fix
2012-01-01 18:09:39 +11:00
c53593a40a
Moved the Audio Throttle option to the Framelimit drop-down. The Audio Throttle should never be used alongside the frame limiter as that can cause audio sync issues.
2012-01-01 14:32:54 +11:00
d00b719966
give the audio thread a name (this doesn't really matter, but it was bugging me)
2011-12-18 02:25:50 -08:00
958891b4eb
Compile with OpenAL support on OS X.
2011-12-05 05:49:08 +01:00
95517a9741
vs2010: Disable LTCG for realz
2011-09-05 09:43:23 -07:00
2bc3965c31
Since LLE can now output at 48kHz, adjust the audio dumper so that it will respect the set sample rate for LLE as well as HLE. This fixes audio dumping for LLE at 48kHz.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7567 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-05-28 23:32:11 +00:00
ff63ef20c2
Trying to fix mixer problem when AIsrc is @48kHz, should fix games like All Star Baseball 2004/
...
XGRA Extreme-G Racing Association/Conduit 2... Enabled 48kHz output for LLE (before it was just 32kHz). I hope it works, if there are serious problems, it will be reverted.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7511 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-05-05 14:53:00 +00:00
f8620fcd0b
Fixed some memory leaks. Only one was mine ;P
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7392 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-03-22 07:27:23 +00:00
52cb7fd4ca
Fix and issue with the escape button closing the hotkey dialog when trying to set a hotkey to escape.
...
Fix a few more dialogs to close with escape.
Fix an issue with the pulse audio sound backend when the dsp emulation method is changed, and the frequency setting was not respected.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7358 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-03-16 12:59:05 +00:00
41c98f982e
A bit of cleanup to Core Init/Stop, Frame, and Main. Cleanup XAudio2 to attempt to fix the crash on stop(didn't help :p). For some reason CFrame::DoStop is called twice.(might be the issue)
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7353 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-03-15 23:09:12 +00:00
37e31f2df6
AudioCommon: Improve pad silence when ppc does not keep up with realtime
...
Uses the last sample from the ppc buffer to fill the samples the ppc
didn't deliver data for, avoids clicking on underruns.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7338 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-03-12 22:02:46 +00:00
59fd1008ca
Wrapped fopen/close/read/write functions inside a simple "IOFile" class. Reading, writing, and error checking became simpler in most cases. It should be near impossible to forget to close a file now that the destructor takes care of it. (I hope this fixes Issue 3635) I have tested the functionality of most things, but it is possible I broke something. :p
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7328 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-03-11 10:21:46 +00:00
423018f811
Replaced Common::CriticalSection with a std::mutex implementation. 64bit Windows builds now use SRWLocks and ConditionVariables(requires Vista/7, x64 builds will no longer work on Windows XP x64). Tell me if you hate that. Removed Common::EventEx. Common::Event now uses a std::condition_variable impl.(using ConditionVariables on Windows x64, Events on x86, or posix condition variables elsewhere). I experience slight speed improvements with these changes.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7294 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-03-05 06:11:26 +00:00
05719ac81a
Move SConscript files out from the Src subdirectories to be
...
consistent with the other build systems.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7282 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-03-03 19:44:56 +00:00
540238cf79
Prepare for the release of Xcode 4, which has working LTO
...
with static libraries.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7280 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-03-03 04:35:03 +00:00
a5b471f490
More conversion from char * to std::string.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7266 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-03-01 03:06:14 +00:00
ba54fac9eb
Convert GetUserPath to return a std::string instead of a const char *. This simplifies its usage in most cases.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7265 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-28 20:40:15 +00:00
6e4923399e
revert r7212 (express users must modify a single line, instead)
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7220 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-21 15:17:41 +00:00
62cb8ebe46
Force dolphin to use the windows7.1sdk (the windows7.1sdk installer is silly and refuses to recognize that vs2010 exists).
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7212 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-20 18:08:20 +00:00
0ae8d33149
Some work on changing comments, log messages, and variable and function names to reflect that the plugins are not plugins anymore.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7170 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-14 02:18:03 +00:00
1ad211b3ad
Audio logging: actually use the audio backend sample rate when dumping HLE audio; this means that both sample rate settings now dump audio properly.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7161 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-13 05:05:53 +00:00
2eeaae576c
Fix for LLE audio dumping to report correct sample rate in output file.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7156 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-13 01:49:20 +00:00
cb832f2298
Make sure the audio dump directory exists when dumping audio. Otherwise a segmentation fault ensues after several panic alerts.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7135 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-11 21:30:53 +00:00
6cbaa360a1
Fix frame dumping for linux.
...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7134 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-11 21:07:51 +00:00
b0fa0a83f8
* Dump AVI output on every VI (fixes issue #4064 ).
...
* Add audio dumping (fixes issue #1638 ).
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7131 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-11 18:59:42 +00:00
Benjamin Przybocki