Commit Graph
100 Commits
Author SHA1 Message Date
Lioncash 988c168c2d [Android] Fix a bug in FolderBrowser.java which was causing an incomplete directory structure to show. 2013-08-22 02:52:05 -04:00
Lioncash 85c78759c7 [Android] Make two class variables in InputConfigFragment private. If left the way they were, they could be accessed by other classes in its package, which is not intended. 2013-08-21 21:27:32 -04:00
Lioncash 97bfa6300d Remove unused code from InputConfigFragment. This was for when the option to draw onscreen controls was in this menu instead of video preferences. 2013-08-21 21:10:23 -04:00
Lioncash ca23318089 [Android] Fixed a bug where the config files might not load correctly upon launch. If the initial files existed, it wouldn't load the configs. This fixes that.
If the files don't exist they will be copied (in the previous block) and everything will be fine.
2013-08-21 16:02:43 -04:00
Lioncash 53df78d372 [Android] Missed a string for the Japanese translation. 2013-08-20 20:48:43 -04:00
Lioncash e52c2ac337 [Android] Migrate the "Draw Onscreen Controls" preference to the video settings. 2013-08-20 20:28:48 -04:00
Lioncash 9170c9b360 [Android] Remove unnecessary string messages from CPUSettingsFragment and VideoSettingsFragment. 2013-08-20 19:57:00 -04:00
Lioncash 00996c8d38 [Android] Implement a ViewPager for the settings. Also, move classes into appropriate packages to make things cleaner. 2013-08-20 19:39:00 -04:00
Lioncash 8de3250550 [Android] Load all of the new settings from the ini when the app is launched.
- Also fix a typo in the ini saving method in UserPreferences. Accidentally spelt the ini name wrong.
- Also include the relocated XML preferences. I meant to push this with the previous commit.
2013-08-20 15:35:16 -04:00
Lioncash 3fdfd75832 [Android] Add most of the Dolphin video/gfx settings to the settings menu. 2013-08-20 14:33:30 -04:00
Lioncash dd35156717 [Android] Forgot to document the new parameter used in SaveConfigToDolphinIni() in the last change. Fixed that. 2013-08-19 22:37:04 -04:00
Lioncash 9595457e1c [Android] Turn SaveConfigToDolphinIni() into a static method. Now saving settings to the ini config just uses one call in PrefsFragment.onDestroy(). 2013-08-19 22:34:27 -04:00
Lioncash 6dbfdce775 [Android] Remove the loading toast messages from the UI. These really don't need to be here since the things they were used for took very, very little time to load. 2013-08-19 22:09:43 -04:00
Lioncash 8dc0b38f00 [Android] Decouple Dolphin.ini config file saving from GameListActivity. It doesn't make sense to save the config AFTER control is returned from PrefsFragment to GameListActivity, since the main purpose of PrefsFragment is to handle the user settings. So, instead, we call SaveConfigToDolphinIni() in the PrefsFragment.onDestroy() method. This way, when the PrefsFragment object is being 'destroyed', it will write the settings to the ini. 2013-08-19 21:56:13 -04:00
Lioncash a87b967cde [Android] Simplify saving settings to the ini file. Since the setting names are known, there's no reason to loop through them.
This will likely be simplified further very soon.
2013-08-19 20:55:50 -04:00
Lioncash 77a5af3bcf [Android] Change the settings menu a little more. Instead of the settings being a single view with settings from all components being displayed, I have broken it into sections. This future-proofs the settings menu in the sense that it won't get cluttered before people start asking "Hey, shouldn't this be broken into sections?".
As of this commit, it is broken into CPU Settings and Video Settings.
I also simplified the code that is responsible for setting the valid CPU cores and video backends by simply making UI string arrays that get chosen, based on the platform the Android device is running on.
2013-08-19 19:10:13 -04:00
Lioncash 205ebbebbb [Android] Catch a more specific exception type (UnsatisfiedLinkError) when trying to load the main native Dolphin 'library'.
Also made the logging tag more specific.

