attempt autoconf fallback for android

This commit is contained in:
radius 2017-02-05 14:24:34 -05:00
parent ddeaf2c893
commit c9015aa9ba
9 changed files with 41 additions and 1 deletions

View File

@ -2295,6 +2295,10 @@ MSG_HASH(
MSG_DEVICE_NOT_CONFIGURED, MSG_DEVICE_NOT_CONFIGURED,
"未配置" "未配置"
) )
MSG_HASH(
MSG_DEVICE_NOT_CONFIGURED_FALLBACK,
"not configured, using fallback"
)
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST, MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST,
"数据库 Cursor List" "数据库 Cursor List"

View File

@ -2148,6 +2148,10 @@ MSG_HASH(
MSG_DEVICE_NOT_CONFIGURED, MSG_DEVICE_NOT_CONFIGURED,
"not configured" "not configured"
) )
MSG_HASH(
MSG_DEVICE_NOT_CONFIGURED_FALLBACK,
"not configured, using fallback"
)
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST, MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST,
"Database Cursor List" "Database Cursor List"

View File

@ -2170,6 +2170,10 @@ MSG_HASH(
MSG_DEVICE_NOT_CONFIGURED, MSG_DEVICE_NOT_CONFIGURED,
"not configured" "not configured"
) )
MSG_HASH(
MSG_DEVICE_NOT_CONFIGURED_FALLBACK,
"not configured, using fallback"
)
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST, MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST,
"Database Cursor List" "Database Cursor List"

View File

@ -2291,6 +2291,10 @@ MSG_HASH(
MSG_DEVICE_NOT_CONFIGURED, MSG_DEVICE_NOT_CONFIGURED,
"設定されていない" "設定されていない"
) )
MSG_HASH(
MSG_DEVICE_NOT_CONFIGURED_FALLBACK,
"not configured, using fallback"
)
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST, MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST,
"データベースのカーソル表" "データベースのカーソル表"

View File

@ -2182,6 +2182,10 @@ MSG_HASH(
MSG_DEVICE_NOT_CONFIGURED, MSG_DEVICE_NOT_CONFIGURED,
"not configured" "not configured"
) )
MSG_HASH(
MSG_DEVICE_NOT_CONFIGURED_FALLBACK,
"not configured, using fallback"
)
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST, MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST,
"Database Cursor List" "Database Cursor List"

View File

@ -2181,6 +2181,10 @@ MSG_HASH(
MSG_DEVICE_NOT_CONFIGURED, MSG_DEVICE_NOT_CONFIGURED,
"not configured" "not configured"
) )
MSG_HASH(
MSG_DEVICE_NOT_CONFIGURED_FALLBACK,
"not configured, using fallback"
)
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST, MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST,
"Database Cursor List" "Database Cursor List"

View File

@ -2288,6 +2288,10 @@ MSG_HASH(
MSG_DEVICE_NOT_CONFIGURED, MSG_DEVICE_NOT_CONFIGURED,
"not configured" "not configured"
) )
MSG_HASH(
MSG_DEVICE_NOT_CONFIGURED_FALLBACK,
"not configured, using fallback"
)
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST, MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST,
"Database Cursor List" "Database Cursor List"

View File

@ -168,6 +168,7 @@ enum msg_hash_enums
MSG_CAPABILITIES, MSG_CAPABILITIES,
MSG_DEVICE_CONFIGURED_IN_PORT, MSG_DEVICE_CONFIGURED_IN_PORT,
MSG_DEVICE_NOT_CONFIGURED, MSG_DEVICE_NOT_CONFIGURED,
MSG_DEVICE_NOT_CONFIGURED_FALLBACK,
MSG_DEVICE_DISCONNECTED_FROM_PORT, MSG_DEVICE_DISCONNECTED_FROM_PORT,
MSG_NO_ARGUMENTS_SUPPLIED_AND_NO_MENU_BUILTIN, MSG_NO_ARGUMENTS_SUPPLIED_AND_NO_MENU_BUILTIN,
MSG_COMPILER, MSG_COMPILER,

View File

@ -306,14 +306,25 @@ static void input_autoconfigure_connect_handler(retro_task_t *task)
char msg[255]; char msg[255];
msg[0] = '\0'; msg[0] = '\0';
#ifndef ANDROID
RARCH_LOG("Autodetect: no profiles found for %s (%d/%d).\n", RARCH_LOG("Autodetect: no profiles found for %s (%d/%d).\n",
params->name, params->vid, params->pid); params->name, params->vid, params->pid);
snprintf(msg, sizeof(msg), "%s (%ld/%ld) %s.", snprintf(msg, sizeof(msg), "%s (%ld/%ld) %s.",
params->name, (long)params->vid, (long)params->pid, params->name, (long)params->vid, (long)params->pid,
msg_hash_to_str(MSG_DEVICE_NOT_CONFIGURED)); msg_hash_to_str(MSG_DEVICE_NOT_CONFIGURED));
#else
strlcpy(params->name, "Android Gamepad", sizeof(params->name));
if(!input_autoconfigure_joypad_from_conf_internal(params, task))
{
RARCH_LOG("Autodetect: no profiles found for %s (%d/%d). Using fallback\n",
params->name, params->vid, params->pid);
snprintf(msg, sizeof(msg), "%s (%ld/%ld) %s.",
params->name, (long)params->vid, (long)params->pid,
msg_hash_to_str(MSG_DEVICE_NOT_CONFIGURED_FALLBACK));
}
#endif
task_set_title(task, strdup(msg)); task_set_title(task, strdup(msg));
} }