Commit Graph

16473 Commits

Author SHA1 Message Date
shuffle2
a6f04b0e15 Merge pull request #3091 from Tilka/mbedtls
Update mbed TLS (PolarSSL)
2015-10-03 18:00:58 -07:00
shuffle2
8bb35c8588 Merge pull request #3083 from JosJuice/ipc-ticks
Use correct GetTicksPerSecond() value in IPC delays
2015-10-03 17:56:57 -07:00
shuffle2
9878004871 Merge pull request #3105 from phire/dont_block
ALSA: Don't block on Clear() call.
2015-10-03 17:55:26 -07:00
shuffle2
f5c88fc1a9 Merge pull request #3125 from JosJuice/di-callback-pointer
Simplify getting DI pointer in IOCtl callback
2015-10-03 17:52:58 -07:00
shuffle2
b4be34bc68 Merge pull request #3124 from dolphin-emu/shuffle2-patch-1
Fix WiiSockMan::DecodeError
2015-10-03 14:59:20 -07:00
Lioncash
5464e698fc Merge pull request #3102 from rohit-n/build-pch
Fix building with PCH disabled.
2015-10-03 13:30:51 -04:00
JosJuice
bf2676a1b1 Simplify getting DI pointer in IOCtl callback
Gets rid of an odd code construct, and fixes the "Trying to run two DI
devices at once" ERROR_LOG appearing at the wrong times.
2015-10-03 11:35:29 +02:00
shuffle2
f33fae574f Fix WiiSockMan::DecodeError 2015-10-03 01:56:42 -07:00
Scott Mansell
a10a3ecbac ALSA: Don't block on Clear() call.
snd_pcm_writei() is meant to block block until all samples are written,
but apparently in some situations it can block for much longer, prehaps
even a infinite time, in the case of virtual machine FifoCI runs in.

Because it grabed a mutex before blocking, it could also block the
Clear() call for an infinite length of time, blocking dolphin's emu
thread.

snd_pcm_writei() also takes 10-15 seconds if you run dolphin under GDB
and can randomly take 5 or so seconds during normal usage.