It's generally bad to catch Exception because it's not very specific for the person reading the code. It doesn't say why that exception might have happened, it just indicates it's possible for an Exception to happen, which is quite general.
2013-08-18 18:30:13 -04:00
Lioncash 803b7ae991 [Android] Make the banners display a little larger. Now they don't look like tiny icons in the game list. 2013-08-17 22:51:35 -04:00
Lioncash 07d729daa2 [Android] Prevent duplicate duplicate items from being in the game list at one time.
Previously it was possible for a game with the same path and name to be in the list as another. This is annoying because duplicates ae (obviously) no different from the initial item.

This prevents duplicates from entering the list.

The way this works is:

1. We get the final list of items to add to the list.

2. Loop through it using two indices, which, for this explanation I'll call [item] and [itemAfter]

We compare path name at item with index [item] and the path name at item with index [itemAfter]
To phrase this numerically comparison works like so:

for (int i = 0; i < listSize; i++)
{
    if (i+1 < listSize)
        item[i].getPath().equals(item[i+1].getPath())
}

3. For each path comparison that is true, remove item at [indexNext].
2013-08-17 14:28:50 -04:00
Lioncash a9d634086c [Android] Change the Game List items to be formatted similarly to how the folder browser is. Also ensure the 'no banner' icon scales down to the same size as the other banners. 2013-08-17 13:25:40 -04:00
Lioncash 1f6c63f1d8 [Android] Ensure that required dependencies are actually exported along with everything else when the Android version builds. Without this, the support libs will not export and cause the emulator to crash upon being executed. 2013-08-17 12:26:43 -04:00
Lioncash 88f79a14db [Android] Simplify if statement conditions for the item click listener in FolderBrowser.java.
Since FolderBrowserItems have an 'isDirectory()' method, that's all we need to care about now. There's no need to check subtitles to determine if an item is a directory anymore.
2013-08-17 11:03:02 -04:00
Lioncash 9149b30237 [Android] Shorten FolderBrowserItem's method 'isValidItem()' into 'isValid()' makes more sense and less redundancy in terms of 'item.isValidItem()' -> 'item.isValid()' 2013-08-17 10:55:13 -04:00
Lioncash 5047eeb263 [Android] FolderBrowserItem objects don't need to store a context.
Removed the requirement to pass a context in the constructors.
Also cleaned out unnecessary imports.
2013-08-17 10:50:31 -04:00
Lioncash 82e9bed20e [Android] Fix a bug where the name would display incorrectly in the game list.
Completely missed the 'this.' on the variable. My bad.
2013-08-15 20:34:05 -04:00
Lioncash 072fac4a74 [Android] Remove a redundant LinearLayout in one of the layout files. 2013-08-14 20:49:26 -04:00
Lioncash 3e6f9d22db [Android] Add a faint divider line between each folder browser item.
See here for how it looks: http://i.imgur.com/CGX9NTt.png
2013-08-14 20:43:29 -04:00
Lioncash 9c27fedd6d [Android] Remove the subtitles on all folders in the folder browser. No need to have the subtitle "Folder" when it's visibly indicated by the icon of a folder next to it.
Now it looks like this: http://i.imgur.com/CbUSqgg.png
2013-08-14 19:49:39 -04:00
Lioncash 94397a44cc [Android] General formatting clean-up.
Made some class variables final, since they should convey that they cannot be changed after the first assignment.
Made the formatting consistent between files.
2013-08-14 15:03:07 -04:00
Lioncash 6f1612d99c [Android] Fix the gamepad settings view inflation.
In some cases, it would fail to inflate correctly in the sense that it would only show the binding status and not the name of the actual control that was being binded.
2013-08-14 14:33:47 -04:00
Lioncash 39eeb37032 [Android] Correct the accessibility scope of a method and variable in InputConfigFragment.java.
Also, join a variable's declaration and assignment in the onMotionEvent() function.

If no explicit accessibility term (private, protected, public, etc) is given, then the permission level is set to something called 'package-private' which means it is set to the scope of the whole package. So technically any class could have access to this method and variable, which is likely not what we want.
2013-08-14 07:33:17 -04:00
Lioncash 0142efbb2a [Android] Add 'final' to all of the class declarations.
This prevents inheritance of the classes (will throw a compiler error if you try and extend any of the classes).
This is mainly syntactical sugar and form. Nothing major.
2013-08-14 07:17:45 -04:00
Lioncash 3cc8f7747e [Android] Main title text for the file browser items are bolded again. Must have removed it accidentally during the previous large refactor. 2013-08-13 14:32:46 -04:00
Lioncash 53bf55b1e9 [Android] Make the file browser look much more nice and user friendly to use.
This is what it now looks like: http://i.imgur.com/KOZgA1i.png

