diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-08-26 17:38:29 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-08-26 17:38:29 +0000 |
| commit | 895f26cffe5b033161417c1cbfbe32e94685a7f7 (patch) | |
| tree | 123737fd073ee5d64019a7db6583e7e33220f60e /macosx/plugins/DFInput/macsrc | |
| parent | 5e6b15b321e7b0b76f5d132a72d2e8b72e985702 (diff) | |
| download | pcsxr-895f26cffe5b033161417c1cbfbe32e94685a7f7.tar.gz | |
Adding an info.plist for the shared spu library on OS X.
Silence a few warnings about long to int conversions on OS X code.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86929 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins/DFInput/macsrc')
| -rwxr-xr-x | macosx/plugins/DFInput/macsrc/ControllerList.m | 2 | ||||
| -rwxr-xr-x | macosx/plugins/DFInput/macsrc/MappingCell.m | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/macosx/plugins/DFInput/macsrc/ControllerList.m b/macosx/plugins/DFInput/macsrc/ControllerList.m index 41b38e2f..653bdba2 100755 --- a/macosx/plugins/DFInput/macsrc/ControllerList.m +++ b/macosx/plugins/DFInput/macsrc/ControllerList.m @@ -125,7 +125,7 @@ static const int DPad[DKEY_TOTAL] = { GetKeyDescription(buf, currentController, DPad[rowIndex]); } else { rowIndex -= DKEY_TOTAL; - GetAnalogDescription(buf, currentController, rowIndex / 4, rowIndex % 4); + GetAnalogDescription(buf, currentController, (int)(rowIndex / 4), rowIndex % 4); } return @(buf); diff --git a/macosx/plugins/DFInput/macsrc/MappingCell.m b/macosx/plugins/DFInput/macsrc/MappingCell.m index d36fab50..885c1b74 100755 --- a/macosx/plugins/DFInput/macsrc/MappingCell.m +++ b/macosx/plugins/DFInput/macsrc/MappingCell.m @@ -35,7 +35,7 @@ { [super selectWithFrame:aRect inView:controlView editor:textObj delegate:anObject start:selStart length:selLength]; - long whichPad = [ControllerList currentController]; + int whichPad = [ControllerList currentController]; NSTableView *tableView = (NSTableView *)[self controlView]; long i, changed = 0, row; NSEvent *endEvent; @@ -58,7 +58,7 @@ changed = ReadDKeyEvent(whichPad, [ControllerList buttonOfRow:row]); } else { row -= DKEY_TOTAL; - changed = ReadAnalogEvent(whichPad, row / 4, row % 4); + changed = ReadAnalogEvent(whichPad, (int)(row / 4), row % 4); } if (changed) break; @@ -69,7 +69,7 @@ /* move selection to the next list element */ [self endEditing:textObj]; if (changed == 1) { - int nextRow = [tableView selectedRow] + 1; + int nextRow = (int)[tableView selectedRow] + 1; if (nextRow >= [tableView numberOfRows]) { [tableView deselectAll:self]; return; |