* Removed PS3 Controller support

* Added a check on WiiU aspect ratio setting in features menu
* Updated French and Spanish language file
This commit is contained in:
Cyan 2015-01-19 22:51:50 +00:00
parent db6517256e
commit 02f708f4d0
11 changed files with 143 additions and 376 deletions

View File

@ -2,8 +2,8 @@
<app version="1"> <app version="1">
<name> USB Loader GX</name> <name> USB Loader GX</name>
<coder>USB Loader GX Team</coder> <coder>USB Loader GX Team</coder>
<version>3.0 r1235</version> <version>3.0 r1238</version>
<release_date>20150104200036</release_date> <release_date>20150119224319</release_date>
<!-- // remove this line to enable arguments <!-- // remove this line to enable arguments
<arguments> <arguments>
<arg>--ios=250</arg> <arg>--ios=250</arg>

View File

@ -2229,7 +2229,7 @@ msgid "What to extract from NAND?"
msgstr "Que voulez-vous extraire de la NAND ?" msgstr "Que voulez-vous extraire de la NAND ?"
msgid "Where do you want MCEmu to be located?" msgid "Where do you want MCEmu to be located?"
msgstr "" msgstr "Quel emplacement utiliser pour la sauvegarde ?"
msgid "Where should the game be installed to?" msgid "Where should the game be installed to?"
msgstr "Où installer ce jeu ?" msgstr "Où installer ce jeu ?"

View File

