Merge remote-tracking branch 'upstream/master' into storage-access-framework

Author: white-axe

input/input_driver.c

@@ -6017,40 +6017,6 @@ void input_driver_poll(void)
          && input_st->current_driver->poll)
       input_st->current_driver->poll(input_st->current_data);
 
-   input_st->turbo_btns.count++;
-
-   if (input_st->flags & INP_FLAG_BLOCK_LIBRETRO_INPUT)
-   {
-      for (i = 0; i < max_users; i++)
-         input_st->turbo_btns.frame_enable[i] = 0;
-      return;
-   }
-
-   /* This rarch_joypad_info_t struct contains the device index + autoconfig binds for the
-    * controller to be queried, and also (for unknown reasons) the analog axis threshold
-    * when mapping analog stick to dpad input. */
-   for (i = 0; i < max_users; i++)
-   {
-      uint16_t button_id = RARCH_TURBO_ENABLE;
-
-      if (settings->ints.input_turbo_bind != -1)
-         button_id = settings->ints.input_turbo_bind;
-
-      joypad_info[i].axis_threshold        = input_axis_threshold;
-      joypad_info[i].joy_idx               = settings->uints.input_joypad_index[i];
-      joypad_info[i].auto_binds            = input_autoconf_binds[joypad_info[i].joy_idx];
-
-      input_st->turbo_btns.frame_enable[i] =
-               (*input_st->libretro_input_binds[i])[button_id].valid
-            && settings->bools.input_turbo_enable ?
-         input_state_wrap(input_st->current_driver, input_st->current_data,
-               joypad, sec_joypad, &joypad_info[i],
-               (*input_st->libretro_input_binds),
-               (input_st->flags & INP_FLAG_KB_MAPPING_BLOCKED) ? true : false,
-               (unsigned)i,
-               RETRO_DEVICE_JOYPAD, 0, button_id) : 0;
-   }
-
 #ifdef HAVE_OVERLAY
    if (      input_st->overlay_ptr
          && (input_st->overlay_ptr->flags & INPUT_OVERLAY_ALIVE))
@@ -6091,6 +6057,50 @@ void input_driver_poll(void)
    }
 #endif
 
+   input_st->turbo_btns.count++;
+
+   if (input_st->flags & INP_FLAG_BLOCK_LIBRETRO_INPUT)
+   {
+      for (i = 0; i < max_users; i++)
+         input_st->turbo_btns.frame_enable[i] = 0;
+      return;
+   }
+
+   /* This rarch_joypad_info_t struct contains the device index + autoconfig binds for the
+    * controller to be queried, and also (for unknown reasons) the analog axis threshold
+    * when mapping analog stick to dpad input. */
+   for (i = 0; i < max_users; i++)
+   {
+      uint16_t button_id = RARCH_TURBO_ENABLE;
+      bool turbo_enable  = settings->bools.input_turbo_enable;
+
+      if (settings->ints.input_turbo_bind != -1)
+         button_id = settings->ints.input_turbo_bind;
+
+      joypad_info[i].axis_threshold        = input_axis_threshold;
+      joypad_info[i].joy_idx               = settings->uints.input_joypad_index[i];
+      joypad_info[i].auto_binds            = input_autoconf_binds[joypad_info[i].joy_idx];
+
+      input_st->turbo_btns.frame_enable[i] =
+               (*input_st->libretro_input_binds[i])[button_id].valid
+            && turbo_enable ?
+         input_state_wrap(input_st->current_driver, input_st->current_data,
+               joypad, sec_joypad, &joypad_info[i],
+               (*input_st->libretro_input_binds),
+               (input_st->flags & INP_FLAG_KB_MAPPING_BLOCKED) ? true : false,
+               (unsigned)i,
+               RETRO_DEVICE_JOYPAD, 0, button_id) : 0;
+
+#ifdef HAVE_OVERLAY
+      if (     (i == 0)
+            && turbo_enable
+            && input_st->overlay_ptr
+            && (input_st->overlay_ptr->flags & INPUT_OVERLAY_ALIVE)
+            && BIT256_GET(input_st->overlay_ptr->overlay_state.buttons, button_id))
+         input_st->turbo_btns.frame_enable[i] = true;
+#endif
+   }
+
 #ifdef HAVE_MENU
    if (!(menu_state_get_ptr()->flags & MENU_ST_FLAG_ALIVE))
 #endif

