Commit Graph

12302 Commits

Author SHA1 Message Date
comex
ad95454d04 Merge pull request #2223 from phire/imm
Cleanup OpArg, make immediates more explicit.
2015-04-23 01:53:18 -04:00
Lioncash
8fb36228e5 Merge pull request #2311 from JosJuice/fix-wad-crash
Fix WAD crash caused by VolumeHandler removal
2015-04-23 00:23:42 -04:00
Lioncash
819f4d994c DolphinWX: Remove superfluous code in FrameTools 2015-04-22 19:56:50 -04:00
Rachel Bryk
5047cf562a Implement classic controller tas input. 2015-04-22 16:19:13 -04:00
JosJuice
0b44d7c18a Fix Wii software crashing at boot if no disc is inserted
Boot_BS2Emu was trying to read from the inserted disc even when
nothing was inserted, and this happened to not crash (but not
work either) before VolumeHandler was removed. This commit adds
a check that restores the old behavior, so there is no longer a
crash, but the game ID still doesn't get set for WADs. I don't
know if/how it should be set, so this felt like the safest option.
2015-04-22 09:14:41 +02:00
comex
5d61b9d0a4 Merge pull request #2313 from lioncash/unused
GPFifo: Remove unused parameters from Write[x] functions
2015-04-22 00:39:38 -04:00
comex
31ea8d0834 Merge pull request #2310 from lioncash/fsmenu
FrameTools: Use AppendRadioItem for constructing the frameskip menu
2015-04-22 00:39:17 -04:00
Lioncash
56df9b7508 GPFifo: Remove unused parameters from Write[x] functions 2015-04-21 23:01:25 -04:00
comex
06dd0ba3b4 Exit ReadDataFromFifoOnCPU, PushFifoAuxBuffer early if shutting down (GpuRunningState=false)
This was causing a race condition where the "absurdly large aux buffer"
panic alert would be triggered in the last bit of fifo processing on the
CPU thread in deterministic mode (i.e. netplay).  SyncGPU is supposed to
move the auxiliary queue data to the beginning of the containing buffer
so we don't have to deal with wraparound; if GpuRunningState is false,
however, it just returns, because it's set to false by another thread -
thus it doesn't know whether RunGpuLoop is still executing (in which
case it can't just reset the pointers, because it may still be using the
buffer) or not (in which case the condition variable it normally waits
for to avoid the previous problem will never be signaled).  However,
SyncGPU's caller PushFifoAuxBuffer wasn't aware of this, so if the
buffer was filling at just the right time, it'd stay full and that
function would complain that it was about to overflow it.  Similar
problem with ReadDataFromFifoOnCPU afaik.  Fix this by returning early
from those as well; other callers of SyncGPU should be safe.  A
*slightly* cleaner alternative would be giving the CPU thread a way to
tell when RunGpuLoop has actually exited, but whatever, this works.
2015-04-21 22:33:29 -04:00
Markus Wick
4340927b7f Merge pull request #2308 from Stevoisiak/FrameToolsMath
FrameTools: Remove redundant 'i-1'
2015-04-21 16:17:02 +02:00
Lioncash
ebe0222265 FrameTools: Use AppendRadioItem for constructing the frameskip menu
Same thing, less code.
2015-04-20 21:51:30 -04:00
Lioncash
f5c72c5b1a DiscIO: Add a missing header to Volume.h 2015-04-20 21:10:31 -04:00
Stevoisiak
c3cf43f064 FrameTools: Remove redundant 'i-1' 2015-04-20 20:24:37 -04:00
Matthew Parlane
571eee8648 Merge pull request #2225 from JosJuice/remove-volumehandler
Get rid of VolumeHandler
2015-04-21 11:18:57 +12:00
Matthew Parlane
a86f2fe2e7 Merge pull request #2199 from skidau/remove-controls-lock
Cleaned up the controller locking mechanism
2015-04-21 11:13:30 +12:00
Matthew Parlane
82bbada352 Merge pull request #2257 from RachelBryk/battery
Add an option for wiimote battery.
2015-04-21 11:12:12 +12:00
Matthew Parlane
f35277f215 Merge pull request #2267 from Stevoisiak/soundStream
(Visual Studio) Categorize SoundStream.h with other SoundStream files
2015-04-21 11:10:49 +12:00
Lioncash
d799446faf Core: Don't display on-screen messages via DisplayMessage until emulation has begun 2015-04-20 18:31:40 -04:00
Lioncash
d27b8673f5 Merge pull request #2306 from Stevoisiak/MoveUndoSaveState
FrameTools: Move "Undo Save State" to save state menu
2015-04-19 20:45:41 -04:00
Stevoisiak
83ec7a1e78 FrameTools: Move "Undo Save State" to save state menu 2015-04-19 20:18:11 -04:00
Stevoisiak
8adf8b16bc Globals.h: Added comments for menu sections 2015-04-19 18:51:55 -04:00
degasus
8c209b3bc9 no-gui: fix help string 2015-04-18 15:03:42 +02:00
Lioncash
9eb608c9da Merge pull request #2301 from lioncash/const
General: Apply the const specifier where applicable
2015-04-16 23:13:39 -04:00
Markus Wick
cd0212ab1c Merge pull request #2302 from lioncash/perf
PerfQueryBase: Move common implementation variables into base class
2015-04-16 07:31:31 +02:00
skidau
7063886520 Merge pull request #2289 from lioncash/netplay
DolphinWX: Break the netplay UI controls into separate classes.
2015-04-16 12:35:41 +10:00
skidau
f0593095b4 Merge pull request #2295 from comex/fix-usb-threading
Fix threading issues
2015-04-16 12:33:20 +10:00
skidau
70605cae5c Merge pull request #2300 from lioncash/update
Debugger: Update the registers/watches before refreshing grids.
2015-04-16 12:30:24 +10:00
skidau
c895e4504a Merge pull request #2298 from JosJuice/partitions-no-string-parsing
Fix extracting Wii disc partitions numbered 10 or higher
2015-04-16 12:00:40 +10:00
skidau
221d37ae83 Merge pull request #2287 from lioncash/hkbinds
HotkeyDlg: Get rid of application-wide event bindings.
2015-04-16 11:59:24 +10:00
skidau
6b82b31640 Merge pull request #2285 from linkmauve/nogui-no-x11
NoGUI: Don’t segfault when the DISPLAY environment variable isn’t set
2015-04-16 11:58:15 +10:00
Lioncash
63393570fb PerfQueryBase: Move common implementation variables into base class 2015-04-15 19:22:16 -04:00
Emmanuel Gil Peyrot
1e7ca7f579 NoGUI: Don’t segfault when the DISPLAY environment variable isn’t set 2015-04-16 01:10:57 +02:00
JosJuice
86ceb54c38 Fix extracting Wii disc partitions numbered 10 or higher
Instead of trying to get the partition number from the
(localized!) item name, the partitions are now stored as item data.
2015-04-15 09:29:24 +02:00
Lioncash
b0613bb1c8 General: Apply the const specifier where applicable 2015-04-15 02:04:03 -04:00
Lioncash
2cddb8f480 Debugger: Update the registers/watches before refreshing grids. 2015-04-15 00:13:13 -04:00
Lioncash
bdde6b2a7c D3D: Remove dependency on wxWidgets
This hasn't been necessary for ages
2015-04-14 22:27:03 -04:00
Lioncash
a6970b3744 Merge pull request #2288 from lioncash/unnecessary
ISOProperties: Remove unnecessary/unused variables & controls.
2015-04-14 10:42:29 -04:00
Lioncash
882080c282 Merge pull request #2284 from lioncash/leaks
DolphinWX: Fix memory leaks relating to the TAS dialog
2015-04-14 10:38:48 -04:00
Lioncash
c36a6b7599 Merge pull request #2291 from JosJuice/qt-sort-ascending-title
DolphinQt: Sort game list by ascending title order by default
2015-04-13 02:36:31 -04:00
comex
8ebe3d3478 Remove unused field. 2015-04-13 02:27:08 -04:00
comex
5fff97f3f4 Fix printf width in TraversalServer. 2015-04-13 02:26:52 -04:00
comex
ba664b3293 Join the emu thread in Core::Stop. Get rid of Core::Shutdown which did that before.
Core::Shutdown was only called on app exit, yet the emu thread exits
whenever emulation stops; if you launched a new game it would just join
via the destructor when s_emu_thread was set to a new thread.
(Incidentally, the destructor also makes explicitly joining on app exit
rather pointless.)