@ -1,5 +1,5 @@
# USB Loader GX language source file. # USB Loader GX language source file.
# spanish.lang - r1148 # spanish.lang - r1235
# don't delete/change this line (é). # don't delete/change this line (é).
msgid "" msgid ""
msgstr "" msgstr ""
@ -33,23 +33,23 @@ msgstr "Faltan %i archivos"
#, c-format #, c-format
msgid "%s only accepts GameCube backups in ISO format." msgid "%s only accepts GameCube backups in ISO format."
msgstr "" msgstr "%s sólo acepta juegos de GameCube en formato ISO."
#, c-format #, c-format
msgid "%s requires AHB access! Please launch USBLoaderGX from HBC or from an updated channel or forwarder." msgid "%s requires AHB access! Please launch USBLoaderGX from HBC or from an updated channel or forwarder."
msgstr "" msgstr "¡%s requiere acceso AHB! Actualiza tu canal/forwarder o inicia el programa desde el Canal Homebrew."
msgid "--== Devolution" msgid "--== Devolution"
msgstr "" msgstr "-- Devolution"
msgid "--== Nintendont" msgid "--== Nintendont"
msgstr "" msgstr "-- Nintendont"
msgid "--== DIOS MIOS (Lite) " msgid "--== DIOS MIOS (Lite) "
msgstr "" msgstr "-- DIOS MIOS (Lite) "
msgid "--== DM(L) + Nintendont" msgid "--== DM(L) + Nintendont"
msgstr "" msgstr "-- DM(L)/Nintendont "
msgid "0 (Everyone)" msgid "0 (Everyone)"
msgstr "0 (Todos)" msgstr "0 (Todos)"
@ -94,10 +94,10 @@ msgid "5 min"
msgstr "5 min." msgstr "5 min."
msgid "=== GameCube Settings" msgid "=== GameCube Settings"
msgstr "" msgstr "== GameCube"
msgid "AUTO" msgid "AUTO"
msgstr "" msgstr "Automático"
msgid "AXNextFrame" msgid "AXNextFrame"
msgstr "" msgstr ""
@ -157,7 +157,7 @@ msgid "Are you sure you want to import game categories from GameTDB?"
msgstr "¿Quieres importar las categorías de juegos de GameTDB?" msgstr "¿Quieres importar las categorías de juegos de GameTDB?"
msgid "Are you sure you want to install on SD?" msgid "Are you sure you want to install on SD?"
msgstr "" msgstr "¿Quieres instalar en la SD?"
msgid "Are you sure you want to lock USB Loader GX?" msgid "Are you sure you want to lock USB Loader GX?"
msgstr "¿Quieres bloquear USB Loader GX?" msgstr "¿Quieres bloquear USB Loader GX?"
@ -184,10 +184,10 @@ msgid "Author(s):"
msgstr "Autor(es):" msgstr "Autor(es):"
msgid "Auto" msgid "Auto"
msgstr "" msgstr "Automático"
msgid "Auto Boot" msgid "Auto Boot"
msgstr "" msgstr "Autoarranque"
msgid "AutoInit Network" msgid "AutoInit Network"
msgstr "Auto Iniciar la Red" msgstr "Auto Iniciar la Red"
@ -211,7 +211,7 @@ msgid "Banner Animation Settings"
msgstr "Opciones de Animación Banner" msgstr "Opciones de Animación Banner"
msgid "Banner On Channels" msgid "Banner On Channels"
msgstr "" msgstr "Banner en canales"
msgid "Banner grid layout is only available with AHBPROT! Please consider installing new HBC version." msgid "Banner grid layout is only available with AHBPROT! Please consider installing new HBC version."
msgstr "El modo de vista Banner solo esta disponible con AHBPROT! instala una versión actual de HBC." msgstr "El modo de vista Banner solo esta disponible con AHBPROT! instala una versión actual de HBC."
@ -384,7 +384,7 @@ msgid "Clock"
msgstr "Reloj" msgstr "Reloj"
msgid "Clock Scale Factor" msgid "Clock Scale Factor"
msgstr "" msgstr "Escala reloj"
msgid "Close" msgid "Close"
msgstr "Salir" msgstr "Salir"
@ -406,7 +406,7 @@ msgid "Console"
msgstr "Consola" msgstr "Consola"
msgid "Console Default" msgid "Console Default"
msgstr "Pred. Consola" msgstr "Consola"
msgid "Console Locked" msgid "Console Locked"
msgstr "Consola Bloqueada" msgstr "Consola Bloqueada"
@ -497,28 +497,28 @@ msgid "Cover Download"
msgstr "Descarga de Carátulas" msgstr "Descarga de Carátulas"
msgid "Create" msgid "Create"
msgstr "Crear" msgstr "Crear/reemplazar"
msgid "Credits" msgid "Credits"
msgstr "Créditos" msgstr "Créditos"
msgid "Crop Overscan" msgid "Crop Overscan"
msgstr "" msgstr "Recortar overscan"
msgid "Custom Banners" msgid "Custom Banners"
msgstr "" msgstr "Banners personalizados"
msgid "Custom Paths" msgid "Custom Paths"
msgstr "Personalizar Rutas" msgstr "Rutas personalizadas"
msgid "Customs" msgid "Customs"
msgstr "" msgstr "Personalizadas"
msgid "Customs/Original" msgid "Customs/Original"
msgstr "Artísticas/Originales" msgstr "Personalizadas/originales"
msgid "D Buttons" msgid "D Buttons"
msgstr "" msgstr "Botones del pad"
msgid "DOL Path" msgid "DOL Path"
msgstr "Ruta del DOL" msgstr "Ruta del DOL"
@ -539,16 +539,16 @@ msgid "Default"
msgstr "Predeterminado" msgstr "Predeterminado"
msgid "Default Gamesettings" msgid "Default Gamesettings"
msgstr "Configuracion Predeterminada del Juego" msgstr "Restaurar configuración"
msgid "Default Settings" msgid "Default Settings"
msgstr "Configuración Predeterminada" msgstr "Restaurar configuración"
msgid "Delete" msgid "Delete"
msgstr "Borrar" msgstr "Borrar"
msgid "Delete Cached Banner" msgid "Delete Cached Banner"
msgstr "" msgstr "Borrar banner en caché"
msgid "Delete Cheat GCT" msgid "Delete Cheat GCT"
msgstr "Borrar Trucos GCT" msgstr "Borrar Trucos GCT"
@ -566,7 +566,7 @@ msgid "Delete category"
msgstr "Borrar categoría" msgstr "Borrar categoría"
msgid "Deleting directories..." msgid "Deleting directories..."
msgstr "Borrando directorios" msgstr "Borrando directorios..."
msgid "Deleting files..." msgid "Deleting files..."
msgstr "Borrando archivos" msgstr "Borrando archivos"
@ -587,19 +587,19 @@ msgid "Devolution"
msgstr "" msgstr ""
msgid "Devolution Loader Path" msgid "Devolution Loader Path"
msgstr "" msgstr "Ubicación de Devolution"
msgid "Devolution's loader.bin file can't be loaded." msgid "Devolution's loader.bin file can't be loaded."
msgstr "" msgstr "No se puede cargar el loader.bin de Devolution."
msgid "Directory does not exist!" msgid "Directory does not exist!"
msgstr "¡La carpeta no existe!" msgstr "¡La carpeta no existe!"
msgid "Disc 1" msgid "Disc 1"
msgstr "" msgstr "Disco 1"
msgid "Disc 2" msgid "Disc 2"
msgstr "" msgstr "Disco 2"
msgid "Disc Artwork Download" msgid "Disc Artwork Download"
msgstr "Imagenes de Discos" msgstr "Imagenes de Discos"
@ -608,22 +608,22 @@ msgid "Disc Artwork Path"
msgstr "Ruta Imagenes Discos" msgstr "Ruta Imagenes Discos"
msgid "Disc Default" msgid "Disc Default"
msgstr "Pred. Disco" msgstr "Disco"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "Detectado Disco Insertado" msgstr "Detectado Disco Insertado"
msgid "Disc Read Delay" msgid "Disc Read Delay"
msgstr "" msgstr "Delay lectura disco"
msgid "Disc read error." msgid "Disc read error."
msgstr "Error de lectura del disco." msgstr "Error de lectura del disco."
msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
msgstr "" msgstr "DM(L) v2.6+ necesita el disco 2 en formato original (sin compresión), ¿estás seguro que deseas instalarlo en formato comprimido?"
msgid "Discarts" msgid "Discarts"
msgstr "" msgstr "Discos"
msgid "DiskFlip" msgid "DiskFlip"
msgstr "GiraDiscos" msgstr "GiraDiscos"
@ -635,7 +635,7 @@ msgid "Display as a carousel"
msgstr "Mostrar en carrusel" msgstr "Mostrar en carrusel"
msgid "Display as a channel grid" msgid "Display as a channel grid"
msgstr "Mostrar en rejilla de canales" msgstr "Mostrar en canales"
msgid "Display as a grid" msgid "Display as a grid"
msgstr "Mostrar en rejilla" msgstr "Mostrar en rejilla"
@ -698,13 +698,13 @@ msgid "Do you want to sync free space info sector on all FAT32 partitions?"
msgstr "¿Quieres sincronizar el sector de información de espacio libre en todas las particiones FAT32?" msgstr "¿Quieres sincronizar el sector de información de espacio libre en todas las particiones FAT32?"
msgid "Do you want to update this file?" msgid "Do you want to update this file?"
msgstr "" msgstr "¿Quieres actualizar este archivo?"
msgid "Do you wish to update/download all language files?" msgid "Do you wish to update/download all language files?"
msgstr "¿Quieres actualizar/descargar todos los archivos de idiomas?" msgstr "¿Quieres actualizar/descargar todos los archivos de idiomas?"
msgid "Dol Video Patch" msgid "Dol Video Patch"
msgstr "" msgstr "Parche vídeo DOL"
msgid "Download" msgid "Download"
msgstr "Descargar" msgstr "Descargar"
@ -719,7 +719,7 @@ msgid "Downloading 3D Covers"
msgstr "Descargando Carátulas 3D" msgstr "Descargando Carátulas 3D"
msgid "Downloading Custom Banners" msgid "Downloading Custom Banners"
msgstr "" msgstr "Descargando banners personalizados"
msgid "Downloading Flat Covers" msgid "Downloading Flat Covers"
msgstr "Descargando Carátulas 2D" msgstr "Descargando Carátulas 2D"
@ -847,7 +847,7 @@ msgid "Extract SYSCONF to the Emu NAND?"
msgstr "¿Extraer SYSCONF a la EmuNand?" msgstr "¿Extraer SYSCONF a la EmuNand?"
msgid "Extract Save to EmuNand" msgid "Extract Save to EmuNand"
msgstr "Extraer partida a Nand emuada" msgstr "Extraer partida a Nand emulada"
msgid "Extracting file:" msgid "Extracting file:"
msgstr "Extrayendo archivo:" msgstr "Extrayendo archivo:"
@ -932,7 +932,7 @@ msgid "Flip-X"
msgstr "Animación Menú Disco" msgstr "Animación Menú Disco"
msgid "Font Scale Factor" msgid "Font Scale Factor"
msgstr "Escalado de Fuente" msgstr "Escala textos"
msgid "Force 16:9" msgid "Force 16:9"
msgstr "Forzar 16:9" msgstr "Forzar 16:9"
@ -959,7 +959,7 @@ msgid "Force Titles from Disc"
msgstr "Forzar titulos del disco" msgstr "Forzar titulos del disco"
msgid "Force Widescreen" msgid "Force Widescreen"
msgstr "" msgstr "Forzar 16:9"
msgid "Format" msgid "Format"
msgstr "Formateo" msgstr "Formateo"
@ -1001,13 +1001,13 @@ msgid "Full Cover Path"
msgstr "Ruta Carátulas Comp." msgstr "Ruta Carátulas Comp."
msgid "Full Covers" msgid "Full Covers"
msgstr "" msgstr "Carátulas comp."
msgid "Full Menu" msgid "Full Menu"
msgstr "Completo" msgstr "Completo"
msgid "Full covers Download" msgid "Full covers Download"
msgstr "" msgstr "Descargar carátulas comp."
msgid "Full shutdown" msgid "Full shutdown"
msgstr "Apagado completo" msgstr "Apagado completo"
@ -1088,7 +1088,7 @@ msgid "Game is already installed:"
msgstr "El juego ya estaba instalado:" msgstr "El juego ya estaba instalado:"
msgid "Game's IOS" msgid "Game's IOS"
msgstr "" msgstr "IOS del juego"
msgid "Game/Install Partition" msgid "Game/Install Partition"
msgstr "Partición de Juegos" msgstr "Partición de Juegos"
@ -1097,19 +1097,19 @@ msgid "GameCube"
msgstr "" msgstr ""
msgid "GameCube Controller" msgid "GameCube Controller"
msgstr "" msgstr "Cantidad de mandos"
msgid "GameCube Mode" msgid "GameCube Mode"
msgstr "" msgstr "Modo GameCube"
msgid "GameCube Source" msgid "GameCube Source"
msgstr "" msgstr "Origen GameCube"
msgid "GameTDB Path" msgid "GameTDB Path"
msgstr "Ruta GameDTB" msgstr "Ruta GameDTB"
msgid "Gamename [GAMEID]" msgid "Gamename [GAMEID]"
msgstr "NombreDelJuego [IDdelJuego]" msgstr "Nombrejuego [IDJUEGO]"
msgid "Games" msgid "Games"
msgstr "Juegos" msgstr "Juegos"
@ -1142,16 +1142,16 @@ msgid "Hard Drive Settings"
msgstr "Configuración del Disco Duro" msgstr "Configuración del Disco Duro"
msgid "High Quality" msgid "High Quality"
msgstr "" msgstr "Alta calidad"
msgid "High/Low" msgid "High/Low"
msgstr "" msgstr "Alta/baja"
msgid "Homebrew Apps Path" msgid "Homebrew Apps Path"
msgstr "Ruta Apps Homebrew" msgstr "Ruta Apps Homebrew"
msgid "Homebrew Channel" msgid "Homebrew Channel"
msgstr "" msgstr "Canal Homebrew"
msgid "Homebrew Launcher" msgid "Homebrew Launcher"
msgstr "Ejecutar Homebrew" msgstr "Ejecutar Homebrew"
@ -1186,7 +1186,7 @@ msgid "Incoming file %0.2fMB"
msgstr "Archivo recibido %0.2fMB" msgstr "Archivo recibido %0.2fMB"
msgid "Individual" msgid "Individual"
msgstr "" msgstr "1 por juego"
msgid "Initializing Network" msgid "Initializing Network"
msgstr "Iniciando la Red" msgstr "Iniciando la Red"
@ -1252,7 +1252,7 @@ msgid "Japanese"
msgstr "Japonés" msgstr "Japonés"
msgid "Japanese Patch" msgid "Japanese Patch"
msgstr "" msgstr "Parche japonés"
msgid "Joypad" msgid "Joypad"
msgstr "" msgstr ""
@ -1273,7 +1273,7 @@ msgid "Korean"
msgstr "Coreano" msgstr "Coreano"
msgid "LED Activity" msgid "LED Activity"
msgstr "" msgstr "Iluminar lector"
msgid "Language Files" msgid "Language Files"
msgstr "Archivos de idioma" msgstr "Archivos de idioma"
@ -1288,7 +1288,7 @@ msgid "Languagepath changed."
msgstr "Ruta de idioma cambiada." msgstr "Ruta de idioma cambiada."
msgid "Launching Wii games with emulated nand only works on d2x cIOS! Change game IOS to a d2x cIOS first." msgid "Launching Wii games with emulated nand only works on d2x cIOS! Change game IOS to a d2x cIOS first."
msgstr "" msgstr "¡Cargar juegos de Wii de una nand emulada sólo funciona con un cIOS d2x!"
msgid "Launching emulated nand channels only works on d2x cIOS! Change game IOS to a d2x cIOS first." msgid "Launching emulated nand channels only works on d2x cIOS! Change game IOS to a d2x cIOS first."
msgstr "La carga de canales de Nand emuada solo funciona con cIOS d2x, cambia el IOS del juego a d2x primero" msgstr "La carga de canales de Nand emuada solo funciona con cIOS d2x, cambia el IOS del juego a d2x primero"
@ -1319,7 +1319,7 @@ msgid "Loader Settings"
msgstr "Configuración del Cargador" msgstr "Configuración del Cargador"
msgid "Loader's IOS" msgid "Loader's IOS"
msgstr "" msgstr "IOS del cargador"
msgid "Loading standard language." msgid "Loading standard language."
msgstr "Cargando idioma estándar." msgstr "Cargando idioma estándar."
@ -1337,7 +1337,7 @@ msgid "Locked"
msgstr "Bloqueada" msgstr "Bloqueada"
msgid "Log to file" msgid "Log to file"
msgstr "" msgstr "Guardar registro"
msgid "Loop Directory" msgid "Loop Directory"
msgstr "Carpeta de bucle" msgstr "Carpeta de bucle"
@ -1349,13 +1349,13 @@ msgid "Loop Sound"
msgstr "Bucle de sonido" msgstr "Bucle de sonido"
msgid "Low Quality" msgid "Low Quality"
msgstr "" msgstr "Baja calidad"
msgid "Low/High" msgid "Low/High"
msgstr "" msgstr "Baja/alta"
msgid "MIOS (Default & Customs)" msgid "MIOS (Default & Customs)"
msgstr "" msgstr "MIOS (Original y modificados)"
msgid "Main DOL" msgid "Main DOL"
msgstr "DOL Principal" msgstr "DOL Principal"
@ -1379,13 +1379,13 @@ msgid "May"
msgstr "" msgstr ""
msgid "Memory Card Blocks Size" msgid "Memory Card Blocks Size"
msgstr "" msgstr "Bloques Memory Card"
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "" msgstr "Emular Memory Card"
msgid "Memory Card with 2043 blocs has issues with Nintendont. Use at your own risk." msgid "Memory Card with 2043 blocs has issues with Nintendont. Use at your own risk."
msgstr "" msgstr "Las Memory Card de 2043 bloques traen problemas al usarlas con Nintendont."
msgid "Messageboard Update" msgid "Messageboard Update"
msgstr "Actualizar Tablón Wii" msgstr "Actualizar Tablón Wii"
@ -1397,7 +1397,7 @@ msgid "Mount DVD drive"
msgstr "Montar unidad DVD" msgstr "Montar unidad DVD"
msgid "Mount USB at launch" msgid "Mount USB at launch"
msgstr "" msgstr "Montar USB al inicio"
msgid "Multiple Partitions" msgid "Multiple Partitions"
msgstr "Múltiples Particiones" msgstr "Múltiples Particiones"
@ -1409,19 +1409,19 @@ msgid "Music Volume"
msgstr "Volumen de la Música" msgstr "Volumen de la Música"
msgid "NMM Mode" msgid "NMM Mode"
msgstr "" msgstr "Modo NMM"
msgid "Nand Chan. Emulation" msgid "Nand Chan. Emulation"
msgstr "Emul. canales Nand" msgstr "Emular canales Nand"
msgid "Nand Channels" msgid "Nand Channels"
msgstr "Canales en Nand" msgstr "Canales en Nand"
msgid "Nand Emu Channel Path" msgid "Nand Emu Channel Path"
msgstr "Ruta emul. canales Nand" msgstr "Ruta canales Nand emulada"
msgid "Nand Emu Path" msgid "Nand Emu Path"
msgstr "Ruta Emul. Nand" msgstr "Ruta Nand emulada"
msgid "Nand Emulation" msgid "Nand Emulation"
msgstr "Emulación Nand" msgstr "Emulación Nand"
@ -1433,10 +1433,10 @@ msgid "Nand Emulation only works on FAT/FAT32 partitions!"
msgstr "¡La emulación Nand solo funciona en particiones FAT/FAT32!" msgstr "¡La emulación Nand solo funciona en particiones FAT/FAT32!"
msgid "Nand Saves Emulation" msgid "Nand Saves Emulation"
msgstr "Emul. partidas Nand" msgstr "Emular partidas Nand"
msgid "Native Controller" msgid "Native Controller"
msgstr "" msgstr "Sólo mandos nativos"
msgid "Neither" msgid "Neither"
msgstr "Ninguno" msgstr "Ninguno"
@ -1451,7 +1451,7 @@ msgid "Nintendont"
msgstr "" msgstr ""
msgid "Nintendont Loader Path" msgid "Nintendont Loader Path"
msgstr "" msgstr "Ruta de Nintendont"
msgid "No" msgid "No"
msgstr "" msgstr ""
@ -1478,7 +1478,7 @@ msgid "No Wiinnertag.xml found in the config path. Do you want an example file c
msgstr "No se encontró el archivo Wiinnertag.xml. ¿Quieres crear un archivo de ejemplo?" msgstr "No se encontró el archivo Wiinnertag.xml. ¿Quieres crear un archivo de ejemplo?"
msgid "No change" msgid "No change"
msgstr "" msgstr "Sin cambios"
msgid "No cheats were selected! Should the GCT file be deleted?" msgid "No cheats were selected! Should the GCT file be deleted?"
msgstr "No hay trucos seleccionados, ¿debe ser borrado el archivo GCT?" msgstr "No hay trucos seleccionados, ¿debe ser borrado el archivo GCT?"
@ -1511,7 +1511,7 @@ msgid "No themes found."
msgstr "Ningún tema encontrado." msgstr "Ningún tema encontrado."
msgid "NoSSL only" msgid "NoSSL only"
msgstr "" msgstr "Sólo NoSSL"
msgid "None" msgid "None"
msgstr "Ninguno" msgstr "Ninguno"
@ -1574,7 +1574,7 @@ msgid "ON"
msgstr "Activado" msgstr "Activado"
msgid "ON (Multi)" msgid "ON (Multi)"
msgstr "" msgstr "1 global"
msgid "OSReport" msgid "OSReport"
msgstr "" msgstr ""
@ -1592,7 +1592,7 @@ msgid "Official Site:"
msgstr "Página Oficial:" msgstr "Página Oficial:"
msgid "Offset" msgid "Offset"
msgstr "" msgstr "Desfasaje"
msgid "Ok" msgid "Ok"
msgstr "" msgstr ""
@ -1643,7 +1643,7 @@ msgid "Pick from a list"
msgstr "Elegir de una lista" msgstr "Elegir de una lista"
msgid "Pixels" msgid "Pixels"
msgstr "" msgstr "Píxeles"
msgid "Play Count" msgid "Play Count"
msgstr "Partidas" msgstr "Partidas"
@ -1661,7 +1661,7 @@ msgid "Playing Music:"
msgstr "Reproducción Musical:" msgstr "Reproducción Musical:"
msgid "Please wait" msgid "Please wait"
msgstr "" msgstr "Por favor, espera"
msgid "Please wait..." msgid "Please wait..."
msgstr "Por favor, espera..." msgstr "Por favor, espera..."
@ -1673,13 +1673,13 @@ msgid "Prev"
msgstr "Ant." msgstr "Ant."
msgid "Private Server" msgid "Private Server"
msgstr "" msgstr "Servidor privado"
msgid "Process finished." msgid "Process finished."
msgstr "Proceso terminado" msgstr "Proceso terminado"
msgid "Progressive Patch" msgid "Progressive Patch"
msgstr "" msgstr "Forzar progresivo"
msgid "Prompts Buttons" msgid "Prompts Buttons"
msgstr "Botones" msgstr "Botones"
@ -1700,7 +1700,7 @@ msgid "Receiving file from:"
msgstr "Recibir archivo desde:" msgstr "Recibir archivo desde:"
msgid "Region Patch" msgid "Region Patch"
msgstr "Parche de Región" msgstr "Parche región"
msgid "Released" msgid "Released"
msgstr "Comercializado el" msgstr "Comercializado el"
@ -1718,7 +1718,7 @@ msgid "Remove update"
msgstr "Quitar actualización" msgstr "Quitar actualización"
msgid "Rename Game Title" msgid "Rename Game Title"
msgstr "" msgstr "Renombrar juego"
msgid "Rename category" msgid "Rename category"
msgstr "Renombrar categoría" msgstr "Renombrar categoría"
@ -1751,7 +1751,7 @@ msgid "Right"
msgstr "Derecha" msgstr "Derecha"
msgid "Rotating Disc" msgid "Rotating Disc"
msgstr "" msgstr "Disco girando"
msgid "Rumble" msgid "Rumble"
msgstr "Vibración" msgstr "Vibración"
@ -1799,7 +1799,7 @@ msgid "Screensaver"
msgstr "Salvapantallas" msgstr "Salvapantallas"
msgid "Screenshot" msgid "Screenshot"
msgstr "" msgstr "Captura de pantalla"
msgid "Select" msgid "Select"
msgstr "Seleccionar" msgstr "Seleccionar"
@ -1832,7 +1832,7 @@ msgid "Settings"
msgstr "Configuración" msgstr "Configuración"
msgid "Settings File" msgid "Settings File"
msgstr "" msgstr "Configuración"
msgid "Show Categories" msgid "Show Categories"
msgstr "Mostrar Categorías" msgstr "Mostrar Categorías"
@ -1847,16 +1847,16 @@ msgid "Show SD"
msgstr "Mostrar SD" msgstr "Mostrar SD"
msgid "Shutdown System" msgid "Shutdown System"
msgstr "Apagar Sistema" msgstr "Apagar consola"
msgid "Shutdown Wii" msgid "Shutdown Wii"
msgstr "Apagar Wii" msgstr "Apagar la Wii"
msgid "Skip Errors" msgid "Skip Errors"
msgstr "Saltar errores" msgstr "Saltar errores"
msgid "Sneek Video Patch" msgid "Sneek Video Patch"
msgstr "Parche Vídeo Sneek" msgstr "Parche vídeo Sneek"
msgid "Sort alphabetically" msgid "Sort alphabetically"
msgstr "Ordenar alfabéticamente" msgstr "Ordenar alfabéticamente"
@ -1898,7 +1898,7 @@ msgid "Standby"
msgstr "En espera" msgstr "En espera"
msgid "Start" msgid "Start"
msgstr "Iniciar" msgstr "Comenzar"
msgid "Success" msgid "Success"
msgstr "Conseguido" msgstr "Conseguido"
@ -1940,10 +1940,10 @@ msgid "Synchronizing..."
msgstr "Sincronizando..." msgstr "Sincronizando..."
msgid "System Default" msgid "System Default"
msgstr "Sistema" msgstr "Consola"
msgid "TChinese" msgid "TChinese"
msgstr "Chino T." msgstr "Chino Tradicional"
msgid "TXT Cheatcodes Path" msgid "TXT Cheatcodes Path"
msgstr "Ruta de Trucos TXT" msgstr "Ruta de Trucos TXT"
@ -1952,13 +1952,13 @@ msgid "The .them file was not found in the zip."
msgstr "El archivo .them no se encontró en el zip." msgstr "El archivo .them no se encontró en el zip."
msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored." msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."
msgstr "" msgstr "El forzado 16:9 requiere DIOS MIOS 2.1 o superior."
msgid "The Miis will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten." msgid "The Miis will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
msgstr "Los miis serán extraidos a la ruta de tu EmuNand y Canales de EmuNand. Atención: todos los archivos existentes serán sobreescritos." msgstr "Los miis serán extraidos a la ruta de tu EmuNand y Canales de EmuNand. Atención: todos los archivos existentes serán sobreescritos."
msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2. This setting will be ignored." msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2. This setting will be ignored."
msgstr "" msgstr "El ajuste No Disc+ requiere DIOS MIOS 2.2 update2."
msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten." msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
msgstr "El archivo SYSCONF será extraido a la ruta de tu EmuNand y Canales de EmuNand. Atención: todos los archivos existentes serán sobreescritos" msgstr "El archivo SYSCONF será extraido a la ruta de tu EmuNand y Canales de EmuNand. Atención: todos los archivos existentes serán sobreescritos"
@ -1973,7 +1973,7 @@ msgid "The files will be extracted to your emu nand save and channel path. Atten
msgstr "Los archivos sera extraidos a tu ruta de EmuNand y partidas de EmuNand. Atención: todos los archivos existentes serán seleccionados." msgstr "Los archivos sera extraidos a tu ruta de EmuNand y partidas de EmuNand. Atención: todos los archivos existentes serán seleccionados."
msgid "The game is on SD Card." msgid "The game is on SD Card."
msgstr "" msgstr "El juego está en la SD."
msgid "The game is on USB." msgid "The game is on USB."
msgstr "El juego esta en el USB." msgstr "El juego esta en el USB."
@ -2013,22 +2013,22 @@ msgid "This IOS was not found on the titles list. If you are sure you have it in
msgstr "No se encontró este IOS en la lista de títulos. Si estás seguro de que lo tienes instalado, ignora esta advertencia." msgstr "No se encontró este IOS en la lista de títulos. Si estás seguro de que lo tienes instalado, ignora esta advertencia."
msgid "This Nintendont version does not support games on USB." msgid "This Nintendont version does not support games on USB."
msgstr "" msgstr "Esta versión de Nintendont no soporta juegos en USB."
msgid "This Nintendont version is not correctly supported. Auto boot disabled." msgid "This Nintendont version is not correctly supported. Auto boot disabled."
msgstr "" msgstr "Esta versión de Nintendont no es soportada. El autoarranque será desactivado."
msgid "This game has multiple discs. Please select the disc to launch." msgid "This game has multiple discs. Please select the disc to launch."
msgstr "" msgstr "Este juego posee varios discos. Por favor, elige el que deseas cargar."
msgid "This path must be on SD!" msgid "This path must be on SD!"
msgstr "¡Esta ruta debe ser en la tarjeta SD!" msgstr "¡Esta ruta debe ser en la SD!"
msgid "Time left:" msgid "Time left:"
msgstr "Quedan:" msgstr "Quedan:"
msgid "Timer Fix" msgid "Timer Fix"
msgstr "" msgstr "Corrección del timer"
msgid "Title Launcher" msgid "Title Launcher"
msgstr "Lanzador de Canales" msgstr "Lanzador de Canales"
@ -2037,48 +2037,48 @@ msgid "Titles from GameTDB"
msgstr "Titulos de GameTDB" msgstr "Titulos de GameTDB"
msgid "To run GameCube games from Disc you need to set the GameCube mode to MIOS in the game settings." msgid "To run GameCube games from Disc you need to set the GameCube mode to MIOS in the game settings."
msgstr "" msgstr "Para cargar juegos de GameCube desde la lectora debes configurar el modo GameCube a MIOS."
#, c-format #, c-format
msgid "To run GameCube games with %s you need to place them on an USB FAT32 partition." msgid "To run GameCube games with %s you need to place them on an USB FAT32 partition."
msgstr "" msgstr "Para cargar juegos de GameCube con %s debes ponerlos en un USB con formato FAT32."
#, c-format #, c-format
msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition." msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
msgstr "" msgstr "Para cargar juegos de GameCube con %s debes configurar tu Ruta GameCube principal en una partición primaria."
#, c-format #, c-format
msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive." msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on the first partition of the Hard Drive."
msgstr "" msgstr "Para cargar juegos de GameCube con %s debes configurar tu Ruta GameCube principal en la primer partición del USB."
#, c-format #, c-format
msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' to an USB FAT32 partition." msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' to an USB FAT32 partition."
msgstr "" msgstr "Para cargar juegos de GameCube con %s debes configurar tu Ruta GameCube principal en un USB con formato FAT32."
#, c-format #, c-format
msgid "To run GameCube games with %s you need to use a 512 bytes/sector Hard Drive." msgid "To run GameCube games with %s you need to use a 512 bytes/sector Hard Drive."
msgstr "" msgstr "Para cargar juegos de GameCube con %s debes usar una partición con 512 bytes por sector."
#, c-format #, c-format
msgid "To run GameCube games with %s you need to use a partition with 32k bytes/cluster or less." msgid "To run GameCube games with %s you need to use a partition with 32k bytes/cluster or less."
msgstr "" msgstr "Para cargar juegos de GameCube con %s debes usar una partición con 32KB o menos por sector."
msgid "To run GameCube games with Devolution you need the loader.bin file in your Devolution Loader Path." msgid "To run GameCube games with Devolution you need the loader.bin file in your Devolution Loader Path."
msgstr "" msgstr "Para cargar juegos de GameCube con Devolution debes tener el loader.bin en la Ruta de Devolution."
msgid "To run GameCube games with Nintendont you need the boot.dol file in your Nintendont Loader Path." msgid "To run GameCube games with Nintendont you need the boot.dol file in your Nintendont Loader Path."
msgstr "" msgstr "Para cargar juegos de GameCube con Nintendont debes tener el boot.dol en la Ruta de Nintendont."
#, c-format #, c-format
msgid "To use HID with %s you need the %s file." msgid "To use HID with %s you need the %s file."
msgstr "" msgstr "Para usar HID con %s necesitas el archivo %s."
#, c-format #, c-format
msgid "To use ocarina with %s you need the %s file." msgid "To use ocarina with %s you need the %s file."
msgstr "" msgstr "Para usar ocarina con %s necesitas el archivo %s."
msgid "Tooltip Delay" msgid "Tooltip Delay"
msgstr "Retraso de ayuda rapida" msgstr "Retraso de ayuda rápida"
msgid "Tooltips" msgid "Tooltips"
msgstr "Descripción" msgstr "Descripción"
@ -2090,7 +2090,7 @@ msgid "USB"
msgstr "" msgstr ""
msgid "USB Device not initialized." msgid "USB Device not initialized."
msgstr "" msgstr "Dispositivo USB no iniciado."
msgid "USB Loader GX is protected" msgid "USB Loader GX is protected"
msgstr "USB Loader GX está protegido" msgstr "USB Loader GX está protegido"
@ -2102,16 +2102,16 @@ msgid "USB Port changing is only supported on Hermes cIOS."
msgstr "El cambio de Puerto USB sólo funciona con el cIOS de Hermes." msgstr "El cambio de Puerto USB sólo funciona con el cIOS de Hermes."
msgid "USB-HID Controller" msgid "USB-HID Controller"
msgstr "" msgstr "Mando USB-HID"
msgid "USBloaderGX couldn't verify Nintendont boot.dol file. Launch this boot.dol anyway?" msgid "USBloaderGX couldn't verify Nintendont boot.dol file. Launch this boot.dol anyway?"
msgstr "" msgstr "No se puede verificar el archivo boot.dol de Nintendont, ¿desea continuar igual?"
msgid "USBloaderGX couldn't write Nintendont config file. Launch Nintendont anyway?" msgid "USBloaderGX couldn't write Nintendont config file. Launch Nintendont anyway?"
msgstr "" msgstr "No se puede escribir la configuración de Nintendont, ¿desea continuar igual?"
msgid "USBloaderGX r1218 is required for Nintendont Alpha v0.1. Please update your Nintendont boot.dol version." msgid "USBloaderGX r1218 is required for Nintendont Alpha v0.1. Please update your Nintendont boot.dol version."
msgstr "" msgstr "Se necesita la versión r1218 para Nintendont Alpha 0.1. Por favor, actualiza el boot.dol de Nintendont."
msgid "Uninstall" msgid "Uninstall"
msgstr "Desinstalar" msgstr "Desinstalar"
@ -2150,7 +2150,7 @@ msgid "Update Files"
msgstr "Actual. archivos" msgstr "Actual. archivos"
msgid "Update Nintendont" msgid "Update Nintendont"
msgstr "" msgstr "Actualizar Nintendont"
msgid "Update Path" msgid "Update Path"
msgstr "Ruta Actualización" msgstr "Ruta Actualización"
@ -2171,13 +2171,13 @@ msgid "Uploaded ZIP file installed to homebrew directory."
msgstr "Enviado archivo ZIP instalado en la carpeta homebrew." msgstr "Enviado archivo ZIP instalado en la carpeta homebrew."
msgid "Use System Font" msgid "Use System Font"
msgstr "Fuente del Sistema" msgstr "Tipografía Wii"
msgid "Use global" msgid "Use global"
msgstr "Usar global" msgstr "Usar global"
msgid "VBI (Default)" msgid "VBI (Default)"
msgstr "" msgstr "VBI (Predeterminado)"
msgid "VIDTV Patch" msgid "VIDTV Patch"
msgstr "Parche VIDTV" msgstr "Parche VIDTV"
@ -2190,10 +2190,10 @@ msgid "Version: %s"
msgstr "Versión: %s" msgstr "Versión: %s"
msgid "Video Deflicker" msgid "Video Deflicker"
msgstr "" msgstr "Deflicker"
msgid "Video Mode" msgid "Video Mode"
msgstr "Modo Vídeo" msgstr "Modo vídeo "
msgid "Virtual Pointer Speed" msgid "Virtual Pointer Speed"
msgstr "Vel. Puntero Virtual" msgstr "Vel. Puntero Virtual"
@ -2229,7 +2229,7 @@ msgid "What to extract from NAND?"
msgstr "¿Que Extraer de la Nand?" msgstr "¿Que Extraer de la Nand?"
msgid "Where do you want MCEmu to be located?" msgid "Where do you want MCEmu to be located?"
msgstr "" msgstr "¿Dónde deseas guardar la MCEmu?"
msgid "Where should the game be installed to?" msgid "Where should the game be installed to?"
msgstr "¿Donde debe ser instalado el juego?" msgstr "¿Donde debe ser instalado el juego?"
@ -2238,10 +2238,10 @@ msgid "WiFi Features"
msgstr "Características WiFi" msgstr "Características WiFi"
msgid "Widescreen Factor" msgid "Widescreen Factor"
msgstr "Factor Panorámico" msgstr "Escala 16:9"
msgid "Widescreen Fix" msgid "Widescreen Fix"
msgstr "Panorámico" msgstr "Ajuste 16:9"
msgid "Wii Games" msgid "Wii Games"
msgstr "Juegos Wii" msgstr "Juegos Wii"
@ -2256,10 +2256,10 @@ msgid "WiiTDB.xml"
msgstr "WiiTDB" msgstr "WiiTDB"
msgid "WiiTDB.xml is up to date." msgid "WiiTDB.xml is up to date."
msgstr "WiiTDB.xml está actualizado." msgstr "WiiTDB está actualizado."
msgid "WiiU Widescreen" msgid "WiiU Widescreen"
msgstr "" msgstr "16:9 en Wii U"
msgid "Wiilight" msgid "Wiilight"
msgstr "Iluminar lector" msgstr "Iluminar lector"
@ -2302,10 +2302,10 @@ msgid "You cannot delete this category."
msgstr "No puedes borrar esta categoría." msgstr "No puedes borrar esta categoría."
msgid "You need to install DIOS MIOS Lite v1.2 or a newer version." msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
msgstr "" msgstr "Necesitas instalar DIOS MIOS Lite 1.2 o superior."
msgid "You need to install an additional GameCube loader or select a different GameCube Mode to launch GameCube games from USB or SD card." msgid "You need to install an additional GameCube loader or select a different GameCube Mode to launch GameCube games from USB or SD card."
msgstr "" msgstr "Debes instalar otro cargador GameCube o seleccionar uno distinto en la configuración Modo GameCube para cargar juegos desde USB o SD."
msgid "Zoom Duration (Speed)" msgid "Zoom Duration (Speed)"
msgstr "Duración de Zoom" msgstr "Duración de Zoom"
@ -2561,3 +2561,4 @@ msgstr "segundos restantes"
#~ msgid "for WiiTDB and hosting covers / disc images" #~ msgid "for WiiTDB and hosting covers / disc images"
#~ msgstr "por WiiTDB y alojar carátulas e imágenes" #~ msgstr "por WiiTDB y alojar carátulas e imágenes"

