Commit Graph

20633 Commits

Author SHA1 Message Date
Chris Burgener 64a4e6b729 Merge pull request #3946 from comex/avi-warning-fix
Use newer ffmpeg APIs to avoid deprecation warnings.
2016-07-10 22:02:46 -04:00
comex 8a02473237 Fix more warnings:
- Externals/soundtouch/CMakeLists.txt: add -w (since it's not our code) to
silence an unused variable warning
- Source/Core/Core/NetPlayClient.cpp: Work around a Clang/libc++ bug where
initializing a std::array the way the standard says you're supposed to produces
a warning.  (libc++'s implementation of std::array, like any sane
implementation, has a C array as a field, so the most explicit form of
initialization would use two braces, one for the struct and one for the array.
Clang has a general warning for not being explicit with braces, which is
usually sane.  But the standard only guarantees that initializing std::array
works with a single pair of braces!)  There are other places in Dolphin that
incorrectly use double braces, presumably to avoid the warning, so maybe the
warning should just be turned off, but in any case here I just switch to an
equivalent .fill().
2016-07-10 21:51:28 -04:00
comex 42660292f6 Use newer ffmpeg APIs to avoid deprecation warnings. 2016-07-10 21:36:18 -04:00
Pierre Bourdon f2474e0404 Merge pull request #3997 from comex/cmake-fix
Fix configuration when LLVM_PACKAGE_VERSION is unset
2016-07-11 03:24:00 +02:00
comex 3f4072d5b9 Fix configuration when LLVM_PACKAGE_VERSION is unset 2016-07-10 21:22:47 -04:00
Pierre Bourdon 3a895f88bf Merge pull request #3988 from leoetlino/scanning-block
WiimoteReal: Don't block on refresh
2016-07-10 21:40:48 +02:00
Léo Lam 80fc5e2814 WiimoteReal: Don't use a recursive mutex
This replaces a recursive mutex with a normal mutex.
2016-07-10 20:41:00 +02:00
Pierre Bourdon 08e482eae3 Merge pull request #3614 from rukai/LinuxLocalDev
Linux support for portable.txt + documentation in readme
2016-07-10 16:34:33 +02:00
Léo Lam c827fdd2b5 WiimoteReal: Don't block on refresh
This changes Refresh() to use the existing scanning thread to scan for
devices, instead of running the scan on the UI thread and blocking it.

Also makes the UI thread not block when Continuous Scanning is disabled
and removes duplicated code.

Should fix issue 8992.

Under the hood:
* The scanning thread is now always active, even when continuous
  scanning is disabled.
* The initialize code which waits for Wiimotes to be connected also
  uses the scanning thread instead of scanning on yet another thread.
* The scanning thread now always checks for disconnected devices, to
  avoid Dolphin thinking a Wiimote is still connected when it isn't. So
  we now check if we need new Wiimotes or a Balance Board at scan time.
2016-07-10 13:29:57 +02:00
Aestek cd9a58b704 Check if all players have the game before starting netplay
https://bugs.dolphin-emu.org/issues/8885
2016-07-10 10:13:34 +02:00
Pierre Bourdon 7ee6d08213 Merge pull request #3961 from phire/less_virtual_xfb_lag
XFB: Send image to screen at start of field (Reduce VirtualXFB latency)
2016-07-10 03:01:26 +02:00
Pierre Bourdon 6204a813fd Merge pull request #3995 from RisingFog/remove_vi_movie_playback
Remove VI count limit on Movie playback
2016-07-10 02:54:31 +02:00
Chris Burgener d00c013339 Remove VI count limit on Movie playback 2016-07-09 20:35:01 -04:00
Pierre Bourdon bdec0d5544 Merge pull request #3994 from Pringo/update-osx-requirement
Update OS X Requirement to 10.10
2016-07-09 22:29:21 +02:00
Pringo 93d83ab4d3 Update OS X Requirement to 10.10 2016-07-09 12:35:21 -07:00
Pierre Bourdon ece5de24bc Merge pull request #3993 from leoetlino/signal-message
DolphinWX: Print a message when a signal is received
2016-07-09 20:46:54 +02:00
Léo Lam 90ed048532 DolphinWX: Print a message when we receive a signal
This makes it clear that sending a signal a second time will force stop
Dolphin (which is useful in case the GUI is deadlocked or otherwise
unable to react to the signal).
2016-07-09 20:27:49 +02:00
Pierre Bourdon 59f4d445bb Merge pull request #3991 from leoetlino/signal
DolphinWX: Shut down cleanly on shutdown signal
2016-07-09 14:17:22 +02:00
Pierre Bourdon 1be5f23d9f Merge pull request #3992 from mimimi085181/wiimote-netplay-fix-second-session
Netplay: Fix 2nd session on Wiimote netplay
2016-07-08 23:33:21 +02:00
mimimi085181 de7b2f984a Make tries a u32
Before this variable was an u8, which could theoretically result in desyncs with a large buffer(greater than 255*120/200=153) filled with blank inputs. If this could actually happen, i don't know. But this part of the code on its own looks like it could break.
2016-07-08 23:30:25 +02:00
mimimi085181 b962c1f392 Fix running more than one session with Wiimotes
A static var is not a good idea, when the value needs to be reset for every session. Also, the variable holds the data size, so it makes sense to set the data size, where the data is added.
2016-07-08 23:30:24 +02:00
Léo Lam 0f028df6b2 DolphinWX: Shut down cleanly on signal
This makes DolphinWX shut down cleanly, just like it would with
File->Exit when it receives a SIGINT, SIGTERM (Unix) or some signals
on Windows.

The default signal handler will be restored after a first shutdown
signal so a second signal will exit Dolphin forcefully.
2016-07-08 23:11:27 +02:00
Pierre Bourdon bfe8b11ba8 Merge pull request #3949 from mimimi085181/restore-wiimote-netplay
Restore wiimote netplay
2016-07-08 22:46:45 +02:00
mimimi085181 4f9fe41ee6 Revert pr#3660
https://github.com/dolphin-emu/dolphin/pull/3660
2016-07-08 20:23:33 +02:00
mimimi085181 330289cf71 Revert pr#3691
https://github.com/dolphin-emu/dolphin/pull/3691
2016-07-08 20:23:32 +02:00
EmptyChaos 9036b9d8e8 SectorReader: Fix cache line bias
Minor bug where SectorReader::GetEmptyCacheLine was biased towards
the first hit.
2016-07-09 02:27:35 +10:00
JosJuice b960b5677b Don't ScheduleEvent from wrong thread when inserting SD card 2016-07-08 00:02:06 +02:00
mimimi085181 fcf5d4f6bc Revert pr#3802
https://github.com/dolphin-emu/dolphin/pull/3802
2016-07-07 14:25:30 +02:00
JosJuice 31226b8503 DiscScrubber: Replace unused blocks with 0x00 instead of 0xFF 2016-07-07 11:51:58 +02:00
Pierre Bourdon 3f03e2d5fe Merge pull request #3982 from JosJuice/how-did-this-even-compile
DolphinWX: Fix a mix-up
2016-07-06 18:46:05 +02:00
JosJuice 3b7c614124 DolphinWX: Fix a mix-up
Caused by a commit of mine, cb3b1b6
2016-07-06 18:31:18 +02:00
JosJuice 865be48ee3 Movie: Simplify ChangeDisc path handling 2016-07-05 21:13:43 +02:00
JosJuice ce9622c426 Use g_want_determinism in code added by 8f0cbef
There's no reason this only should apply to netplay.
2016-07-05 20:58:44 +02:00
JosJuice 6951228abd Use g_want_determinism more 2016-07-05 18:50:06 +02:00
JosJuice 1da866d7de DVDInterface: Simplify calling ChangeDisc from CPU thread
When Movie was calling ChangeDisc, it was moving execution to
the host thread just to then make the host thread the CPU thread.
We can simply run the code directly on the CPU thread instead.
2016-07-05 18:20:24 +02:00
JosJuice b6eb5c25d1 Movie: Fix FrameSkipping determinism condition
The old condition seems to be a typo of
!(IsMovieActive() || NetPlay::IsNetPlayRunning())
2016-07-05 13:57:06 +02:00
JosJuice f3e459091b Merge pull request #3874 from dolphin-emu/revert-3873-argh
Revert "Undo the addition of a translatable string during the string freeze"
2016-07-05 12:07:53 +02:00
Matthew Parlane 7ad74832e6 Revert "Undo the addition of a translatable string during the string freeze" 2016-07-05 21:44:38 +12:00
Scott Mansell 708fb35fdb Merge pull request #3878 from mathieui/enable-cheats-for-jmc-the-cheater
Sync the "enable cheat" setting over netplay
2016-07-05 21:36:02 +12:00
Scott Mansell 69bf05b302 Merge pull request #3976 from JosJuice/shutdown-clear-codes
PatchEngine: Clear active codes on shutdown
2016-07-05 21:13:48 +12:00
JDV d6a2fcd26c Formatting and setting is now only temporarily changed (#1)
Add the cheat setting to the bootmanager config cache, and reformat
2016-07-05 02:23:19 +02:00
mathieui 8a2e7fddd1 Sync the "enable cheat" setting over netplay 2016-07-05 02:23:10 +02:00
Rukai f42350e719 portable.txt enables portable configuration on linux, README updated to
show how to build a portable and a local dolphin on linux.
2016-07-04 19:39:10 +10:00
Dolphin i18n Bot b33a5e2510 Automatic translation resources update from Transifex 2016-07-02 08:48:02 +00:00
JosJuice b210769ea0 PatchEngine: Clear active codes on shutdown
The active codes normally get cleared when a game boots, because
LoadPatches gets called, replacing the codes from the previous game.
However, there were cases where LoadPatches doesn't get called, and
then codes from the previous game would be used for the current game.
This commit clears the codes on shutdown so that it doesn't matter
whether the boot process loads LoadPatches.
2016-07-01 13:07:57 +02:00
Mat M 55ec1b69fc Merge pull request #3975 from lioncash/header
FifoPlayer: Remove unnecessary headers/namespace cleanup
2016-07-01 05:36:42 -04:00
Lioncash 9bfafed5b8 FifoPlayer: Get rid of semicolons on namespace braces 2016-07-01 04:36:05 -04:00
Lioncash 06ccfef1c1 FifoPlayer: Get rid of unnecessary includes 2016-07-01 04:25:40 -04:00
Markus Wick b30bf5d959 Merge pull request #3966 from phire/ImNotTheOnlyPersonWhoMakesThisMistake
Fix broken debug builds in visual studio
2016-07-01 08:24:02 +02:00
Chris Burgener fcbb39d236 Merge pull request #3972 from RisingFog/merge_addstereosamples
Remove AddStereoSamples function
2016-07-01 01:03:14 -04:00