* Italian translation update

+ some little GUI adjustements

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7066 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
gnick79
2011-02-04 23:44:11 +00:00
parent d5df148fc2
commit d29b3e612a
23 changed files with 237 additions and 224 deletions

View File

@ -18,7 +18,7 @@ msgstr ""
#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:494 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:494
msgid " (too many to display)" msgid " (too many to display)"
msgstr " (troppo grande per il display)" msgstr " (troppi per la visualizzazione)"
#: Source/Core/DolphinWX/Src/NetWindow.cpp:252 #: Source/Core/DolphinWX/Src/NetWindow.cpp:252
#: Source/Core/DolphinWX/Src/NetWindow.cpp:434 #: Source/Core/DolphinWX/Src/NetWindow.cpp:434
@ -59,7 +59,7 @@ msgstr "%d Blocchi Liberi; %d Voci Directory Libere"
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:722 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:722
#, c-format #, c-format
msgid "%d Hz" msgid "%d Hz"
msgstr "" msgstr "%d Hz"
#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:129 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:129
#: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:321 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:321
@ -264,16 +264,16 @@ msgstr "Impostazioni &Wiimote"
#: Source/Core/DolphinWX/Src/PHackSettings.cpp:59 #: Source/Core/DolphinWX/Src/PHackSettings.cpp:59
msgid "(-)+zFar" msgid "(-)+zFar"
msgstr "" msgstr "(-)+zFar"
#: Source/Core/DolphinWX/Src/PHackSettings.cpp:54 #: Source/Core/DolphinWX/Src/PHackSettings.cpp:54
msgid "(-)+zNear" msgid "(-)+zNear"
msgstr "" msgstr "(-)+zNear"
#: Source/Core/DolphinWX/Src/PHackSettings.cpp:105 #: Source/Core/DolphinWX/Src/PHackSettings.cpp:105
#, fuzzy #, fuzzy
msgid "(UNKNOWN)" msgid "(UNKNOWN)"
msgstr "SCONOSCIUTO" msgstr "(SCONOSCIUTO)"
#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:426 #: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:426
msgid "(off)" msgid "(off)"
@ -537,6 +537,13 @@ msgid ""
"\n" "\n"
"NOTE: Check LogWindow/Console for the acquired values." "NOTE: Check LogWindow/Console for the acquired values."
msgstr "" msgstr ""
"Somma il valore specificato al Parametro zFar.\n"
"Due modi di esprimere i valori in virgola mobile.\n"
"Esempio: inserendo ''200'' o direttamente ''0.0002'', il risultato non cambia, "
"il valore acquisito sarà ''0.0002''.\n"
"Valori: (0->+/-Intero) oppure (0->+/-Frazionaro[6 cifre di precisione dopo la virgola])\n"
"\n"
"NOTA: Controlla la Finestra di Log o la Console per i valori acquisiti."
#: Source/Core/DolphinWX/Src/PHackSettings.cpp:53 #: Source/Core/DolphinWX/Src/PHackSettings.cpp:53
msgid "" msgid ""
@ -548,6 +555,13 @@ msgid ""
"\n" "\n"
"NOTE: Check LogWindow/Console for the acquired values." "NOTE: Check LogWindow/Console for the acquired values."
msgstr "" msgstr ""
"Somma il valore specificato al Parametro zNear.\n"
"Due modi di esprimere i valori in virgola mobile.\n"
"Esempio: inserendo ''200'' o direttamente ''0.0002'', il risultato non cambia, "
"il valore acquisito sarà ''0.0002''.\n"
"Valori: (0->+/-Intero) oppure (0->+/-Frazionaro[6 cifre di precisione dopo la virgola])\n"
"\n"
"NOTA: Controlla la Finestra di Log o la Console per i valori acquisiti."
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:777 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:777
msgid "Adjust the analog control pressure required to activate buttons." msgid "Adjust the analog control pressure required to activate buttons."
@ -669,12 +683,12 @@ msgstr "Almeno un riquadro deve rimanere aperto."
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:586
#, fuzzy #, fuzzy
msgid "Audio" msgid "Audio"
msgstr "CoreAudio" msgstr "Audio"
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:736
#, fuzzy #, fuzzy
msgid "Audio Backend:" msgid "Audio Backend:"
msgstr "Interfaccia Audio" msgstr "Interfaccia Audio:"
#: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39 #: Source/Core/AudioCommon/Src/AOSoundStream.cpp:39
msgid "AudioCommon: Error opening AO device.\n" msgid "AudioCommon: Error opening AO device.\n"
@ -708,7 +722,7 @@ msgstr "Indietro"
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:740 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:740
#, fuzzy #, fuzzy
msgid "Backend Settings" msgid "Backend Settings"
msgstr "Impostazioni di Base" msgstr "Impostazioni Interfaccia"
#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:280 #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:280
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:92 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:92
@ -908,11 +922,11 @@ msgstr ""
#: Source/Core/DolphinWX/Src/PHackSettings.cpp:60 #: Source/Core/DolphinWX/Src/PHackSettings.cpp:60
msgid "Changes sign to zFar Parameter (after correction)" msgid "Changes sign to zFar Parameter (after correction)"
msgstr "" msgstr "Cambia segno al Parametro zFar (dopo la correzione)"
#: Source/Core/DolphinWX/Src/PHackSettings.cpp:55 #: Source/Core/DolphinWX/Src/PHackSettings.cpp:55
msgid "Changes sign to zNear Parameter (after correction)" msgid "Changes sign to zNear Parameter (after correction)"
msgstr "" msgstr "Cambia segno al Parametro zNear (dopo la correzione)"
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:561
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:562 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:562
@ -1082,7 +1096,7 @@ msgstr "Conferma la Sovrascrittura del File"
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:652
msgid "Confirm On Stop" msgid "Confirm On Stop"
msgstr "Conferma Alla Chiusura" msgstr "Conferma alla Chiusura"
#: Source/Core/DolphinWX/Src/NetWindow.cpp:61 #: Source/Core/DolphinWX/Src/NetWindow.cpp:61
#: Source/Core/DolphinWX/Src/NetWindow.cpp:81 #: Source/Core/DolphinWX/Src/NetWindow.cpp:81
@ -1174,8 +1188,8 @@ msgid ""
"backup. Please note that original Gamecube and Wii discs cannot be read by " "backup. Please note that original Gamecube and Wii discs cannot be read by "
"most PC DVD drives." "most PC DVD drives."
msgstr "" msgstr ""
"Impossibile leggere \"%s\". Nessun disco trovato nell'unità, oppure non è un " "Impossibile leggere \"%s\". Nessun disco trovato nell'unità, oppure non è una "
"backup GC/Wii. Tieni presente che la maggior parte delle unità a DVD nei PC " "copia di sicurezza GC/Wii. Tieni presente che la maggior parte delle unità a DVD nei PC "
"non riesce a leggere i dischi originali GameCube/Wii." "non riesce a leggere i dischi originali GameCube/Wii."
#: Source/Core/Core/Src/CoreParameter.cpp:273 #: Source/Core/Core/Src/CoreParameter.cpp:273
@ -1280,16 +1294,16 @@ msgstr "Directory corrente cambiata da %s a %s dopo wxFileSelector!"
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344
#, fuzzy #, fuzzy
msgid "Custom Projection Hack" msgid "Custom Projection Hack"
msgstr "Hack Proiezione per:" msgstr "Hack Proiezione Personalizzato:"
#: Source/Core/DolphinWX/Src/PHackSettings.h:30 #: Source/Core/DolphinWX/Src/PHackSettings.h:30
#, fuzzy #, fuzzy
msgid "Custom Projection Hack Settings" msgid "Custom Projection Hack Settings"
msgstr "Hack Proiezione per:" msgstr "Impostazioni Hack Proiezione Personalizzato:"
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:347
msgid "Customize some Orthographic Projection parameters." msgid "Customize some Orthographic Projection parameters."
msgstr "" msgstr "Personalizza alcuni parametri di Proiezione Ortografica"
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86
msgid "D-Pad" msgid "D-Pad"
@ -1306,22 +1320,22 @@ msgstr "DSP"
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:708
#, fuzzy #, fuzzy
msgid "DSP Emulator Engine" msgid "DSP Emulator Engine"
msgstr "Motore di Emulazione CPU" msgstr "Motore di Emulazione DSP"
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325
msgid "DSP HLE emulation (fast)" msgid "DSP HLE emulation (fast)"
msgstr "" msgstr "Emulazione DSP HLE (veloce)"
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275
#, fuzzy #, fuzzy
msgid "DSP LLE interpreter (slow)" msgid "DSP LLE interpreter (slow)"
msgstr "Interprete (Molto lento)" msgstr "Interprete DSP LLE (lento)"
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
#, fuzzy #, fuzzy
msgid "DSP LLE recompiler" msgid "DSP LLE recompiler"
msgstr "Debugger DSP LLE" msgstr "Ricompilatore DSP LLE"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #: Source/Core/DolphinWX/Src/FrameTools.cpp:386
msgid "DSP settings" msgid "DSP settings"
@ -1607,7 +1621,7 @@ msgstr "Percussioni/Batteria"
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:77 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:77
msgid "Dummy" msgid "Dummy"
msgstr "Fittizia" msgstr "Fittizio/a"
#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:401 #: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:401
msgid "Dump EFB Target" msgid "Dump EFB Target"
@ -1859,7 +1873,7 @@ msgstr ""
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:345
#, fuzzy #, fuzzy
msgid "Enables Custom Projection Hack" msgid "Enables Custom Projection Hack"
msgstr "Hack Proiezione per:" msgstr "Abilita Hack Proiezione Personalizzato"
#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:70 #: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:70
msgid "" msgid ""
@ -2028,11 +2042,11 @@ msgstr "Estensione"
#: Source/Core/DolphinWX/Src/PHackSettings.cpp:61 #: Source/Core/DolphinWX/Src/PHackSettings.cpp:61
msgid "Extra Parameter" msgid "Extra Parameter"
msgstr "" msgstr "Parametro Extra"
#: Source/Core/DolphinWX/Src/PHackSettings.cpp:62 #: Source/Core/DolphinWX/Src/PHackSettings.cpp:62
msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgid "Extra Parameter useful in ''Metroid: Other M'' only."
msgstr "" msgstr "Parametro Extra utile solo in ''Metroid: Other M''."
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:622 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:622
msgid "Extract All Files..." msgid "Extract All Files..."
@ -2119,8 +2133,8 @@ msgid ""
"Failed to read block allocation table backup correctly\n" "Failed to read block allocation table backup correctly\n"
"(0x8000-0x9FFF)" "(0x8000-0x9FFF)"
msgstr "" msgstr ""
"Accesso alla tavola di allocazione dei blocchi non riuscito\n" "Accesso alla copia di sicurezza della tavola di allocazione "
"(0x8000-0x9FFF)" "dei blocchi non riuscito\n(0x8000-0x9FFF)"
#: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:122 #: Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp:122
msgid "" msgid ""
@ -2342,7 +2356,7 @@ msgstr "Schermo Intero"
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:659 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:659
msgid "Fullscreen Display Resolution:" msgid "Fullscreen Display Resolution:"
msgstr "Risoluzione video a Schermo Intero" msgstr "Risoluzione video a Schermo Intero:"
#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:83 #: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:83
msgid "" msgid ""
@ -2368,7 +2382,7 @@ msgstr "Controlli GC"
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:669 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:669
#, fuzzy #, fuzzy
msgid "GFX Config" msgid "GFX Config"
msgstr "Configurazione" msgstr "Impostazioni GFX"
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:463 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:463
msgid "Game ID:" msgid "Game ID:"
@ -2941,7 +2955,7 @@ msgstr ""
#: Source/Core/DolphinWX/Src/PHackSettings.cpp:50 #: Source/Core/DolphinWX/Src/PHackSettings.cpp:50
msgid "Load preset values from hack patterns available." msgid "Load preset values from hack patterns available."
msgstr "" msgstr "Carica valori preimpostati dai modelli hack disponibili."
#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:72 #: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:72
msgid "" msgid ""
@ -3040,6 +3054,8 @@ msgid ""
"Memory Card Manager WARNING-Make backups before using, should be fixed but " "Memory Card Manager WARNING-Make backups before using, should be fixed but "
"could mangle stuff!" "could mangle stuff!"
msgstr "" msgstr ""
"AVVISO Gestore Scheda di Memoria - Al fine di evitare l'accidentale perdita di dati,\n"
"eseguire una copia di sicurezza prima dell'uso!"
#: Source/Core/Core/Src/CoreParameter.cpp:348 #: Source/Core/Core/Src/CoreParameter.cpp:348
#, c-format #, c-format
@ -3444,7 +3460,7 @@ msgstr "Paragrafo"
#: Source/Core/DolphinWX/Src/PHackSettings.cpp:64 #: Source/Core/DolphinWX/Src/PHackSettings.cpp:64
msgid "Parameters" msgid "Parameters"
msgstr "" msgstr "Parametri"
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:214 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:214
#, c-format #, c-format
@ -3476,7 +3492,7 @@ msgstr "Prospettiva %d"
#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:210 #: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:210
msgid "Pixel Depth" msgid "Pixel Depth"
msgstr "Pixel Depth" msgstr "Profondità Pixel"
#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:209 #: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:209
msgid "Pixel Lighting" msgid "Pixel Lighting"
@ -3563,7 +3579,7 @@ msgstr "Effetti di Post-Processing:"
#: Source/Core/DolphinWX/Src/PHackSettings.cpp:48 #: Source/Core/DolphinWX/Src/PHackSettings.cpp:48
#, fuzzy #, fuzzy
msgid "Presets: " msgid "Presets: "
msgstr "<Premi Tasto>" msgstr "Preimpostazioni: "
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:206 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:206
msgid "Prev Page" msgid "Prev Page"
@ -3765,7 +3781,7 @@ msgstr "Accurata"
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:738 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:738
#, fuzzy #, fuzzy
msgid "Sample Rate:" msgid "Sample Rate:"
msgstr "Frequenza di Campionamento" msgstr "Frequenza di Campionamento:"
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:947 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:947
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:993 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:993
@ -3965,7 +3981,7 @@ msgstr ""
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:346
#, fuzzy #, fuzzy
msgid "Settings..." msgid "Settings..."
msgstr "Impostazioni IPL" msgstr "Impostazioni..."
#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:210 #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:210
msgid "SetupWiiMem: Cant find setting file" msgid "SetupWiiMem: Cant find setting file"
@ -4718,7 +4734,7 @@ msgstr "Video"
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:665
#, fuzzy #, fuzzy
msgid "Video Backend:" msgid "Video Backend:"
msgstr "Interfaccia Audio" msgstr "Interfaccia Video"
#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:370 #: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:370
msgid "Virtual" msgid "Virtual"
@ -4768,7 +4784,7 @@ msgid ""
"%s\n" "%s\n"
"Do you wish to continue?" "Do you wish to continue?"
msgstr "" msgstr ""
"Attenzione! Si consiglia di eseguire il backup di tutti i file nella " "Attenzione! Si consiglia di eseguire la copia di sicurezza di tutti i file nella "
"cartella:\n" "cartella:\n"
"%s\n" "%s\n"
"Vuoi proseguire?" "Vuoi proseguire?"
@ -5027,7 +5043,7 @@ msgstr "[ attesa ]"
#: Source/Core/DolphinWX/Src/PHackSettings.cpp:97 #: Source/Core/DolphinWX/Src/PHackSettings.cpp:97
msgid "[Custom]" msgid "[Custom]"
msgstr "" msgstr "[Personalizzata]"
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:526 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:526
msgid "^ ADD" msgid "^ ADD"
@ -5074,11 +5090,11 @@ msgstr "valore wxExecute ritornato -1 su applicazione in esecuzione!"
#: Source/Core/DolphinWX/Src/PHackSettings.cpp:56 #: Source/Core/DolphinWX/Src/PHackSettings.cpp:56
msgid "zFar Correction: " msgid "zFar Correction: "
msgstr "" msgstr "Correzione zFar: "
#: Source/Core/DolphinWX/Src/PHackSettings.cpp:51 #: Source/Core/DolphinWX/Src/PHackSettings.cpp:51
msgid "zNear Correction: " msgid "zNear Correction: "
msgstr "" msgstr "Correzione zNear: "
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511
msgid "| OR" msgid "| OR"
@ -5441,7 +5457,7 @@ msgstr "| OR"
#, fuzzy #, fuzzy
#~ msgid "Graphics Plugin" #~ msgid "Graphics Plugin"
#~ msgstr "Video" #~ msgstr "Plugin Video"
#~ msgid "" #~ msgid ""
#~ "If a game hangs, works only in the Interpreter or Dolphin crashes, this " #~ "If a game hangs, works only in the Interpreter or Dolphin crashes, this "