View File

@ -78,8 +78,7 @@ endif
# any extra libraries we wish to link with the project # any extra libraries we wish to link with the project
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
LIBS := -lcustomfat -lcustomntfs -lcustomext2fs -lvorbisidec -lmad -lfreetype \ LIBS := -lcustomfat -lcustomntfs -lcustomext2fs -lvorbisidec -lmad -lfreetype \
-lgd -ljpeg -lpng -lzip -lm -lz -lwiiuse -lwupc -lbte -lasnd -logc \ -lgd -ljpeg -lpng -lzip -lm -lz -lwiiuse -lwupc -lbte -lasnd -logc
-lsicksaxis
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# list of directories containing libraries, this must be the top level containing # list of directories containing libraries, this must be the top level containing
# include and lib # include and lib

View File

@ -48,8 +48,6 @@
#include "SoundOperations/gui_bgm.h" #include "SoundOperations/gui_bgm.h"
#include "utils/timer.h" #include "utils/timer.h"
#include "sigslot.h" #include "sigslot.h"
#include <sicksaxis.h>
#include "sicksaxis-wrapper.h"
//! Frequently used variables //! Frequently used variables
extern FreeTypeGX *fontSystem; extern FreeTypeGX *fontSystem;

View File

@ -4,7 +4,6 @@
#include "video.h" #include "video.h"
#include "audio.h" #include "audio.h"
#include "input.h" #include "input.h"
#include "sicksaxis-wrapper.h"
#include "themes/CTheme.h" #include "themes/CTheme.h"
#include "gecko.h" #include "gecko.h"
#include "Controls/DeviceHandler.hpp" #include "Controls/DeviceHandler.hpp"
@ -279,7 +278,6 @@ int StartUpProcess::Execute()
// Shut down pads // Shut down pads
WPAD_Shutdown(); WPAD_Shutdown();
WUPC_Shutdown(); WUPC_Shutdown();
DS3_Cleanup();
// Loading now the cios setup in the settings // Loading now the cios setup in the settings
IosLoader::LoadAppCios(); IosLoader::LoadAppCios();