Because the GUI thread wasn't waiting for the CPU thread to fully shut
down, Core::IsRunning would remain true briefly after CFrame::DoStop
which, given Dolphin's penchant for accessing variables belonging to
other threads, can only mean trouble... In my case, because the previous
commit caused UpdateGUI, which is called at the end of DoStop, to call
PauseAndLock, which checks IsRunning, pressing stop at the right time
would cause strange behavior.
2015-04-13 02:17:38 -04:00
comex
e000aaaf5d Have the UI thread do PauseAndLock before messing with GetUsbPointer.
Since its lifetime is managed on the CPU thread, this (or a refactoring)
is absolutely required.  One of the functions with a PauseAndLock call
added is CFrame::UpdateGUI; this is fine now, since it's called only
after important events happen, so just make sure not to call it every
frame or something :)
2015-04-13 01:49:24 -04:00
JosJuice
bd680aa3b5 Main: Remove unnecessary shellapi.h include
The include was introduced by bcf1f54c and made unnecessary by 611f3494.
2015-04-12 10:22:18 +02:00
mathieui
4c2d25eeaf Fix a warning
HotkeyManagerEmu.enabled is unused, as everything now uses
HotkeyManagerEmu.s_enabled.
2015-04-11 19:47:39 +02:00
JosJuice
9e4eefc6fd DolphinQt: Sort game list by ascending title order by default 2015-04-11 16:44:35 +02:00
Rachel Bryk
48a1d97fe7 Disable oc setting while netplay or movie is active. 2015-04-11 03:54:11 -04:00
Lioncash
bd28d260ce DolphinWX: Break the netplay UI controls into separate classes. 2015-04-11 01:35:54 -04:00
Lioncash
5d7cd29a8b ISOProperties: Remove unnecessary/unused variables & controls. 2015-04-10 19:53:58 -04:00
Lioncash
9cc244e913 HotkeyDlg: Get rid of application-wide event bindings.
This dialog is used as a modal dialog, so making the key-press event bindings application-wide is unnecessary.
2015-04-10 19:31:37 -04:00
Lioncash
00943b1ef4 DolphinWX: Fix memory leaks relating to the TAS dialog
Initially, the dialogs construct in the background when Dolphin initializes. However, it waits until the user actually makes the dialogs visible to decide on whether to create the Wii or GC control layouts.