View File

@ -168,13 +168,18 @@ void CPUInfo::Detect()
if (cpu_id[2] & 2) cmp_legacy = true; //wtf is this? if (cpu_id[2] & 2) cmp_legacy = true; //wtf is this?
if ((cpu_id[3] >> 29) & 1) bLongMode = true; if ((cpu_id[3] >> 29) & 1) bLongMode = true;
} }
num_cores = logical_cpu_count;
if (max_ex_fn >= 0x80000008) { if (max_ex_fn >= 0x80000008) {
// Get number of cores. This is a bit complicated. Following AMD manual here. // Get number of cores. This is a bit complicated. Following AMD manual here.
__cpuid(cpu_id, 0x80000008); __cpuid(cpu_id, 0x80000008);
int apic_id_core_id_size = (cpu_id[2] >> 12) & 0xF; int apic_id_core_id_size = (cpu_id[2] >> 12) & 0xF;
if (apic_id_core_id_size == 0) { if (apic_id_core_id_size == 0) {
num_cores = logical_cpu_count;
if (ht) { if (ht) {
if (vendor == VENDOR_OTHER) {
num_cores = 1;
}
// New mechanism for modern Intel CPUs. // New mechanism for modern Intel CPUs.
if (HTT) { if (HTT) {
__cpuid(cpu_id, 0x00000004); __cpuid(cpu_id, 0x00000004);
@ -183,19 +188,13 @@ void CPUInfo::Detect()
num_cores = (cores_x_package > 1) ? cores_x_package : num_cores; num_cores = (cores_x_package > 1) ? cores_x_package : num_cores;
logical_cpu_count /= cores_x_package; logical_cpu_count /= cores_x_package;
} }
} } else {
else
{
num_cores = 1; num_cores = 1;
} }
} else { } else {
// Use AMD's new method. // Use AMD's new method.
num_cores = (cpu_id[2] & 0xFF) + 1; num_cores = (cpu_id[2] & 0xFF) + 1;
} }
} else {
// Wild guess
if (logical_cpu_count)
num_cores = logical_cpu_count;
} }
} }