View File

@ -17,8 +17,6 @@
#include <wiiuse/wpad.h> #include <wiiuse/wpad.h>
#include <wupc/wupc.h> #include <wupc/wupc.h>
#include <sicksaxis.h>
#include "sicksaxis-wrapper.h"
#include "menu.h" #include "menu.h"
#include "video.h" #include "video.h"
#include "input.h" #include "input.h"
@ -40,7 +38,6 @@ void UpdatePads()
WUPC_UpdateButtonStats(); WUPC_UpdateButtonStats();
WPAD_ScanPads(); WPAD_ScanPads();
PAD_ScanPads(); PAD_ScanPads();
DS3_ScanPads();
for (int i = 3; i >= 0; i--) for (int i = 3; i >= 0; i--)
{ {
@ -71,22 +68,6 @@ void UpdatePads()
WUPC_Disconnect(i); WUPC_Disconnect(i);
// Playstation 3 controller (required IOS58)
if (DS3_Connected() && i==0)
{
// Maps PS3 controller to Classic Controller Exp.
userInput[0].wpad.btns_d |= DS3_ButtonsDown();
userInput[0].wpad.btns_u |= DS3_ButtonsUp();
userInput[0].wpad.btns_h |= DS3_ButtonsHeld();
if(DS3_ButtonsDown() || DS3_ButtonsHeld())
userInput[i].wpad.exp.type = WPAD_EXP_CLASSIC; // Fake the Classic Controller expansion checking even if wiimote/cc not powered
userInput[0].pad.stickX = abs(DS3_StickX()) > 10 ? DS3_StickX() : PAD_StickX(i);
userInput[0].pad.stickY = abs(DS3_StickY()) > 10 ? DS3_StickY() : PAD_StickY(i);
userInput[0].pad.substickX = abs(DS3_SubStickX()) > 10 ? DS3_SubStickX() : PAD_SubStickX(i);
userInput[0].pad.substickY = abs(DS3_SubStickY()) > 10 ? DS3_SubStickY() : PAD_SubStickY(i);
}
if (Settings.rumble == ON) DoRumble(i); if (Settings.rumble == ON) DoRumble(i);
if(userInput[i].wpad.exp.type == WPAD_EXP_NUNCHUK) if(userInput[i].wpad.exp.type == WPAD_EXP_NUNCHUK)
@ -158,7 +139,6 @@ void SetupPads()
WUPC_Init(); WUPC_Init();
PAD_Init(); PAD_Init();
WPAD_Init(); WPAD_Init();
DS3_Init();
// read wiimote accelerometer and IR data // read wiimote accelerometer and IR data
WPAD_SetDataFormat(WPAD_CHAN_ALL, WPAD_FMT_BTNS_ACC_IR); WPAD_SetDataFormat(WPAD_CHAN_ALL, WPAD_FMT_BTNS_ACC_IR);
@ -200,7 +180,6 @@ void DoRumble(int i)
{ {
rumbleCount[i] = 20; rumbleCount[i] = 20;
rumbleRequest[i] = 0; rumbleRequest[i] = 0;
if(DS3_Connected()) DS3_Rumble();
} }
else else
{ {

View File

@ -553,15 +553,18 @@ int FeatureSettingsMenu::GetMenuInternal()
// WiiU Aspect switcher (Thanks Tueidj) // WiiU Aspect switcher (Thanks Tueidj)
else if (ret == ++Idx) else if (ret == ++Idx)
{ {
if( read32(0xd8006a0) == 0x30000004) if((*(vu32*)(0xCD8005A0) >> 16 ) == 0xCAFE) // vWii only
{ {
write32(0xd8006a0, 0x30000002), mask32(0xd8006a8, 0, 2); // Set 4:3 if( read32(0xd8006a0) == 0x30000004)
Settings.widescreen = OFF; {
} write32(0xd8006a0, 0x30000002), mask32(0xd8006a8, 0, 2); // Set 4:3
else Settings.widescreen = OFF;
{ }
write32(0xd8006a0, 0x30000004), mask32(0xd8006a8, 0, 2); // Set 16:9 else
Settings.widescreen = ON; {
write32(0xd8006a0, 0x30000004), mask32(0xd8006a8, 0, 2); // Set 16:9
Settings.widescreen = ON;
}
} }
} }

View File

@ -1,135 +0,0 @@
/*
// A simple wrapper for libsicksaxis, to make it resemble WPAD/PAD more closely.
// Written by daxtsu/thedax. I'm releasing this code into the public domain, so do whatever you want with it.
//
// 2015-01 Cyan
// Added Buttons state Up and Held.
//
*/
#include <sicksaxis.h>
#include "sicksaxis-wrapper.h"
static DS3 first;
static bool psPressed = false;
static unsigned int ButtonsUp;
static unsigned int ButtonsDown;
static unsigned int ButtonsHeld;
bool DS3_Init()
{
USB_Initialize();
if (ss_init() < 0)
{
return false;
}
ss_initialize(&first);
return true;
}
void DS3_Rumble()
{
if (first.connected && psPressed)
{
ss_set_rumble(&first, 2, 255, 2, 255);
}
}
void DS3_Cleanup()
{
psPressed = false;
ss_close(&first);
USB_Deinitialize();
}
unsigned int DS3_ButtonsDown()
{
if (!ss_is_connected(&first) || !psPressed)
return 0;
DS3 *controller;
controller = &first;
unsigned int pressed = 0;
pressed |= controller->pad.buttons.PS ? DS3_BUTTON_PS : 0;
pressed |= controller->pad.buttons.start ? DS3_BUTTON_START : 0;
pressed |= controller->pad.buttons.select ? DS3_BUTTON_SELECT : 0;
pressed |= controller->pad.buttons.triangle ? DS3_BUTTON_TRIANGLE : 0;
pressed |= controller->pad.buttons.circle ? DS3_BUTTON_CIRCLE : 0;
pressed |= controller->pad.buttons.cross ? DS3_BUTTON_CROSS : 0;
pressed |= controller->pad.buttons.square ? DS3_BUTTON_SQUARE : 0;
pressed |= controller->pad.buttons.up ? DS3_BUTTON_UP : 0;
pressed |= controller->pad.buttons.right ? DS3_BUTTON_RIGHT : 0;
pressed |= controller->pad.buttons.down ? DS3_BUTTON_DOWN : 0;
pressed |= controller->pad.buttons.left ? DS3_BUTTON_LEFT : 0;
pressed |= controller->pad.buttons.L1 ? DS3_BUTTON_L1 : 0;
pressed |= controller->pad.buttons.L2 ? DS3_BUTTON_L2 : 0;
// pressed |= controller->pad.buttons.L3 ? DS3_BUTTON_L3 : 0;
pressed |= controller->pad.buttons.R1 ? DS3_BUTTON_R1 : 0;
pressed |= controller->pad.buttons.R2 ? DS3_BUTTON_R2 : 0;
// pressed |= controller->pad.buttons.R3 ? DS3_BUTTON_R3 : 0;
ButtonsUp = ButtonsHeld & ~pressed;
ButtonsDown = ~ButtonsHeld & pressed;
ButtonsHeld = pressed;
return ButtonsDown;
}
unsigned int DS3_ButtonsHeld()
{
return ButtonsHeld;
}
unsigned int DS3_ButtonsUp()
{
return ButtonsUp;
}
bool DS3_Connected()
{
return first.connected > 0 && psPressed;
}
void DS3_ScanPads()
{
if (!ss_is_connected(&first))
{
psPressed = false;
ss_initialize(&first);
if (ss_open(&first) > 0)
{
ss_start_reading(&first);
ss_set_led(&first, 0);
}
}
else if (first.pad.buttons.PS && !psPressed)
{
psPressed = true;
ss_set_led(&first, 1);
}
}
int DS3_StickX()
{
return psPressed? first.pad.left_analog.x - 128 : 0;
}
int DS3_SubStickX()
{
return psPressed? first.pad.right_analog.x - 128 : 0;
}
int DS3_StickY()
{
return psPressed? 127 - first.pad.left_analog.y : 0;
}
int DS3_SubStickY()
{
return psPressed? 127 - first.pad.right_analog.y : 0;
}

View File

@ -1,74 +0,0 @@
// A simple wrapper for libsicksaxis, to make it resemble WPAD/PAD more closely.
// Written by daxtsu/thedax. I'm releasing this code into the public domain, so do whatever you want with it.
#ifndef _DS3WRAPPER_H_
#define _DS3WRAPPER_H_
#include <gctypes.h>
#include <wiiuse/wpad.h>
struct ss_device;
enum
{
// DS3_BUTTON_PS = 1,
// DS3_BUTTON_START = 2,
// DS3_BUTTON_SELECT = 4,
// DS3_BUTTON_TRIANGLE = 8,
// DS3_BUTTON_CIRCLE = 16,
// DS3_BUTTON_CROSS = 32,
// DS3_BUTTON_SQUARE = 64,
// DS3_BUTTON_UP = 128,
// DS3_BUTTON_RIGHT = 256,
// DS3_BUTTON_DOWN = 512,
// DS3_BUTTON_LEFT = 1024,
// DS3_BUTTON_L1 = 2048,
// DS3_BUTTON_L2 = 4096,
// DS3_BUTTON_L3 = 8192,
// DS3_BUTTON_R1 = 16384,
// DS3_BUTTON_R2 = 32768,
// DS3_BUTTON_R3 = 65536,
// Classic Controller mapping
DS3_BUTTON_PS = WPAD_CLASSIC_BUTTON_HOME,
DS3_BUTTON_START = WPAD_CLASSIC_BUTTON_PLUS,
DS3_BUTTON_SELECT = WPAD_CLASSIC_BUTTON_MINUS,
DS3_BUTTON_TRIANGLE = WPAD_CLASSIC_BUTTON_X,
DS3_BUTTON_CIRCLE = WPAD_CLASSIC_BUTTON_A,
DS3_BUTTON_CROSS = WPAD_CLASSIC_BUTTON_B,
DS3_BUTTON_SQUARE = WPAD_CLASSIC_BUTTON_Y,
DS3_BUTTON_UP = WPAD_CLASSIC_BUTTON_UP,
DS3_BUTTON_RIGHT = WPAD_CLASSIC_BUTTON_RIGHT,
DS3_BUTTON_DOWN = WPAD_CLASSIC_BUTTON_DOWN,
DS3_BUTTON_LEFT = WPAD_CLASSIC_BUTTON_LEFT,
DS3_BUTTON_L1 = WPAD_CLASSIC_BUTTON_FULL_L,
DS3_BUTTON_L2 = WPAD_CLASSIC_BUTTON_ZL,
// DS3_BUTTON_L3 =
DS3_BUTTON_R1 = WPAD_CLASSIC_BUTTON_FULL_R,
DS3_BUTTON_R2 = WPAD_CLASSIC_BUTTON_ZR,
// DS3_BUTTON_R3 =
};
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
typedef struct ss_device DS3;
bool DS3_Init();
void DS3_Rumble();
void DS3_Cleanup();
u32 DS3_ButtonsDown();
u32 DS3_ButtonsHeld();
u32 DS3_ButtonsUp();
bool DS3_Connected();
void DS3_ScanPads();
int DS3_StickX();
int DS3_SubStickX();
int DS3_StickY();
int DS3_SubStickY();
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif

View File

@ -111,7 +111,6 @@ void AppCleanUp(void)
ResourceManager::DestroyInstance(); ResourceManager::DestroyInstance();
WPAD_Shutdown(); WPAD_Shutdown();
DS3_Cleanup();
ISFS_Deinitialize(); ISFS_Deinitialize();
} }
@ -120,7 +119,6 @@ void ExitApp(void)
AppCleanUp(); AppCleanUp();
WBFS_CloseAll(); WBFS_CloseAll();
DeviceHandler::DestroyInstance(); DeviceHandler::DestroyInstance();
DS3_Cleanup();
USB_Deinitialize(); USB_Deinitialize();
if(Settings.PlaylogUpdate) if(Settings.PlaylogUpdate)
Playlog_Delete(); // Don't show USB Loader GX in the Wii message board Playlog_Delete(); // Don't show USB Loader GX in the Wii message board