Commit Graph

20772 Commits

Author SHA1 Message Date
Pierre Bourdon
a9d8a7decd Merge pull request #4009 from leoetlino/common-id-assign
ControllerInterface: Make the ID assigning code common
2016-07-14 23:13:30 +02:00
Matthew Parlane
a97a546bd6 Merge pull request #3594 from lioncash/threads-a-joke-about
Core: Use the thread_local keyword
2016-07-15 08:50:54 +12:00
Léo Lam
788e19f54d ControllerInterface: Make the ID assigning code common
This makes the device ID assigning code common to all backends, by
moving it to AddDevice() instead of copy-pasting or replicating
the logic in the backends.

Also, to prepare for hotplugging, instead of relying on a name usage
count, the new ID assigning system always starts from ID 0 and tries
to assign the first ID that is not used.
2016-07-14 10:50:53 +02:00
Matthew Parlane
b101f8fe7e Merge pull request #4008 from Pringo/master
Finish Menu Capitalization Fixes
2016-07-14 16:23:12 +12:00
Pringo
94353978ae Finish Menu Capitalization Fixes 2016-07-13 21:05:59 -07:00
Matthew Parlane
ca8484cb72 Merge pull request #3936 from Pringo/fix-menu-capitalization
Fix Menu Capitalization
2016-07-14 14:19:34 +12:00
Pierre Bourdon
667e18a8a3 Merge pull request #3958 from jloehr/Fix-SCMRevGen-MSBuild(x64)
Fix SCMRevGen for 64-bit MSBuild
2016-07-13 19:51:24 +02:00
Pierre Bourdon
014037ebb7 Merge pull request #3983 from JosJuice/discio-enums
Move DiscIO enums to a new file
2016-07-13 19:51:01 +02:00
JosJuice
0a15aaaa12 Move DiscIO enums to a new file
At first there weren't many enums in Volume.h, but the number has been
growing, and I'm planning to add one more for regions. To not make
Volume.h too large, and to avoid needing to include Volume.h in code
that doesn't use volume objects, I'm moving the enums to a new file.
I'm also turning them into enum classes while I'm at it.
2016-07-13 17:29:27 +02:00
Julian Löhr
6f65293131 Fix SCMRevGen for 64-bit MSBuild
CScript must be run as 64-bit regardless of the MSBuild bitness. Otherwise it won't find 64-bit Git installations.
However the "Sysnative" redirector is not available for 64-bit processes. So a fix is needed when 64-bit MSBuild is run.
The "ProgramFiles(x86)" Macro is only set for 64-bit, otherwise it is empty. Therefore it can be used as condition to check whether the current MSBuild process is 32 or 64-bit.
2016-07-13 17:28:55 +02:00
Pierre Bourdon
89a03174cc Merge pull request #4001 from leoetlino/split-controller-setting
ControllerEmu: Split the Setting class
2016-07-13 13:59:59 +02:00
Léo Lam
213373f5f9 StringUtil: Make TryParse parse floats as booleans
This is needed to keep compatibility with old configuration files which
didn't store booleans as booleans, but as floats/doubles.
2016-07-13 13:50:48 +02:00
Matthew Parlane
baf9abe911 Merge pull request #3980 from JosJuice/changedisc-threading-simplification
DVDInterface: Simplify calling ChangeDisc from CPU thread
2016-07-13 22:48:47 +12:00
Pierre Bourdon
f4d2626d2b Merge pull request #4005 from EmptyChaos/blockcache-bug
SectorReader: Minor cache bias bug
2016-07-13 12:11:19 +02:00
Matthew Parlane
3f9a98ddf2 Merge pull request #3979 from JosJuice/use-g_want_determinism
Use g_want_determinism more
2016-07-13 18:56:23 +12:00
Matthew Parlane
ebf10d38dd Merge pull request #3978 from JosJuice/frameskipping-determinism
Movie: Fix FrameSkipping determinism condition
2016-07-13 18:54:51 +12:00
Matthew Parlane
4d2df0a8ce Merge pull request #3989 from JosJuice/insert-sd-thread
Don't ScheduleEvent from wrong thread when inserting SD card
2016-07-13 18:44:50 +12:00
Scott Mansell
cb63bacd65 Merge pull request #4006 from EmptyChaos/dqt2-warning
DolphinQt2: Startup Warning
2016-07-13 18:27:01 +12:00
EmptyChaos
0efb19e66a DolphinQt2: Experimental GUI Warning Prompt.
Add a GUI prompt to tell users not to use DolphinQt by accident.
2016-07-13 15:52:45 +10:00
EmptyChaos
3e4cea7f6f DolphinQt2: Fix MSBuild for Visual Studio.
Null VideoBackend is not being linked correctly.
2016-07-13 11:12:20 +10:00
Pierre Bourdon
e1a76b4a38 Merge pull request #4003 from rohit-n/build-pch
Fix building with PCH disabled.
2016-07-12 20:19:48 +02:00
Rohit Nirmal
bb52aad546 Fix building with PCH disabled. 2016-07-12 12:43:03 -05:00
Pierre Bourdon
12d650be99 Merge pull request #4002 from leoetlino/wiimote-windows
WiimoteReal: Call Update() less often
2016-07-12 17:57:32 +02:00
Léo Lam
47859ad40c WiimoteReal: Call Update() less often
This moves back the WiimoteScanner:Update() call to where it originally
was, since according to a comment it is intended to be called only when
"when not looking for more Wiimotes", and calling it too often causes
the Bluetooth module to be loaded/unloaded a lot of times.
2016-07-12 16:50:41 +02:00
Léo Lam
5e829f4527 ControllerEmu: Split the Setting class
The Setting class was used for both numeric values and booleans, and
other parts of the code had hacks to make it work with booleans.