By moving all the pause code to the ALSA thread, Clear() no-longer
blocks and everyone keeps their sanity.
2015-10-03 16:31:55 +13:00
flacs
6658d21215 Merge pull request #3121 from lioncash/pch
pch: Update MSVC version check
2015-10-03 05:21:17 +02:00
Scott Mansell
f1a43dc6d4 Merge pull request #3118 from lioncash/junk
WiimoteEmu: Get rid of an unused clamp function
2015-10-03 16:21:00 +13:00
Scott Mansell
bcee41b65d Merge pull request #3123 from lioncash/null
Core: Replace 0 literals with nullptr
2015-10-03 16:19:46 +13:00
Rohit Nirmal
6001366aac Alsa: Silence -Wsign-compare warning. 2015-10-02 21:10:06 -05:00
Lioncash
0f6c4653a4 Core: Replace 0 literals with nullptr 2015-10-02 22:06:17 -04:00
Lioncash
aeee5be5ef pch: Update MSVC version check 2015-10-02 20:51:23 -04:00
Lioncash
a30681834c InputCommon: Use NSNumber numeric literals in Obj-C code 2015-10-02 13:23:46 -04:00
Lioncash
5d8e422d82 WiimoteEmu: Get rid of an unused clamp function 2015-10-02 10:33:29 -04:00
Scott Mansell
58d893e56f Merge pull request #3075 from waddlesplash/no-regexp
FileSearch: Don't use RegExes, just do string comparisons.
2015-10-02 04:00:23 +13:00
flacs
696d6eae09 Merge pull request #3108 from lioncash/cstyle-array
ChunkFile: Provide additional helpers for C-style arrays
2015-10-01 01:55:54 +02:00
Lioncash
a10be26972 Tev: Don't savestate Zero16
It's an array of zeroes. There's no need.
2015-09-30 19:45:50 -04:00
Lioncash
c6678687b0 ChunkFile: Provide additional helpers for C-style arrays
Gets rid of magic numbers in cases where the array size is known at compile time.
This is also useful for future entries that are stack allocated arrays as these
functions prevent incorrect sizes being provided.
2015-09-30 19:45:46 -04:00
flacs
6305437327 Merge pull request #3110 from booto/alsa-buffer-type
AlsaSound: fix buffer type, clean up macros
2015-10-01 00:01:26 +02:00
Lioncash
473188a2c3 WII_IPC_HLE_Device_fs: Get rid of a pointer cast 2015-09-30 16:04:53 -04:00
Ryan Houdek
0764971feb Merge pull request #3109 from OrdinaryMagician/miniupnpc14
Update to support miniupnpc 1.9 API version 14
2015-09-30 11:08:58 -04:00
Marisa Kirisame
8c5744bca7 miniupnpc API version 14 changed the upnpDiscover functions, adding an argument for TTL (should default to 2)
this enables support for that should the build system have that specific version installed, the miniupnpc bundled in the project is unchanged
2015-09-30 16:50:58 +02:00
Ryan Houdek
ebf2420c6b Merge pull request #3057 from booto/finicky-vert-beam-position
VI: Fix vert beam position inaccuracy
2015-09-30 08:26:31 -04:00
booto
6c28ea58ab AlsaSound: fix buffer type, clean up macros 2015-09-30 19:14:03 +08:00
flacs
16957fcaec Merge pull request #3107 from lioncash/pragma
TextureDecoder_x64: Remove now-unnecessary clang #pragma warning suppression
2015-09-29 19:53:12 +02:00
booto
ea6af0e98b VI: Fix vert beam position inaccuracy 2015-09-30 00:21:33 +08:00
Lioncash
50a7390622 TextureDecoder_x64: Remove unnecessary commented out header 2015-09-29 11:04:00 -04:00
Lioncash
80c7e3ebc0 TextureDecoder_x64: Remove clang warning suppression
This was an issue two years ago on clang 3.3
2015-09-29 11:00:59 -04:00
Lioncash
d6ff75d71d OGL: Remove unnecesary FPSCounter include from Render.cpp 2015-09-29 10:01:38 -04:00
Lioncash
4a981e3a04 FPSCounter: Change Update's return type to void
Its returned value is never used.
2015-09-29 10:01:37 -04:00
Lioncash
55c7754738 FPSCounter: Give the refresh interval a concrete type 2015-09-29 10:01:37 -04:00
Lioncash
e82b6a8532 FPSCounter: Direct initialize class members 2015-09-29 10:01:37 -04:00
Lioncash
bf23fcfc1f FPSCounter: Don't provide direct access to m_fps 2015-09-29 09:43:03 -04:00
Tillmann Karras
2f6f30a939 Fix -Wuninitialized warnings 2015-09-29 04:27:27 +02:00
flacs
43e60073d1 Merge pull request #3100 from lioncash/printf
Get rid of some casts used with logging for size_t
2015-09-29 03:50:48 +02:00
flacs
d5ec7124e4 Merge pull request #3099 from lioncash/banner
VolumeGC: Get rid of banner pointer casts
2015-09-29 03:49:08 +02:00
flacs
aaa48e19fe Merge pull request #3097 from JosJuice/blob-type
Fix blob type detection for game right-click menu
2015-09-29 03:46:29 +02:00
Rohit Nirmal
3b75f45cf6 Fix building with PCH disabled. 2015-09-28 11:51:08 -05:00
Lioncash
311c76647d Get rid of some casts used with logging for size_t
Replaces them with the now-valid %z specifiers
2015-09-28 08:43:53 -04:00
Lioncash
7317dd4be2 VolumeGC: Get rid of banner pointer casts
Prefer reading the data into the reified struct instead.
2015-09-28 04:31:43 -04:00
shuffle2
2cb5c41fed HostGetString: Actually fill a string with data 2015-09-28 05:40:52 +02:00
Matthew Parlane
ba96ca289d Merge pull request #3034 from waddlesplash/new-qt
QtCompile.props: Update for Qt 5.5.
2015-09-28 15:17:17 +13:00
JosJuice
21cb13828c Fix blob type detection for game right-click menu
I forgot to update it after changing how IsCompressed() works.
Also, checking file name extensions is a bad way of checking blob types.
2015-09-27 21:06:19 +02:00
JosJuice
be7e0554d2 DiscIO: Add a way to get blob type 2015-09-27 20:54:31 +02:00
waddlesplash
06c6f60f5b OGL: Use SplitPath() instead of std::regex. 2015-09-27 13:26:19 -04:00
waddlesplash
5643fe5d1f FileSearch: Don't use RegExs, just do string comparisons.
Nothing used the RegEx feature of FileSearch, and GCC < 4.9
doesn't support C++11 RegEx properly, so get rid of it.
2015-09-27 13:25:51 -04:00
Scott Mansell
ce493b897d Merge pull request #2271 from revel8n/fixes
Fix for alignment of zero-length files within directory based virtual disk
2015-09-28 05:28:38 +13:00