As usual, if any bugs arise from this rather large change. Please report it so I can fix it.
2013-08-13 13:05:42 -04:00
Lioncash 8fbf11a0d9 [Android] Add translatable="false" to the names of the string arrays in prefvalues.xml. 2013-08-13 12:10:42 -04:00
Lioncash a8fcd50cd7 [Android] Integer.toString isn't required in this string declaration. Concatenation handles this.
For example: "string" + 1 will just be concatenated as "string1" implicitly.
2013-08-13 10:09:42 -04:00
Lioncash debd5b42cf [Android] Clean up function SupportsGLES3 in PrefsFragment.java a little bit. 2013-08-13 09:48:18 -04:00
Lioncash 2015484c24 [Android] Some tiny cleanups in DolphinEmulator.java
- Join variable declaration and assignments in function onTouchEvent()
- Change a for-loop into a foreach loop in dispatchGenericMotionEvent(). Makes the loop body a single statement.
2013-08-13 09:23:11 -04:00
Lioncash 0916d0797c Simplify asset copying code a little bit in DolphinEmulator.java
Since the directories are already cached (with smaller variable names), use these instead so we can shorten the length of each line.
2013-08-13 09:13:46 -04:00
Lioncash e3617a55a0 [Android] Clean up the function CopyAsset in DolphinEmulator.java.
[streamtype].flush() is called when [streamtype].close() is called.

No need to null the references either after calling close(), the garbage collection will take care of it.
2013-08-13 08:58:50 -04:00
Lioncash 2d7244f6d5 [Android] Change the name of a variable in FolderBrowser.java to better reflect its purpose
Compressed file formats are not valid, so it's best to rename this to invalidExts.
2013-08-13 08:50:21 -04:00
Lioncash b823983199 [Android] Multi-language support (or at least the basic foundation of it).
Added an example translation (Japanese). So now the Android version can both display in English and Japanese, depending on what the Android device's system language is set to.

Also did a tiny clean-up of InputConfigItem.java so that the parameters are slightly more descriptive.

Now, to do a translation in [x] language, all you have to do is take the normal English strings.xml and translate the XML entries into said language, and simply make a folder in the /res/ sub-directory in the form of values-[region code]. IE) With the Japanese translation, it is in the folder /res/values-ja

No configuration other than that is needed. After doing the above, the language should load fine on any device when set to that specific system language.

By default, if a translation file does not exist for a given system language. The app will automatically fall back to using the English translation.

This *should* be bug-free since I did check everything multiple times. But if any issues occur, please report them so that I can fix them.
2013-08-12 21:22:20 -04:00
Lioncash 3b272d81b4 [Android] Use a HashMap in PrefsFragment.java instead of two CharSequence arrays.
This way, we hold the [key|value] pairs together in one object and reduce overall code clutter.
2013-08-12 19:41:23 -04:00
Lioncash 00b034f991 [Android] Seems like InputConfigFragment.java also had explicit list indexing. Removed it from here too. 2013-08-12 15:32:52 -04:00
Lioncash 68e12407a5 [Android] Remove unnecessary explicit indexing of entries in a List within AboutFragment.java
Indexes are handled internally within a List object.
2013-08-12 15:16:15 -04:00
Lioncash cce809ac90 Fix a memory leak in ExpressionParser.cpp
Because there's a return here, expr should be deleted since it's not assigned to anything before returning.
2013-08-08 17:56:15 -04:00
Lioncash 9d0554e4a6 Free two memory leaks in ArmCPUDetect.cpp
Char pointers aren't freed after use.

Fixed this in PPSSPP a few days ago. Forgot to check here for the same thing until now.
2013-08-06 18:17:54 -04:00
lioncash 2e92e3814e [Android] Tiny cleanup regarding method indentation in GameListAdapter.
getItem() and getView were a little off-kilter with the rest of the class. Keeps things more consistent, etc.
2013-07-18 09:00:20 -04:00
lioncash 5b4af4f795 Goddamnit. Forgot that Master codes are also abbreviated as (M).
Ok. NOW  issue 6367 : https://code.google.com/p/dolphin-emu/issues/detail?id=6367 is fixed.