By splitting Setting into NumericSetting and BooleanSetting, it is
clear which settings are numeric, and which are boolean, so there is
no need to guess by checking the default values or anything like that.
Also, booleans are stored as booleans in config files, instead of 1.0.
2016-07-12 11:42:18 +02:00
Scott Mansell
6b48b62872 Merge pull request #3973 from phire/StripSpaces
Strip whitespace from Evdev and OSX controller names.
2016-07-12 14:44:47 +12:00
Scott Mansell
e0839a9478 Strip whitespace from Evdev and OSX controller names. 2016-07-12 14:19:07 +12:00
Pierre Bourdon
f59b8b7536 Merge pull request #3986 from JosJuice/scrubbing-improvements
Scrubbing improvements
2016-07-12 02:24:04 +02:00
Pierre Bourdon
ac00b249aa Merge pull request #3985 from thegrb93/master
Prevent windows from idling while playing a game with a gc controller
2016-07-11 23:45:53 +02:00
Garrett Brown
0856e162a3 Prevent windows from idling while playing a game with a gamecube controller. 2016-07-11 13:39:06 -05:00
Pierre Bourdon
2de6d07360 Merge pull request #4000 from JosJuice/movie-netplay-global
Movie: Don't access g_netplay_initial_gctime directly
2016-07-11 17:09:04 +02:00
JosJuice
8df4437b6c Movie: Don't access g_netplay_initial_gctime directly
Using the global variable directly is ugly and might not be threadsafe.
2016-07-11 16:49:58 +02:00
Pierre Bourdon
7530a2d206 Merge pull request #3999 from leoetlino/evdev-clamp
evdev: Clamp axis values to the 0.0-1.0 range
2016-07-11 14:30:14 +02:00
Léo Lam
6cc4591226 evdev: Clamp axis values to the 0.0-1.0 range
The values are expected to be in the 0.0-1.0 range (as indicated by the
comment), and other parts of Dolphin also expect it to be in that range
since the "full" axis has a -1.0 to 1.0 range.  However, this is not
always the case and fvalue can end up being outside of the range. This
clamps fvalue to always be in the 0.0 and 1.0 range.
2016-07-11 14:00:09 +02:00
JosJuice
53e7eed28d DiscScrubber: Fix issue 9356 2016-07-11 11:46:15 +02:00
Pierre Bourdon
f57aec0525 Merge pull request #3858 from Aestek/feature/better-netplay-gamenotfound
Netplay: check if all players have the game before starting
2016-07-11 10:06:00 +02:00
Pierre Bourdon
8de6800e9d Merge pull request #3998 from comex/warning-fixes-951
Fix more warnings:
2016-07-11 04:04:30 +02:00
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