Therefore, the call to CreateBaseLayout() essentially creates a sizer that isn't actually attached to a main sizer that is set as the sizer for the dialog to use. So upon destruction, these controls would never actually be destroyed if the user didn't open and then close the TAS dialogs.
2015-04-09 23:33:33 -04:00
Lioncash
1a18cad178 Merge pull request #2281 from Stevoisiak/MoveCountryWorld
Re-sort Country_World
2015-04-09 12:15:18 -04:00
Lioncash
2c2409fee4 Merge pull request #2278 from lioncash/leak
Debugger: Fix memory leaks related to grid tables
2015-04-09 11:07:27 -04:00
Stevoisiak
7c1ab2911a Move down Country_World
The countries are sorted alphabetically. This should have been changed
when the variable was renamed from Country_International to
Country_World
2015-04-08 18:55:16 -04:00
JosJuice
76d0cfa8ac Fix terrible Speed Up Disc Transfer Rate mistake
I apologize.
2015-04-08 08:59:49 +02:00
Lioncash
180854c617 Debugger: Fix memory leaks related to grid tables
Incrementing the reference count here isn't necessary, as they construct with a count of 1. Incrementing again results in the attributes not being freed.
2015-04-07 23:16:29 -04:00
skidau
f8a4d4702c Merge pull request #2252 from mathieui/traversal-timeout
NetPlay: Don’t wait forever in the traversal client
2015-04-08 11:56:57 +10:00
skidau
ff891394e8 Merge pull request #2248 from mathieui/netplay-disable-ui
NetPlay: Disable some UI elements when a game is running
2015-04-08 11:56:06 +10:00
skidau
5638ddaf6c Merge pull request #2263 from JosJuice/sudtr-not-instant
Make Speed Up Disc Transfer Rate not instant
2015-04-08 11:54:44 +10:00
Lioncash
ec96119f8c TASInputDlg: Remove unnecessary explicit bools 2015-04-07 21:44:51 -04:00
degasus
ef6bdf674f Common: Remove TLS usage in GetLastErrorMsg
Just return std::string as this code isn't performance critical.
2015-04-07 22:42:21 +02:00
Lioncash
4796dc80bf Merge pull request #2254 from SizzlingCalamari/remove-DSPLLE-cycle-mutex
Made cycle count atomic to avoid using a mutex
2015-04-07 08:27:38 -04:00
Lioncash
54cedf77f9 Merge pull request #2265 from lioncash/warn
ConfigManager: Fix a sign mismatch warning
2015-04-06 09:34:23 -04:00
degasus
74795b4553 Fifo: rewrite Fifo_PauseAndLock
This lock isn't required any more as our FlushGpu garanty to block until the GPU is idle
2015-04-06 12:35:35 +02:00
degasus
b1ffd32f5f Fifo: only touch the SIMD state once in the single core loop 2015-04-06 12:35:35 +02:00
degasus
d2c62b1744 Fifo: only sleep once within every ms of emulated time 2015-04-06 12:35:35 +02:00
degasus
b020ae1c5d Fifo: rewrite sync on idle skipping hack
Now it's done without a busy loop
2015-04-06 12:35:35 +02:00
degasus
9bdaa00e2d Fifo: use the outer loop on sync GPU 2015-04-06 12:35:35 +02:00
degasus
279c657cda Fifo: Replace busy loop with condition variable 2015-04-06 12:35:27 +02:00
JosJuice
4cd00e366c Get rid of VolumeHandler
VolumeHandler is basically just a wrapper around a single IVolume object.
This change moves that object to DVDInterface, moves the Read32
function to IVolume, and gets rid of the rest of VolumeHandler.
2015-04-05 10:09:48 +02:00
Lioncash
2211aead7f DSPInterpreter: Remove unused volatile variable and related function 2015-04-03 22:46:30 -04:00
Stevoisiak
78971b0840 (Visual Studio) Categorize SoundStream.h with other SoundStream files 2015-04-03 14:37:03 -04:00
Lioncash
7848876f99 ConfigManager: Fix a sign mismatch warning 2015-04-02 14:30:38 -04:00
Lioncash
38236fb8e8 Merge pull request #2262 from Buddybenj/change-wording-2
Change Wording in Help Menu
2015-04-02 13:36:48 -04:00
JosJuice
ee3d36af92 Make Speed Up Disc Transfer Rate not instant
The instant speed broke some games. SUDTR will now emulate
the transfer from the disc drive buffer to the main memory,
but not the speed of the disc drive itself.
2015-04-02 11:46:19 +02:00
Buddybenj
fb0d3a9756 Change Wording in Help Menu
"Dolphin at GitHub" doesn't make much sense IMO. We could also make it say "Source Code" or "Dolphin on GitHub".