I wish I'd remember these things before committing and not after.
2013-07-15 12:28:58 -04:00
lioncash a24901688e Remove Action Replay master codes from game inis that contained them, since they're unnecessary.
Fixes issue 6367: https://code.google.com/p/dolphin-emu/issues/detail?id=6367

Also fixed an AR code missing an '$' symbol beside its description name in G4NJDA.ini
2013-07-15 12:17:51 -04:00
lioncash c35916a3e5 Add .dff FIFO logs to the list of valid extensions in FolderBrowser. 2013-07-15 10:01:04 -04:00
lioncash 0ba2594339 Use HashSets in FolderBrowser as well, like the last commit for GameListFragment.
Should have originally done this with the first refactor. My bad.
2013-07-15 09:58:54 -04:00
lioncash 13f30d1d1d [Android] Simplify GameListFragment.Fill a little bit.
Made the filtering check against a HashSet of specified supported extensions.
Not only does this get rid of the multitude of checks for extensions in the if-statement, but it also makes for less typing in the future if new file extensions/formats are used. Simply add the extension to support to the set, and you're done.
2013-07-15 09:35:45 -04:00
lioncash 4e8c3b2f12 [Android] Make FolderBrowser.Fill look slightly nicer. Improve readability a bit.
- Added a basic function description.

- Modified the main parameter to be more informative of what should be passed. Helps people who read the codebase for the first time.

- Made a variable for storing the entry name so getName() isn't called a bunch of times.

- Added some comments to explain some parts.

- Rename the exception catch variable to ignored, since it currently isn't being used.
2013-07-15 09:16:20 -04:00
Lioncash 3de5b1bed9 Fix vendor retrieval for Tegra in VideoOGL. 2013-07-02 21:58:09 -04:00
Lioncash 03a47d3c6b Fix a case where a boolean check (vector.empty()) was used when a clear (vector.clear()) was intended in ExpressionParser.cpp. 2013-07-02 21:42:44 -04:00
Lioncash fbb82ccab3 Whoops, look like the previous commit was also the case with VideoDX9 2013-06-18 10:48:16 -04:00
Lioncash f59f059fbf Fix a char buffer destination size in Render.cpp for VideoDX11. 2013-06-18 10:45:57 -04:00
Lioncash d78f00971b Fix a free that should have been a delete. 2013-06-18 10:13:37 -04:00
lioncash c2859a5207 Dammit Ctrl-Z. Restore a wxSpinCtrl parameter that accidentally got removed in the last commit. 2013-05-01 09:41:45 -04:00
lioncash fbc77e956a Display the initial number of frames that are to be recorded in the Fifo Player.
Before this commit, nothing would would be displayed in the "Frames to Record" text control.

This fixes that by setting it to what m_FramesToRecord is initially set to, which is 1 (at the time of this commit).
2013-05-01 09:35:31 -04:00
lioncash 62065be788 Fix a bug where FIFO recording could not work.
Example (in step by step explanation):

1. Run Dolphin.

2. Go to Tools -> Fifo Player

3. Go to the Record tab and hit record and then stop without a game loaded.

The button is now disabled and will not become active again for the whole time that Dolphin is running. Dolphin must be closed and then re-opened in order to use it again. This fixes that.

I've tested it with multiple conditions to make sure this doesn't beef anything else related to the Fifo Player.

ie)

