Merge branch 'master' of github.com:libretro/RetroArch

frontend/menu/backend/menu_common_backend.c

@@ -500,7 +500,7 @@ static int menu_info_screen_iterate(unsigned action, rarch_setting_t *setting)
    if (driver.video_data && driver.menu_ctx && driver.menu_ctx->render)
       driver.menu_ctx->render();
 
-   current_setting = file_list_get_last_setting(driver.menu->selection_buf, driver.menu->selection_ptr);
+   current_setting = (rarch_setting_t*)file_list_get_last_setting(driver.menu->selection_buf, driver.menu->selection_ptr);
 
    if (current_setting)
             setting_data_get_description(current_setting, msg, sizeof(msg));
@@ -3052,7 +3052,7 @@ static bool osk_callback_enter_filename(void *data)
       config_file_t *conf;
 
       RARCH_LOG("OSK - Applying input data.\n");
-      num = wcstombs(tmp_str, driver.osk->get_text_buf(driver.osk_data), sizeof(tmp_str));
+      num = wcstombs(tmp_str, (const wchar_t*)driver.osk->get_text_buf(driver.osk_data), sizeof(tmp_str));
       tmp_str[num] = 0;
 
       fill_pathname_join(filepath, g_settings.video.shader_dir, tmp_str, sizeof(filepath));
@@ -3102,7 +3102,7 @@ static int menu_common_setting_set(unsigned id, unsigned action, rarch_setting_t
    struct retro_perf_counter **counters;
    unsigned port = driver.menu->current_pad;
 
-   setting = file_list_get_last_setting(driver.menu->selection_buf, driver.menu->selection_ptr);
+   setting = (rarch_setting_t*)file_list_get_last_setting(driver.menu->selection_buf, driver.menu->selection_ptr);
 
    if (id >= MENU_SETTINGS_PERF_COUNTERS_BEGIN && id <= MENU_SETTINGS_PERF_COUNTERS_END)
    {

gfx/shader_parse.h

@@ -56,7 +56,7 @@ enum gfx_scale_type
    RARCH_SCALE_VIEWPORT
 };
 
-enum gfx_filter_type
+enum
 {
    RARCH_FILTER_UNSPEC = 0,
    RARCH_FILTER_LINEAR,
@@ -110,7 +110,7 @@ struct gfx_shader_pass
 
    char alias[64];
    struct gfx_fbo_scale fbo;
-   enum gfx_filter_type filter;
+   unsigned filter;
    enum gfx_wrap_type wrap;
    unsigned frame_count_mod;
    bool mipmap;
@@ -120,7 +120,7 @@ struct gfx_shader_lut
 {
    char id[64];
    char path[PATH_MAX];
-   enum gfx_filter_type filter;
+   unsigned filter;
    enum gfx_wrap_type wrap;
    bool mipmap;
 };

msvc/msvc-2010/RetroArch-msvc2010.vcxproj

@@ -319,6 +319,7 @@
     </ClCompile>
     <ClCompile Include="..\..\frontend\frontend_context.c">
     </ClCompile>
+    <ClCompile Include="..\..\record\ffemu.c" />
     <ClCompile Include="..\..\retroarch.c">
     </ClCompile>
     <ClCompile Include="..\..\location\nulllocation.c">
@@ -337,8 +338,7 @@
     </ClCompile>
     <ClCompile Include="..\..\settings.c">
     </ClCompile>
-    <ClCompile Include="..\..\settings_data.c">
+    <ClCompile Include="..\..\settings_data.c" />
-    </ClCompile>
     <ClCompile Include="..\..\thread.c">
     </ClCompile>
   </ItemGroup>
@@ -351,4 +351,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters

@@ -23,8 +23,6 @@
     <ClCompile Include="..\..\location\nulllocation.c" />
     <ClCompile Include="..\..\camera\nullcamera.c" />
     <ClCompile Include="..\..\gfx\nullgfx.c" />
-    <ClCompile Include="..\..\gfx\nullaudio.c" />
-    <ClCompile Include="..\..\gfx\nullinput.c" />
     <ClCompile Include="..\..\rewind.c" />
     <ClCompile Include="..\..\screenshot.c" />
     <ClCompile Include="..\..\settings.c" />
@@ -224,9 +222,6 @@
     <ClCompile Include="..\..\frontend\menu\menu_navigation.c">
       <Filter>frontend\menu</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\frontend\info\core_info.c">
-      <Filter>frontend\menu\info</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\gfx\context\d3d_ctx.cpp">
       <Filter>gfx\context</Filter>
     </ClCompile>
@@ -239,7 +234,6 @@
     <ClCompile Include="..\..\frontend\menu\backend\menu_common_backend.c">
       <Filter>frontend\menu\backend</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\settings_data.c" />
     <ClCompile Include="..\..\gfx\shader_common.c">
       <Filter>gfx</Filter>
     </ClCompile>
@@ -252,6 +246,15 @@
     <ClCompile Include="..\..\audio\dsp_filter.c">
       <Filter>audio</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\playlist.c" />
+    <ClCompile Include="..\..\file_list.c" />
+    <ClCompile Include="..\..\core_info.c" />
+    <ClCompile Include="..\..\audio\nullaudio.c" />
+    <ClCompile Include="..\..\input\nullinput.c" />
+    <ClCompile Include="..\..\settings_data.c" />
+    <ClCompile Include="..\..\record\ffemu.c">
+      <Filter>record</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h" />
@@ -326,5 +329,8 @@
     <Filter Include="gfx\image">
       <UniqueIdentifier>{4a5338d9-92ad-4d07-bb1a-97bd6eb475e4}</UniqueIdentifier>
     </Filter>
+    <Filter Include="record">
+      <UniqueIdentifier>{5a80dd03-b4d7-4118-92ff-55a601fd80fc}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
-</Project>
+</Project>

retroarch.c

@@ -556,7 +556,7 @@ static bool audio_flush(const int16_t *data, size_t samples)
       RARCH_PERFORMANCE_INIT(audio_convert_float);
       RARCH_PERFORMANCE_START(audio_convert_float);
       audio_convert_float_to_s16(g_extern.audio_data.conv_outsamples,
-            output_data, output_frames * 2);
+            (const float*)output_data, output_frames * 2);
       RARCH_PERFORMANCE_STOP(audio_convert_float);
 
       output_data = g_extern.audio_data.conv_outsamples;