intl/msg_hash_ko.h

@@ -2501,6 +2501,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_SCALE_INTEGER_SCALING,
    "정수 단위 조정 방식"
    )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_SCALE_INTEGER_SCALING,
+   "정수 배율을 올림으로 계산할지 버림으로 계산할지 설정합니다. '스마트'로 설정할 경우, 화면이 너무 많이 잘려나갈 것 같을 때는 버림으로 계산되며, 버림을 했을 때 빈 공간이 너무 많이 남을 것 같을 때는 정수 단위 화면 크기를 사용하지 않습니다."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_SCALE_INTEGER_SCALING_UNDERSCALE,
    "버림"

intl/msg_hash_ru.h

@@ -2497,6 +2497,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_SCALE_INTEGER_SCALING,
    "Масштабирование целочисленной шкалы"
    )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_SCALE_INTEGER_SCALING,
+   "Округлять вниз или вверх до ближайшего целого значения. 'Умный' режим при избыточном кадрировании изображения включает занижение масштаба, а при слишком больших отступах использует нецелочисленное масштабирование."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_SCALE_INTEGER_SCALING_UNDERSCALE,
    "Занижать масштаб"

intl/msg_hash_vn.h

@@ -250,7 +250,7 @@ MSG_HASH( /* FIXME Maybe add a description? */
    )
 MSG_HASH( /* FIXME Maybe add a description? */
    MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD,
-   "Khởi động RetroPad từ xa"
+   "Khởi động tay cầm từ xa"
    )
 
 /* Main Menu > Load Content */
@@ -2489,6 +2489,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_SCALE_INTEGER_SCALING,
    "Tỷ lệ số nguyên"
    )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_SCALE_INTEGER_SCALING,
+   "Làm tròn xuống hoặc lên đến hệ số nguyên tiếp theo. Chế độ “Thông minh” sẽ giảm xuống mức thu nhỏ khi hình ảnh bị cắt quá nhiều, và cuối cùng quay về thu phóng không nguyên nếu phần bị thu nhỏ trở nên quá lớn."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_SCALE_INTEGER_SCALING_UNDERSCALE,
    "Thu nhỏ hình"

intl/progress.h

@@ -95,7 +95,7 @@
 #define LANGUAGE_PROGRESS_JAPANESE_APPROVED   0
 
 /* Korean */
-#define LANGUAGE_PROGRESS_KOREAN_TRANSLATED 99
+#define LANGUAGE_PROGRESS_KOREAN_TRANSLATED 100
 #define LANGUAGE_PROGRESS_KOREAN_APPROVED   0
 
 /* Dutch */
@@ -123,7 +123,7 @@
 #define LANGUAGE_PROGRESS_PORTUGUESE_APPROVED   0
 
 /* Russian */
-#define LANGUAGE_PROGRESS_RUSSIAN_TRANSLATED 99
+#define LANGUAGE_PROGRESS_RUSSIAN_TRANSLATED 100
 #define LANGUAGE_PROGRESS_RUSSIAN_APPROVED   12
 
 /* Slovak */
@@ -155,7 +155,7 @@
 #define LANGUAGE_PROGRESS_VALENCIAN_APPROVED   0
 
 /* Vietnamese */
-#define LANGUAGE_PROGRESS_VIETNAMESE_TRANSLATED 99
+#define LANGUAGE_PROGRESS_VIETNAMESE_TRANSLATED 100
 #define LANGUAGE_PROGRESS_VIETNAMESE_APPROVED   0
 
 /* Chinese Simplified */

retroarch.c

@@ -1771,6 +1771,10 @@ void drivers_init(
 #ifdef HAVE_LAKKA
    cpu_scaling_driver_init();
 #endif
+
+#ifdef HAVE_MENU
+   srand(time(NULL));
+#endif
 }
 
 void driver_uninit(int flags, enum driver_lifetime_flags lifetime_flags)