I also changed "Dolphin Website" to make it consistent with the Qt version.
2015-04-01 18:08:26 -05:00
JosJuice
0deb9f5e39 Revert "Merge pull request #2256 from RachelBryk/Dolphin-Pro"
This reverts commit ae0a090701, reversing
changes made to 6b6b5ed37f.
2015-04-01 22:30:57 +02:00
degasus
119fea0d72 Remove TM character which breaks our buildbot
Or github...
2015-04-01 22:24:13 +02:00
Pierre Bourdon
ae0a090701 Merge pull request #2256 from RachelBryk/Dolphin-Pro
Limit Wiimote battery usage for Dolphin-lite users.
2015-04-01 21:07:22 +02:00
Rachel Bryk
ba93b91565 Add an option for wiimote battery. 2015-04-01 05:29:45 -04:00
Rachel Bryk
d39d89594d Limit Wiimote battery usage for Dolphin-lite users.
Wiimote batteries drain over time. The user must upgrade to Dolphin Pro for $19.95 to recharge them.
2015-04-01 04:31:03 -04:00
Fog
a94e31e476 Update About Dolphin Screen 2015-03-31 21:30:05 -04:00
Jordan Cristiano
4051da75e4 Made cycle count atomic to avoid using a mutex 2015-03-31 04:09:33 -04:00
skidau
6b6b5ed37f Merge pull request #2249 from SizzlingCalamari/DSPLLE-thread-fix
Fixed dsp lle thread never starting
2015-03-31 12:25:59 +11:00
skidau
008200db4d Merge pull request #2244 from lioncash/find
DolphinWX/Common: Change some find_first_of usages to find
2015-03-30 21:07:42 +11:00
Lioncash
d42d5699b5 Merge pull request #2253 from RachelBryk/cheats
Fix enable cheats checkbox.
2015-03-30 05:41:56 -04:00
skidau
8c47c68a4f Merge pull request #2232 from JosJuice/savestate-exact-version
When loading incompatible savestate, display exact Dolphin version
2015-03-30 18:07:14 +11:00
JosJuice
85073675a5 When loading incompatible savestate, display which version created it 2015-03-30 09:02:43 +02:00
skidau
5da3375bf1 Merge pull request #2245 from lioncash/tables
DolphinWX: Get rid of wxGrid-based casts in the debugger.
2015-03-30 12:20:20 +11:00
Rachel Bryk
d4fa8de35a Fix enable cheats checkbox. 2015-03-29 20:43:51 -04:00
skidau
731e4a3a65 Merge pull request #2250 from RachelBryk/tasinput-home
Fix home button in tas input.
2015-03-29 16:40:57 +11:00
mathieui
b1eb87e495 NetPlay: Don’t wait forever in the traversal client
With some specific, STUN-hostile routers, the netplay client can get
stuck forever while trying to connect to the stun server. This adds a
5 seconds (much more than should be necessary if it works) timer until
a failure is registered and the attempt stops.
2015-03-28 20:15:34 +01:00
Rachel Bryk
35bdfd5ec9 Fix home button in tas input. 2015-03-28 07:40:21 -04:00
skidau
9947324296 Track the co-ordinates of the mouse relative to the pointed window instead of the original hwnd. 2015-03-28 11:38:14 +11:00
skidau
4f965da4f1 Revert the recent changes related to updating hwnd 2015-03-28 11:08:25 +11:00
skidau
74f25ad8ec Merge pull request #2234 from lioncash/config
DolphinWX: Break up ConfigMain into separate classes.
2015-03-28 10:11:29 +11:00
Jordan Cristiano
e2060525bc Fixed dsp lle thread never starting because of dspjit initialization happening after the dsp thread check 2015-03-27 19:00:53 -04:00
mathieui
666c06dce7 NetPlay: Disable some UI elements when a game is running
because it makes dolphin crash, and it doesn’t make sense to change them
at runtime
2015-03-27 18:43:06 +01:00
skidau
affa5c2e0b Merge pull request #2228 from Stevoisiak/FixISOPaths
Check for GCMPathes if ISOPaths is not found
2015-03-26 09:48:33 +11:00
Stevoisiak
4f1d74b2e1 Check for GCMPathes if ISOPaths is not found
The name of the settings were changed in 4.0-4003 with PR #1264.
2015-03-25 11:13:13 -04:00