View File

@ -664,7 +664,7 @@ void CConfigMain::CreateGUIControls()
svidbackend->Add(TEXT_BOX(DisplayPage, _("Video Backend:")), 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 5); svidbackend->Add(TEXT_BOX(DisplayPage, _("Video Backend:")), 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 5);
GraphicSelection = new wxChoice(DisplayPage, ID_GRAPHIC_CB, GraphicSelection = new wxChoice(DisplayPage, ID_GRAPHIC_CB,
wxDefaultPosition, wxDefaultSize, 0, NULL, 0, wxDefaultValidator); wxDefaultPosition, wxDefaultSize, 0, NULL, 0, wxDefaultValidator);
svidbackend->Add(GraphicSelection, 0, wxALIGN_CENTER_VERTICAL, 5); svidbackend->Add(GraphicSelection, 0, wxLEFT|wxBOTTOM|wxTOP, 5);
GraphicConfig = new wxButton(DisplayPage, ID_GRAPHIC_CONFIG, _("GFX Config"), GraphicConfig = new wxButton(DisplayPage, ID_GRAPHIC_CONFIG, _("GFX Config"),
wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT, wxDefaultValidator); wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT, wxDefaultValidator);
svidbackend->Add(GraphicConfig, 0, wxALIGN_CENTER_VERTICAL, 5); svidbackend->Add(GraphicConfig, 0, wxALIGN_CENTER_VERTICAL, 5);
@ -688,7 +688,7 @@ void CConfigMain::CreateGUIControls()
wxBoxSizer* sInterface = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* sInterface = new wxBoxSizer(wxHORIZONTAL);
sInterface->Add(TEXT_BOX(DisplayPage, _("Language:")), 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); sInterface->Add(TEXT_BOX(DisplayPage, _("Language:")), 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
sInterface->Add(InterfaceLang, 0, wxEXPAND | wxALL, 5); sInterface->Add(InterfaceLang, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
sInterface->AddStretchSpacer(); sInterface->AddStretchSpacer();
sInterface->Add(HotkeyConfig, 0, wxALIGN_RIGHT | wxALL, 5); sInterface->Add(HotkeyConfig, 0, wxALIGN_RIGHT | wxALL, 5);
sbInterface = new wxStaticBoxSizer(wxVERTICAL, DisplayPage, _("Interface Settings")); sbInterface = new wxStaticBoxSizer(wxVERTICAL, DisplayPage, _("Interface Settings"));
@ -727,18 +727,16 @@ void CConfigMain::CreateGUIControls()
sbAudioSettings->Add(EnableThrottle, 0, wxALL, 5); sbAudioSettings->Add(EnableThrottle, 0, wxALL, 5);
wxStaticBoxSizer *sbVolume = new wxStaticBoxSizer(wxVERTICAL, AudioPage, _("Volume")); wxStaticBoxSizer *sbVolume = new wxStaticBoxSizer(wxVERTICAL, AudioPage, _("Volume"));
sbVolume->Add(VolumeSlider, 1, wxLEFT|wxRIGHT|wxALIGN_CENTER, 6); sbVolume->Add(VolumeSlider, 1, wxLEFT|wxRIGHT, 13);
sbVolume->Add(VolumeText, 0, wxALL|wxALIGN_LEFT, 4); sbVolume->Add(VolumeText, 0, wxALIGN_CENTER|wxALL, 5);
wxBoxSizer *sBackendText = new wxBoxSizer(wxVERTICAL);
wxGridBagSizer *sBackend = new wxGridBagSizer(); wxGridBagSizer *sBackend = new wxGridBagSizer();
sBackendText->Add(TEXT_BOX(AudioPage, _("Audio Backend :")), 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); sBackend->Add(TEXT_BOX(AudioPage, _("Audio Backend:")), wxGBPosition(0, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5);
sBackend->Add(BackendSelection, wxGBPosition(0, 0), wxDefaultSpan, wxEXPAND|wxALL, 1); sBackend->Add(BackendSelection, wxGBPosition(0, 1), wxDefaultSpan, wxALL, 5);
sBackendText->Add(TEXT_BOX(AudioPage, _("Sample Rate :")), 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); sBackend->Add(TEXT_BOX(AudioPage, _("Sample Rate:")), wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5);
sBackend->Add(FrequencySelection, wxGBPosition(1, 0), wxDefaultSpan, wxEXPAND|wxALL, 1); sBackend->Add(FrequencySelection, wxGBPosition(1, 1), wxDefaultSpan, wxALL, 5);
wxStaticBoxSizer *sbBackend = new wxStaticBoxSizer(wxHORIZONTAL, AudioPage, _("Backend Settings")); wxStaticBoxSizer *sbBackend = new wxStaticBoxSizer(wxHORIZONTAL, AudioPage, _("Backend Settings"));
sbBackend->Add(sBackendText, 1, wxALL | wxEXPAND); sbBackend->Add(sBackend, 0, wxEXPAND);
sbBackend->Add(sBackend, 0, wxALL | wxEXPAND);
wxBoxSizer *sAudio = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *sAudio = new wxBoxSizer(wxHORIZONTAL);
sAudio->Add(sbAudioSettings, 1, wxEXPAND|wxALL, 5); sAudio->Add(sbAudioSettings, 1, wxEXPAND|wxALL, 5);
@ -792,7 +790,7 @@ void CConfigMain::CreateGUIControls()
{ {
sEXIDevices[i] = new wxBoxSizer(wxHORIZONTAL); sEXIDevices[i] = new wxBoxSizer(wxHORIZONTAL);
sEXIDevices[i]->Add(GCEXIDeviceText[i], 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); sEXIDevices[i]->Add(GCEXIDeviceText[i], 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
sEXIDevices[i]->Add(GCEXIDevice[i], 0, wxALL, 5); sEXIDevices[i]->Add(GCEXIDevice[i], 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
if (i < 2) if (i < 2)
sEXIDevices[i]->Add(GCMemcardPath[i], 0, wxALL, 5); sEXIDevices[i]->Add(GCMemcardPath[i], 0, wxALL, 5);
sbGamecubeDeviceSettings->Add(sEXIDevices[i]); sbGamecubeDeviceSettings->Add(sEXIDevices[i]);

View File

@ -360,15 +360,15 @@ void CISOProperties::CreateGUIControls(bool IsWad)
wxBoxSizer* sConfigPage; wxBoxSizer* sConfigPage;
sConfigPage = new wxBoxSizer(wxVERTICAL); sConfigPage = new wxBoxSizer(wxVERTICAL);
sbCoreOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Core")); sbCoreOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Core"));
sbCoreOverrides->Add(CPUThread, 0, wxEXPAND|wxLEFT, 5); sbCoreOverrides->Add(CPUThread, 0, wxLEFT, 5);
sbCoreOverrides->Add(SkipIdle, 0, wxEXPAND|wxLEFT, 5); sbCoreOverrides->Add(SkipIdle, 0, wxLEFT, 5);
sbCoreOverrides->Add(MMU, 0, wxEXPAND|wxLEFT, 5); sbCoreOverrides->Add(MMU, 0, wxLEFT, 5);
sbCoreOverrides->Add(MMUBAT, 0, wxEXPAND|wxLEFT, 5); sbCoreOverrides->Add(MMUBAT, 0, wxLEFT, 5);
sbCoreOverrides->Add(TLBHack, 0, wxEXPAND|wxLEFT, 5); sbCoreOverrides->Add(TLBHack, 0, wxLEFT, 5);
sbCoreOverrides->Add(VBeam, 0, wxEXPAND|wxLEFT, 5); sbCoreOverrides->Add(VBeam, 0, wxLEFT, 5);
sbCoreOverrides->Add(FastDiscSpeed, 0, wxEXPAND|wxLEFT, 5); sbCoreOverrides->Add(FastDiscSpeed, 0, wxLEFT, 5);
sbCoreOverrides->Add(BlockMerging, 0, wxEXPAND|wxLEFT, 5); sbCoreOverrides->Add(BlockMerging, 0, wxLEFT, 5);
sbCoreOverrides->Add(DSPHLE, 0, wxEXPAND|wxLEFT, 5); sbCoreOverrides->Add(DSPHLE, 0, wxLEFT, 5);
sbWiiOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Wii Console")); sbWiiOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Wii Console"));
if (!DiscIO::IsVolumeWiiDisc(OpenISO) && !DiscIO::IsVolumeWadFile(OpenISO)) if (!DiscIO::IsVolumeWiiDisc(OpenISO) && !DiscIO::IsVolumeWadFile(OpenISO))
@ -384,23 +384,23 @@ void CISOProperties::CreateGUIControls(bool IsWad)
// rather useless. // rather useless.
EnableProgressiveScan->Disable(); EnableProgressiveScan->Disable();
} }
sbWiiOverrides->Add(EnableProgressiveScan, 0, wxEXPAND|wxLEFT, 5); sbWiiOverrides->Add(EnableProgressiveScan, 0, wxLEFT, 5);
sbWiiOverrides->Add(EnableWideScreen, 0, wxEXPAND|wxLEFT, 5); sbWiiOverrides->Add(EnableWideScreen, 0, wxLEFT, 5);
sbVideoOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Video")); sbVideoOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Video"));
sbVideoOverrides->Add(ForceFiltering, 0, wxEXPAND|wxLEFT, 5); sbVideoOverrides->Add(ForceFiltering, 0, wxLEFT, 5);
sbVideoOverrides->Add(EFBCopyEnable, 0, wxEXPAND|wxLEFT, 5); sbVideoOverrides->Add(EFBCopyEnable, 0, wxLEFT, 5);
sbVideoOverrides->Add(EFBAccessEnable, 0, wxEXPAND|wxLEFT, 5); sbVideoOverrides->Add(EFBAccessEnable, 0, wxLEFT, 5);
sbVideoOverrides->Add(EFBToTextureEnable, 0, wxEXPAND|wxLEFT, 5); sbVideoOverrides->Add(EFBToTextureEnable, 0, wxLEFT, 5);
sbVideoOverrides->Add(SafeTextureCache, 0, wxEXPAND|wxLEFT, 5); sbVideoOverrides->Add(SafeTextureCache, 0, wxLEFT, 5);
sbVideoOverrides->Add(DstAlphaPass, 0, wxEXPAND|wxLEFT, 5); sbVideoOverrides->Add(DstAlphaPass, 0, wxLEFT, 5);
sbVideoOverrides->Add(UseXFB, 0, wxEXPAND|wxLEFT, 5); sbVideoOverrides->Add(UseXFB, 0, wxLEFT, 5);
sbVideoOverrides->Add(UseZTPSpeedupHack, 0, wxEXPAND|wxLEFT, 5); sbVideoOverrides->Add(UseZTPSpeedupHack, 0, wxLEFT, 5);
sbVideoOverrides->Add(DListCache, 0, wxEXPAND|wxLEFT, 5); sbVideoOverrides->Add(DListCache, 0, wxLEFT, 5);
szrPHackSettings->Add(PHackEnable, 0, wxEXPAND|wxLEFT, 5); szrPHackSettings->Add(PHackEnable, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5);
szrPHackSettings->Add(PHSettings, 0, wxLEFT, 5); szrPHackSettings->Add(PHSettings, 0, wxLEFT, 5);
sbVideoOverrides->Add(szrPHackSettings, 0, wxEXPAND);
sbVideoOverrides->Add(szrPHackSettings, 0, wxEXPAND);
sbGameConfig = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Game-Specific Settings")); sbGameConfig = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Game-Specific Settings"));
sbGameConfig->Add(OverrideText, 0, wxEXPAND|wxALL, 5); sbGameConfig->Add(OverrideText, 0, wxEXPAND|wxALL, 5);
sbGameConfig->Add(sbCoreOverrides, 0, wxEXPAND); sbGameConfig->Add(sbCoreOverrides, 0, wxEXPAND);

View File

@ -104,7 +104,7 @@ void CPHackSettings::LoadPHackData()
if (sTemp.empty()) if (sTemp.empty())
sTemp = wxString(_("(UNKNOWN)")).char_str(); sTemp = wxString(_("(UNKNOWN)")).char_str();
if (i == 0) if (i == 0)
PHackChoice->Append(wxString("-----------", *wxConvCurrent)); PHackChoice->Append(wxString("-------------", *wxConvCurrent));
PHackChoice->Append(wxString(sTemp.c_str(), *wxConvCurrent)); PHackChoice->Append(wxString(sTemp.c_str(), *wxConvCurrent));
} }
PHackChoice->Select(0); PHackChoice->Select(0);