- Record then Stop without a game loaded (multiple times)
- Record then Stop with a game loaded (multiple times, as well as testing playback. All of which work fine).
2013-05-01 09:05:37 -04:00
Lioncash 9ee3a30878 Remove something that slipped through the last commit.
Don't even know why that was there.
2013-04-24 09:55:12 -04:00
Lioncash bd284f1468 [Android] WINDOW_SERVICE should be accessed statically.
(it's a static final variable in the Context class, so... yeah).
2013-04-24 09:48:11 -04:00
Lioncash 8da425b008 Formatting cleanup for VideoCommon.
Block braces on new lines.

Also killed off trailing whitespace and dangling elses.

Spaced some things out to make them more readable (only in places where it looked like a bit of a clusterfuck).
2013-04-24 09:21:54 -04:00
Lioncash c2e0b9e070 Add Swedish to Windows build system. 2013-04-23 10:42:28 -04:00
Lioncash e3e818f83c Fix parameter naming in DSPEmulator.h. Should be "HLE" in CreateDSPEmulator's prototype, not "LLE". 2013-04-23 07:21:48 -04:00
lioncash d244bca1f5 Fix a bunch of random typos in comments and logging.
Also update the comment headers for two functions in GCMemcard.cpp.
2013-04-19 09:21:45 -04:00
Lioncash e2ae73ba39 Lastly - new license header introduced to main Dolphin project. All done now. 2013-04-17 23:43:35 -04:00
Lioncash e78d99e5c1 New license header introduced to all Video based projects. 2013-04-17 23:29:41 -04:00
Lioncash bab9963b00 New license header introduced for DiscIO, AudioCommon, InputCommon, VideoCommon, and Common projects. 2013-04-17 23:09:55 -04:00
Lioncash ec10622425 New license header introduced to the Core project.
Also, remove DolLoader.h, it doesn't have any use. Boot_DOL.cpp/.h supercedes it.
2013-04-17 22:43:11 -04:00
Lioncash 2316cb6876 Remove all tab/space mismatches from the Core project. For anyone working on a branch that heavily involves the core, I am so sorry.
- Also killed off some trailing spaces/tabs.

- Updated the license header to be consistent with the rest of the project (All projects are now done moving over to this)

- Also, killed some dangling else's (where appropriate)

Now all the tab fixing is done. No more of this crap should be needed to be pushed. Rejoice!
2013-04-16 23:14:36 -04:00
lioncash 8bb845e646 Buildfix for the last commit. 2013-04-15 16:40:48 -04:00
lioncash ef85b9af45 Update the license file text (change SVN to Git) in all projects except Core since I was told a merge was happening soon. So for the sake of the merge going smoothly, I'll fix that when I remove the tab/space mismatches from the Core project.
Also, some tab/space mismatches removed from VideoOGL, and some places I missed in VideoDX[number] projects.

Now, the Core is literally the only project with tab/space mismatches (on a large scale).
2013-04-15 16:28:55 -04:00
Lioncash a44fb7bdd0 Android Related - A tiny simplification/readability change for NativeListView.
In this case, contains functions pretty much the same way, just more readable.
2013-04-15 00:52:43 -04:00
Lioncash 8a9fcd3014 Kill off dangling else's in the InputCommon project.
Some indentations were also too far for some things. Fixed this.

Also update the license header to show Git instead of SVN.

Got rid of some trailing spaces/tabs too.
2013-04-14 22:53:10 -04:00
Lioncash b91930a2d4 Really minor LogInfo consistency fix in ActionReplay.cpp.
All the other [bit size] Write LogInfo calls had a hyphen in the text.
2013-04-14 00:17:22 -04:00
Lioncash 7ab0cca645 Clean up most (99.99%) of the tab/space mismatches in the VideoSoftware project.
Got rid of trailing spaces that were unnecessary too.

Also update the license header for this project. We don't use SVN anymore.
2013-04-13 23:54:02 -04:00
Lioncash 3ed0a96367 Remove an extraneous comment indicator from DebuggerPanel.cpp in DolphinWX.
Was asked to remove it, so... yeah.
2013-04-08 01:47:51 -04:00
Lioncash 1db10b139c Remove all tab/space mismatches from the DolphinWX project (at least 99%. I promise!)
Also fix up the dangling else's. Shit just looks incredibly ugly in terms of actual structure in the code.

I took the liberty of adding comments in FifoPlayerDlg.cpp, LogConfigWindow.cpp, LogWindow.cpp, and FrameAui.cpp to better explain some things.

If any comments are wrong, don't hesitate to complain.
2013-04-08 01:16:50 -04:00
Lioncash 195336021f Fix a few typos in the comments/logging in VideoDX9, VideoCommon, and VideoSoftware projects.
See Render.cpp, PixelShaderGen.cpp, and PixelShaderManager.cpp for most of the changes.

See VertexShaderManager.cpp for a logging typo fix.

See SWRenderer.cpp for a small typo fix for a message that gets swprintf'd in DrawDebugText.

See SWVertexLoader.cpp for a typo fix of an assert message.

Should slightly improve the readability of some of those files.
2013-04-07 17:11:29 -04:00
lioncash a7c05dc922 Remove an unused variable in VideoConfig.cpp and SWVideoConfig.cpp 2013-04-04 09:32:28 -04:00
Lioncash f36e18593b More log elaborating. Final time I'm doing this.
Logs should actually be somewhat understandable to some people outside of programming and stuff (in a way). It's certainly better than being bombarded by abbreviations when errors/general logging occur, at least.
2013-04-01 18:45:23 -04:00
Lioncash 04913a855e Update function descriptions in GCPad.cpp and Wiimote.cpp
Add inputs. Those that still need a description are tagged with [Description Needed]
2013-04-01 18:07:44 -04:00
Lioncash 58159a1693 Some more logging typos and clarifications. Missed these in my last commit.
This commit mainly elaborates on some messages a little more. Also fixes some typos that slipped through the last commit.

A large change in text can be seen in EXI_DeviceMemoryCard.cpp. I added more info as to why a write to a memory card may fail. (This actually was a reason I was unable to write to a memcard recently).

Elaborations can be seen in WGL.cpp

I did change some comments in some files that I was correcting logging messages in, however this is only if I spot a typo or if an abbreviation is lower-cased. Even in that case, the amount of changes done to comments is very minimal.
2013-04-01 00:10:54 -04:00
Lioncash f432d6038e Fix some typos and correct some capitalizations in the log messages.
Makes the logging look more orderly and less spammy when spitting out things.
2013-03-31 19:13:30 -04:00
Lioncash b1dd14c319 Fix a slight leak in LogManager.
m_debuggerLog wasn't ever deleted in the destructor.
2013-03-27 23:39:48 -04:00
lioncash 6fe5f5a6ba [DolphinWX] Remove a duplicate conditional in Frame.cpp 2013-03-27 15:09:04 -04:00
lioncash ae62af8a93 Array overrun fixed in VertexShaderCache for the DX11 plugin.
vs_constant_offset_table only has a size of 239. It was originally iterating up to element 241.
2013-03-26 09:19:19 -04:00
lioncash edd9d0e0ef Clean up more space/tab mismatches in AudioCommon, Common, and VideoCommon.
Not planning to touch Core since it's the most actively changed part of the project.
2013-03-19 21:51:12 -04:00
lioncash 0e3d8e2e9f Clean up some space/tab mismatches in DiscIO and InputCommon.
Keeps the files consistent.
2013-03-19 09:59:41 -04:00
lioncash 279e3c7e14 Fix a potential memory leak in function DecompressBlobToFile in CompressedBlob.cpp 2013-03-07 10:59:50 -05:00
Lioncash efe8c75424 Duplicate condition fix.
Thanks j4ck.fr0st
2013-01-25 21:30:29 -05:00
lioncash 2db0c4270e Fix a potential memory leak on non-windows systems.
Also added a FIXME to BPStructs.cpp and BPMemLoader.cpp
2013-01-24 08:21:08 -05:00
Lioncash fe7e691d77 Revert "mem_fun -> mem_fn."
This reverts commit b7d32b0a3d.

OSX C++ std library in charge of holding back progress (as usual).
2013-01-23 23:38:49 -05:00
Lioncash b7d32b0a3d mem_fun -> mem_fn.
mem_fun is deprecated in C++11. Also it does everything mem_fun can do, but more conveniently.
2013-01-23 23:29:50 -05:00
Lioncash 2bae4345c5 Revert "Ctrl+A support in the action replay code editing menu."
Guess it wasnt much of a solution as I'd hoped. (considering it seems to work on linux without this).

This reverts commit 0c1ea605d5.
2013-01-21 00:11:53 -05:00
Lioncash 0c1ea605d5 Ctrl+A support in the action replay code editing menu.
Makes adding/editing codes less of a pain in the ass. You don't need to manually highlight everything anymore.
2013-01-20 23:24:56 -05:00
Lioncash c4bd6329c0 Fully fix that clear bug in aldlist.cpp. Seems I missed part. Corrected it. 2013-01-18 23:42:37 -05:00