Commit Graph

18838 Commits

Author SHA1 Message Date
comex
c22d1d68ab Mark which Wii root to use in the NAND path code.
It's used by both the GUI to do things like install WADs and check up on
the system menu, in which case the global root should be used, and by
/dev/es, in which case the local one should.  The latter isn't
*terribly* useful today, since no contents will ever be installed in
temporary roots (although it's still relevant for data directories), but
converting the whole thing makes sense because then it will Just Work
once the entire NAND is synced.

Because it would have been a bit of work to split it up (but I can if
desired), this commit also contains some basic cleanup of
NANDContentLoader:

(1) The useless interface class INANDContentLoader is removed and the
    methods are changed to just return CNANDContentLoader (the only
    implementation);
(2) CNANDContentManager is changed to use unique_ptr and cleaned up a
    bit.
2015-10-16 09:10:39 +02:00
shuffle2
6d4128ddcc Merge pull request #3128 from lioncash/unique
ControllerEmu: Use make_unique over raw new
2015-10-03 19:08:00 -07:00
shuffle2
569d25d9b4 Merge pull request #3129 from lioncash/mailbox
DSPHWInterface: Use an enum for indicating mailbox type
2015-10-03 19:04:35 -07:00
shuffle2
eb07038723 Merge pull request #3130 from rohit-n/sign-compare
VideoCommon: Silence -Wsign-compare warnings.
2015-10-03 18:49:38 -07:00
Rohit Nirmal
18f0831861 VideoCommon: Silence -Wsign-compare warnings. 2015-10-03 20:32:16 -05:00
shuffle2
0fdaacc7e0 Merge pull request #2738 from lioncash/bitfield
Common: Fix BitField mask generation.
2015-10-03 18:21:24 -07:00
shuffle2
81414b4fa2 Merge pull request #3076 from void-ghost/stereo3d_presets
Stereo3d presets
2015-10-03 18:10:23 -07:00
shuffle2
b926061f64 Merge pull request #3095 from void-ghost/savestate_race_condition_fix
SaveState: Fix for race condition in SaveAs(...)
2015-10-03 18:08:33 -07:00
shuffle2
4fb90bf9f6 Merge pull request #3115 from lioncash/ifx
DSPCore: Minor changes
2015-10-03 18:03:26 -07:00
shuffle2
06379cc3a0 Merge pull request #3113 from lioncash/input
InputCommon: Get rid of multiple identical define macros
2015-10-03 18:01:36 -07:00
shuffle2
43879ebc1e Merge pull request #3103 from Linktothepast/master
Game INI Updates
2015-10-03 18:01:09 -07:00
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
91d805fbec Merge pull request #3119 from JosJuice/patch-1
Correct Windows version requirement in Readme.md
2015-10-03 17:53:54 -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
9c73d63d40 DSPHWInterface: Use an enum for indicating mailbox type 2015-10-03 17:53:24 -04:00
Lioncash
fa05710f2f ControllerEmu: Use make_unique over raw new 2015-10-03 15:37:25 -04: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
Scott Mansell
ce6f89fe6d Merge pull request #3122 from rohit-n/sign-compare
Alsa: Silence -Wsign-compare warning.
2015-10-03 16:17:11 +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
37825c59dd Merge pull request #3120 from lioncash/osx
InputCommon: Use NSNumber numeric literals in Obj-C code
2015-10-02 13:38:41 -04:00
Lioncash
a30681834c InputCommon: Use NSNumber numeric literals in Obj-C code 2015-10-02 13:23:46 -04:00
JosJuice
15995bc825 Correct Windows version requirement in Readme.md 2015-10-02 18:23:54 +02:00
Lioncash
5d8e422d82 WiimoteEmu: Get rid of an unused clamp function 2015-10-02 10:33:29 -04:00
Scott Mansell
fb35371e86 Merge pull request #3116 from Pringo/Readme-update
Update Readme.md
2015-10-02 23:29:21 +13:00
Pringo
783143f474 Update Readme.md
Updated required OS information.
2015-10-01 10:10:01 -07:00
Lioncash
75907d83c6 DSPCore: Get rid of division for determining array size in VerifyRoms 2015-10-01 11:49:30 -04:00
Lioncash
73f312863d DSPCore: Compress common fill loops into std::fill 2015-10-01 11:23:01 -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
Lioncash
ccc3cd884e DSPCore: Use std::array to represent ifx_regs 2015-10-01 10:26:16 -04:00
Lioncash
449c57a8e0 InputCommon: Get rid of multiple identical define macros 2015-10-01 08:45:22 -04: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
flacs
efd370fd7e Merge pull request #3112 from lioncash/memory
WII_IPC_HLE_Device_fs: Get rid of a pointer cast
2015-10-01 00:00:04 +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