From 5a21d87e69213b9c50a8e7854dc2455d48b46dcb Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Thu, 14 Mar 2024 23:30:59 -0400 Subject: [PATCH] rwops: Changed filenames that reference "rwops" to "iostream". --- VisualC-GDK/SDL/SDL.vcxproj | 4 +-- VisualC-GDK/SDL/SDL.vcxproj.filters | 4 +-- VisualC-WinRT/SDL-UWP.vcxproj | 4 +-- VisualC-WinRT/SDL-UWP.vcxproj.filters | 4 +-- VisualC/SDL/SDL.vcxproj | 4 +-- VisualC/SDL/SDL.vcxproj.filters | 4 +-- .../testautomation/testautomation.vcxproj | 2 +- Xcode/SDL/SDL.xcodeproj/project.pbxproj | 32 +++++++++---------- .../SDLTest/SDLTest.xcodeproj/project.pbxproj | 8 ++--- docs/README-android.md | 2 +- docs/README-migration.md | 2 ++ include/SDL3/SDL.h | 2 +- include/SDL3/SDL_audio.h | 2 +- include/SDL3/SDL_gamepad.h | 2 +- include/SDL3/{SDL_rwops.h => SDL_iostream.h} | 8 ++--- include/SDL3/SDL_surface.h | 2 +- src/file/{SDL_rwops.c => SDL_iostream.c} | 4 +-- ...esupport.h => SDL_iostreambundlesupport.h} | 4 +-- ...esupport.m => SDL_iostreambundlesupport.m} | 2 +- .../{SDL_rwopsromfs.c => SDL_iostreamromfs.c} | 2 +- .../{SDL_rwopsromfs.h => SDL_iostreamromfs.h} | 6 ++-- test/README | 2 +- ...tion_rwops.c => testautomation_iostream.c} | 0 test/testfile.c | 2 +- 24 files changed, 55 insertions(+), 53 deletions(-) rename include/SDL3/{SDL_rwops.h => SDL_iostream.h} (99%) rename src/file/{SDL_rwops.c => SDL_iostream.c} (99%) rename src/file/cocoa/{SDL_rwopsbundlesupport.h => SDL_iostreambundlesupport.h} (93%) rename src/file/cocoa/{SDL_rwopsbundlesupport.m => SDL_iostreambundlesupport.m} (98%) rename src/file/n3ds/{SDL_rwopsromfs.c => SDL_iostreamromfs.c} (98%) rename src/file/n3ds/{SDL_rwopsromfs.h => SDL_iostreamromfs.h} (91%) rename test/{testautomation_rwops.c => testautomation_iostream.c} (100%) diff --git a/VisualC-GDK/SDL/SDL.vcxproj b/VisualC-GDK/SDL/SDL.vcxproj index 5cc952d41..8b8fdad0b 100644 --- a/VisualC-GDK/SDL/SDL.vcxproj +++ b/VisualC-GDK/SDL/SDL.vcxproj @@ -364,7 +364,7 @@ - + @@ -629,7 +629,7 @@ - + true true diff --git a/VisualC-GDK/SDL/SDL.vcxproj.filters b/VisualC-GDK/SDL/SDL.vcxproj.filters index c656f29be..49c00513c 100644 --- a/VisualC-GDK/SDL/SDL.vcxproj.filters +++ b/VisualC-GDK/SDL/SDL.vcxproj.filters @@ -43,7 +43,7 @@ - + @@ -258,7 +258,7 @@ - + diff --git a/VisualC-WinRT/SDL-UWP.vcxproj b/VisualC-WinRT/SDL-UWP.vcxproj index 2f8cc4ace..807697af5 100644 --- a/VisualC-WinRT/SDL-UWP.vcxproj +++ b/VisualC-WinRT/SDL-UWP.vcxproj @@ -78,7 +78,7 @@ - + @@ -332,7 +332,7 @@ $(IntDir)$(TargetName)_cpp.pch $(IntDir)$(TargetName)_cpp.pch - + diff --git a/VisualC-WinRT/SDL-UWP.vcxproj.filters b/VisualC-WinRT/SDL-UWP.vcxproj.filters index 2d93536fe..c143ae9e9 100644 --- a/VisualC-WinRT/SDL-UWP.vcxproj.filters +++ b/VisualC-WinRT/SDL-UWP.vcxproj.filters @@ -141,7 +141,7 @@ Header Files - + Header Files @@ -582,7 +582,7 @@ Source Files - + Source Files diff --git a/VisualC/SDL/SDL.vcxproj b/VisualC/SDL/SDL.vcxproj index ccc8492e7..f923aba84 100644 --- a/VisualC/SDL/SDL.vcxproj +++ b/VisualC/SDL/SDL.vcxproj @@ -287,7 +287,7 @@ - + @@ -521,7 +521,7 @@ - + diff --git a/VisualC/SDL/SDL.vcxproj.filters b/VisualC/SDL/SDL.vcxproj.filters index 10eb1997a..c6568f85f 100644 --- a/VisualC/SDL/SDL.vcxproj.filters +++ b/VisualC/SDL/SDL.vcxproj.filters @@ -342,7 +342,7 @@ API Headers - + API Headers @@ -973,7 +973,7 @@ events - + file diff --git a/VisualC/tests/testautomation/testautomation.vcxproj b/VisualC/tests/testautomation/testautomation.vcxproj index 6693b5e60..7fc14cb70 100644 --- a/VisualC/tests/testautomation/testautomation.vcxproj +++ b/VisualC/tests/testautomation/testautomation.vcxproj @@ -221,7 +221,7 @@ - + diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj index 759c4b596..48836c3e3 100644 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj @@ -224,9 +224,9 @@ A7D8B58123E2514300DCD162 /* SDL_sysjoystick.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A7CF23E2513E00DCD162 /* SDL_sysjoystick.h */; }; A7D8B58723E2514300DCD162 /* SDL_joystick_c.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A7D023E2513E00DCD162 /* SDL_joystick_c.h */; }; A7D8B5B723E2514300DCD162 /* controller_type.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A7D923E2513E00DCD162 /* controller_type.h */; }; - A7D8B5BD23E2514300DCD162 /* SDL_rwops.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A7DB23E2513F00DCD162 /* SDL_rwops.c */; }; - A7D8B5C323E2514300DCD162 /* SDL_rwopsbundlesupport.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A7DD23E2513F00DCD162 /* SDL_rwopsbundlesupport.h */; }; - A7D8B5C923E2514300DCD162 /* SDL_rwopsbundlesupport.m in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A7DE23E2513F00DCD162 /* SDL_rwopsbundlesupport.m */; }; + A7D8B5BD23E2514300DCD162 /* SDL_iostream.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A7DB23E2513F00DCD162 /* SDL_iostream.c */; }; + A7D8B5C323E2514300DCD162 /* SDL_iostreambundlesupport.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A7DD23E2513F00DCD162 /* SDL_iostreambundlesupport.h */; }; + A7D8B5C923E2514300DCD162 /* SDL_iostreambundlesupport.m in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A7DE23E2513F00DCD162 /* SDL_iostreambundlesupport.m */; }; A7D8B5CF23E2514300DCD162 /* SDL_syspower.m in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A7E123E2513F00DCD162 /* SDL_syspower.m */; }; A7D8B5D523E2514300DCD162 /* SDL_syspower.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A7E223E2513F00DCD162 /* SDL_syspower.h */; }; A7D8B5E723E2514300DCD162 /* SDL_power.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A7E723E2513F00DCD162 /* SDL_power.c */; }; @@ -458,7 +458,7 @@ F3F7D9592933074E00816151 /* SDL_video.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8C52933074B00816151 /* SDL_video.h */; settings = {ATTRIBUTES = (Public, ); }; }; F3F7D95D2933074E00816151 /* SDL_opengles.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8C62933074B00816151 /* SDL_opengles.h */; settings = {ATTRIBUTES = (Public, ); }; }; F3F7D9612933074E00816151 /* SDL_opengles2.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8C72933074B00816151 /* SDL_opengles2.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F3F7D9652933074E00816151 /* SDL_rwops.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8C82933074B00816151 /* SDL_rwops.h */; settings = {ATTRIBUTES = (Public, ); }; }; + F3F7D9652933074E00816151 /* SDL_iostream.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8C82933074B00816151 /* SDL_iostream.h */; settings = {ATTRIBUTES = (Public, ); }; }; F3F7D9692933074E00816151 /* SDL_opengles2_gl2platform.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8C92933074B00816151 /* SDL_opengles2_gl2platform.h */; settings = {ATTRIBUTES = (Public, ); }; }; F3F7D96D2933074E00816151 /* SDL_hidapi.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8CA2933074B00816151 /* SDL_hidapi.h */; settings = {ATTRIBUTES = (Public, ); }; }; F3F7D9712933074E00816151 /* SDL_events.h in Headers */ = {isa = PBXBuildFile; fileRef = F3F7D8CB2933074B00816151 /* SDL_events.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -760,9 +760,9 @@ A7D8A7CF23E2513E00DCD162 /* SDL_sysjoystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysjoystick.h; sourceTree = ""; }; A7D8A7D023E2513E00DCD162 /* SDL_joystick_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_joystick_c.h; sourceTree = ""; }; A7D8A7D923E2513E00DCD162 /* controller_type.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = controller_type.h; sourceTree = ""; }; - A7D8A7DB23E2513F00DCD162 /* SDL_rwops.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_rwops.c; sourceTree = ""; }; - A7D8A7DD23E2513F00DCD162 /* SDL_rwopsbundlesupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_rwopsbundlesupport.h; sourceTree = ""; }; - A7D8A7DE23E2513F00DCD162 /* SDL_rwopsbundlesupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_rwopsbundlesupport.m; sourceTree = ""; }; + A7D8A7DB23E2513F00DCD162 /* SDL_iostream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_iostream.c; sourceTree = ""; }; + A7D8A7DD23E2513F00DCD162 /* SDL_iostreambundlesupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_iostreambundlesupport.h; sourceTree = ""; }; + A7D8A7DE23E2513F00DCD162 /* SDL_iostreambundlesupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_iostreambundlesupport.m; sourceTree = ""; }; A7D8A7E123E2513F00DCD162 /* SDL_syspower.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_syspower.m; sourceTree = ""; }; A7D8A7E223E2513F00DCD162 /* SDL_syspower.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_syspower.h; sourceTree = ""; }; A7D8A7E723E2513F00DCD162 /* SDL_power.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_power.c; sourceTree = ""; }; @@ -983,7 +983,7 @@ F3F7D8C52933074B00816151 /* SDL_video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_video.h; path = SDL3/SDL_video.h; sourceTree = ""; }; F3F7D8C62933074B00816151 /* SDL_opengles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_opengles.h; path = SDL3/SDL_opengles.h; sourceTree = ""; }; F3F7D8C72933074B00816151 /* SDL_opengles2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_opengles2.h; path = SDL3/SDL_opengles2.h; sourceTree = ""; }; - F3F7D8C82933074B00816151 /* SDL_rwops.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_rwops.h; path = SDL3/SDL_rwops.h; sourceTree = ""; }; + F3F7D8C82933074B00816151 /* SDL_iostream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_iostream.h; path = SDL3/SDL_iostream.h; sourceTree = ""; }; F3F7D8C92933074B00816151 /* SDL_opengles2_gl2platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_opengles2_gl2platform.h; path = SDL3/SDL_opengles2_gl2platform.h; sourceTree = ""; }; F3F7D8CA2933074B00816151 /* SDL_hidapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_hidapi.h; path = SDL3/SDL_hidapi.h; sourceTree = ""; }; F3F7D8CB2933074B00816151 /* SDL_events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_events.h; path = SDL3/SDL_events.h; sourceTree = ""; }; @@ -1158,7 +1158,7 @@ F3F7D8E22933074D00816151 /* SDL_rect.h */, F3F7D8DE2933074D00816151 /* SDL_render.h */, F3F7D8B42933074900816151 /* SDL_revision.h */, - F3F7D8C82933074B00816151 /* SDL_rwops.h */, + F3F7D8C82933074B00816151 /* SDL_iostream.h */, F3F7D8C12933074B00816151 /* SDL_scancode.h */, F3F7D8C22933074B00816151 /* SDL_sensor.h */, F3F7D8AC2933074900816151 /* SDL_stdinc.h */, @@ -1803,7 +1803,7 @@ isa = PBXGroup; children = ( A7D8A7DC23E2513F00DCD162 /* cocoa */, - A7D8A7DB23E2513F00DCD162 /* SDL_rwops.c */, + A7D8A7DB23E2513F00DCD162 /* SDL_iostream.c */, ); path = file; sourceTree = ""; @@ -1811,8 +1811,8 @@ A7D8A7DC23E2513F00DCD162 /* cocoa */ = { isa = PBXGroup; children = ( - A7D8A7DD23E2513F00DCD162 /* SDL_rwopsbundlesupport.h */, - A7D8A7DE23E2513F00DCD162 /* SDL_rwopsbundlesupport.m */, + A7D8A7DD23E2513F00DCD162 /* SDL_iostreambundlesupport.h */, + A7D8A7DE23E2513F00DCD162 /* SDL_iostreambundlesupport.m */, ); path = cocoa; sourceTree = ""; @@ -2320,8 +2320,8 @@ A7D8B9FB23E2514400DCD162 /* SDL_render_sw_c.h in Headers */, F3F7D9152933074E00816151 /* SDL_revision.h in Headers */, A7D8BA3123E2514400DCD162 /* SDL_rotate.h in Headers */, - F3F7D9652933074E00816151 /* SDL_rwops.h in Headers */, - A7D8B5C323E2514300DCD162 /* SDL_rwopsbundlesupport.h in Headers */, + F3F7D9652933074E00816151 /* SDL_iostream.h in Headers */, + A7D8B5C323E2514300DCD162 /* SDL_iostreambundlesupport.h in Headers */, F3F7D9492933074E00816151 /* SDL_scancode.h in Headers */, F3F7D94D2933074E00816151 /* SDL_sensor.h in Headers */, A7D8A98D23E2514000DCD162 /* SDL_sensor_c.h in Headers */, @@ -2638,7 +2638,7 @@ F32DDAD12AB795A30041EAA5 /* SDL_audioqueue.c in Sources */, A7D8B8E423E2514400DCD162 /* SDL_error.c in Sources */, A7D8AD6823E2514100DCD162 /* SDL_blit.c in Sources */, - A7D8B5BD23E2514300DCD162 /* SDL_rwops.c in Sources */, + A7D8B5BD23E2514300DCD162 /* SDL_iostream.c in Sources */, A7D8BA9123E2514400DCD162 /* s_cos.c in Sources */, A7D8B9D123E2514400DCD162 /* SDL_yuv_sw.c in Sources */, A7D8B76A23E2514300DCD162 /* SDL_wave.c in Sources */, @@ -2724,7 +2724,7 @@ A7D8AAB023E2514100DCD162 /* SDL_syshaptic.c in Sources */, F3F07D5A269640160074468B /* SDL_hidapi_luna.c in Sources */, A7D8BBD523E2574800DCD162 /* SDL_uikitclipboard.m in Sources */, - A7D8B5C923E2514300DCD162 /* SDL_rwopsbundlesupport.m in Sources */, + A7D8B5C923E2514300DCD162 /* SDL_iostreambundlesupport.m in Sources */, F386F6F92884663E001840AA /* SDL_utils.c in Sources */, E4F7981E2AD8D86A00669F54 /* SDL_render_unsupported.c in Sources */, A7D8AC0F23E2514100DCD162 /* SDL_video.c in Sources */, diff --git a/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj b/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj index f188f5372..2069c2229 100644 --- a/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj +++ b/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj @@ -137,7 +137,7 @@ F35E56CF2983130F00A43A5F /* testautomation_main.c in Sources */ = {isa = PBXBuildFile; fileRef = F35E56B62983130A00A43A5F /* testautomation_main.c */; }; F35E56D02983130F00A43A5F /* testautomation_hints.c in Sources */ = {isa = PBXBuildFile; fileRef = F35E56B72983130A00A43A5F /* testautomation_hints.c */; }; F35E56D12983130F00A43A5F /* testautomation_render.c in Sources */ = {isa = PBXBuildFile; fileRef = F35E56B82983130A00A43A5F /* testautomation_render.c */; }; - F35E56D22983130F00A43A5F /* testautomation_rwops.c in Sources */ = {isa = PBXBuildFile; fileRef = F35E56B92983130B00A43A5F /* testautomation_rwops.c */; }; + F35E56D22983130F00A43A5F /* testautomation_iostream.c in Sources */ = {isa = PBXBuildFile; fileRef = F35E56B92983130B00A43A5F /* testautomation_iostream.c */; }; F35E56D32983130F00A43A5F /* testautomation_math.c in Sources */ = {isa = PBXBuildFile; fileRef = F35E56BA2983130B00A43A5F /* testautomation_math.c */; }; F35E56D42983130F00A43A5F /* testautomation_events.c in Sources */ = {isa = PBXBuildFile; fileRef = F35E56BB2983130B00A43A5F /* testautomation_events.c */; }; F35E56D52983130F00A43A5F /* testautomation_clipboard.c in Sources */ = {isa = PBXBuildFile; fileRef = F35E56BC2983130B00A43A5F /* testautomation_clipboard.c */; }; @@ -1312,7 +1312,7 @@ F35E56B62983130A00A43A5F /* testautomation_main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testautomation_main.c; sourceTree = ""; }; F35E56B72983130A00A43A5F /* testautomation_hints.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testautomation_hints.c; sourceTree = ""; }; F35E56B82983130A00A43A5F /* testautomation_render.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testautomation_render.c; sourceTree = ""; }; - F35E56B92983130B00A43A5F /* testautomation_rwops.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testautomation_rwops.c; sourceTree = ""; }; + F35E56B92983130B00A43A5F /* testautomation_iostream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testautomation_iostream.c; sourceTree = ""; }; F35E56BA2983130B00A43A5F /* testautomation_math.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testautomation_math.c; sourceTree = ""; }; F35E56BB2983130B00A43A5F /* testautomation_events.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testautomation_events.c; sourceTree = ""; }; F35E56BC2983130B00A43A5F /* testautomation_clipboard.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testautomation_clipboard.c; sourceTree = ""; }; @@ -1774,7 +1774,7 @@ F35E56C32983130D00A43A5F /* testautomation_platform.c */, F35E56C52983130D00A43A5F /* testautomation_rect.c */, F35E56B82983130A00A43A5F /* testautomation_render.c */, - F35E56B92983130B00A43A5F /* testautomation_rwops.c */, + F35E56B92983130B00A43A5F /* testautomation_iostream.c */, F35E56C82983130E00A43A5F /* testautomation_sdltest.c */, F35E56BE2983130C00A43A5F /* testautomation_stdlib.c */, F35E56CB2983130F00A43A5F /* testautomation_surface.c */, @@ -3355,7 +3355,7 @@ files = ( F35E56D12983130F00A43A5F /* testautomation_render.c in Sources */, F399C6512A7892D800C86979 /* testautomation_intrinsics.c in Sources */, - F35E56D22983130F00A43A5F /* testautomation_rwops.c in Sources */, + F35E56D22983130F00A43A5F /* testautomation_iostream.c in Sources */, F35E56E32983130F00A43A5F /* testautomation_surface.c in Sources */, F35E56DB2983130F00A43A5F /* testautomation_platform.c in Sources */, F35E56DD2983130F00A43A5F /* testautomation_rect.c in Sources */, diff --git a/docs/README-android.md b/docs/README-android.md index 588b43d0e..94260dab1 100644 --- a/docs/README-android.md +++ b/docs/README-android.md @@ -165,7 +165,7 @@ Loading assets Any files you put in the "app/src/main/assets" directory of your project directory will get bundled into the application package and you can load -them using the standard functions in SDL_rwops.h. +them using the standard functions in SDL_iostream.h. There are also a few Android specific functions that allow you to get other useful paths for saving and loading data: diff --git a/docs/README-migration.md b/docs/README-migration.md index 4b950bdb8..1e1ce4b11 100644 --- a/docs/README-migration.md +++ b/docs/README-migration.md @@ -1157,6 +1157,8 @@ The following symbols have been renamed: * RW_SEEK_END => SDL_IO_SEEK_END * RW_SEEK_SET => SDL_IO_SEEK_SET +SDL_rwops.h is now named SDL_iostream.h. + SDL_RWops is now an opaque structure, and has been renamed to SDL_IOStream. The SDL3 APIs to create an SDL_IOStream (SDL_IOFromFile, etc) are renamed but otherwise still function as they did in SDL2. However, to make a custom SDL_IOStream with app-provided function pointers, call SDL_OpenIO and provide the function pointers through there. To call into an SDL_IOStream's functionality, use the standard APIs (SDL_ReadIO, etc), as the function pointers are internal. The RWops function pointers are now in a separate structure called SDL_IOStreamInterface, which is provided to SDL_OpenIO when creating a custom SDL_IOStream implementation. All the functions now take a `void *` userdata argument for their first parameter instead of an SDL_IOStream, since that's now an opaque structure. diff --git a/include/SDL3/SDL.h b/include/SDL3/SDL.h index cb49d7aed..0b5ad6928 100644 --- a/include/SDL3/SDL.h +++ b/include/SDL3/SDL.h @@ -68,7 +68,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/SDL3/SDL_audio.h b/include/SDL3/SDL_audio.h index ba24bef9e..16820be6f 100644 --- a/include/SDL3/SDL_audio.h +++ b/include/SDL3/SDL_audio.h @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/SDL3/SDL_gamepad.h b/include/SDL3/SDL_gamepad.h index f09b03d41..c35adf3c4 100644 --- a/include/SDL3/SDL_gamepad.h +++ b/include/SDL3/SDL_gamepad.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/SDL3/SDL_rwops.h b/include/SDL3/SDL_iostream.h similarity index 99% rename from include/SDL3/SDL_rwops.h rename to include/SDL3/SDL_iostream.h index e79d2d844..6c32e6f61 100644 --- a/include/SDL3/SDL_rwops.h +++ b/include/SDL3/SDL_iostream.h @@ -20,14 +20,14 @@ */ /** - * \file SDL_rwops.h + * \file SDL_iostream.h * * This file provides a general interface for SDL to read and write * data streams. It can easily be extended to files, memory, etc. */ -#ifndef SDL_rwops_h_ -#define SDL_rwops_h_ +#ifndef SDL_iostream_h_ +#define SDL_iostream_h_ #include #include @@ -1004,4 +1004,4 @@ extern DECLSPEC SDL_bool SDLCALL SDL_WriteS64BE(SDL_IOStream *dst, Sint64 value) #endif #include -#endif /* SDL_rwops_h_ */ +#endif /* SDL_iostream_h_ */ diff --git a/include/SDL3/SDL_surface.h b/include/SDL3/SDL_surface.h index 84a93dbad..6ff5e6da3 100644 --- a/include/SDL3/SDL_surface.h +++ b/include/SDL3/SDL_surface.h @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include /* Set up for C function definitions, even when using C++ */ diff --git a/src/file/SDL_rwops.c b/src/file/SDL_iostream.c similarity index 99% rename from src/file/SDL_rwops.c rename to src/file/SDL_iostream.c index 5ebebf173..88eef41ff 100644 --- a/src/file/SDL_rwops.c +++ b/src/file/SDL_iostream.c @@ -46,11 +46,11 @@ struct SDL_IOStream #ifdef SDL_PLATFORM_APPLE -#include "cocoa/SDL_rwopsbundlesupport.h" +#include "cocoa/SDL_iostreambundlesupport.h" #endif /* SDL_PLATFORM_APPLE */ #ifdef SDL_PLATFORM_3DS -#include "n3ds/SDL_rwopsromfs.h" +#include "n3ds/SDL_iostreamromfs.h" #endif /* SDL_PLATFORM_3DS */ #ifdef SDL_PLATFORM_ANDROID diff --git a/src/file/cocoa/SDL_rwopsbundlesupport.h b/src/file/cocoa/SDL_iostreambundlesupport.h similarity index 93% rename from src/file/cocoa/SDL_rwopsbundlesupport.h rename to src/file/cocoa/SDL_iostreambundlesupport.h index 25f84f266..e7b337a75 100644 --- a/src/file/cocoa/SDL_rwopsbundlesupport.h +++ b/src/file/cocoa/SDL_iostreambundlesupport.h @@ -23,8 +23,8 @@ #include -#ifndef SDL_rwopsbundlesupport_h -#define SDL_rwopsbundlesupport_h +#ifndef SDL_iostreambundlesupport_h +#define SDL_iostreambundlesupport_h FILE *SDL_OpenFPFromBundleOrFallback(const char *file, const char *mode); #endif #endif diff --git a/src/file/cocoa/SDL_rwopsbundlesupport.m b/src/file/cocoa/SDL_iostreambundlesupport.m similarity index 98% rename from src/file/cocoa/SDL_rwopsbundlesupport.m rename to src/file/cocoa/SDL_iostreambundlesupport.m index d9d184ca7..93a7b4349 100644 --- a/src/file/cocoa/SDL_rwopsbundlesupport.m +++ b/src/file/cocoa/SDL_iostreambundlesupport.m @@ -23,7 +23,7 @@ #ifdef SDL_PLATFORM_APPLE #import -#include "SDL_rwopsbundlesupport.h" +#include "SDL_iostreambundlesupport.h" /* For proper macOS applications, the resources are contained inside the application bundle. So the strategy is to first check the application bundle for the file, then fallback to the current working directory. diff --git a/src/file/n3ds/SDL_rwopsromfs.c b/src/file/n3ds/SDL_iostreamromfs.c similarity index 98% rename from src/file/n3ds/SDL_rwopsromfs.c rename to src/file/n3ds/SDL_iostreamromfs.c index afa9e53c4..3af006b4b 100644 --- a/src/file/n3ds/SDL_rwopsromfs.c +++ b/src/file/n3ds/SDL_iostreamromfs.c @@ -19,7 +19,7 @@ 3. This notice may not be removed or altered from any source distribution. */ -#include "SDL_rwopsromfs.h" +#include "SDL_iostreamromfs.h" /* Checks if the mode is a kind of reading */ static SDL_bool IsReadMode(const char *mode); diff --git a/src/file/n3ds/SDL_rwopsromfs.h b/src/file/n3ds/SDL_iostreamromfs.h similarity index 91% rename from src/file/n3ds/SDL_rwopsromfs.h rename to src/file/n3ds/SDL_iostreamromfs.h index 572a71441..4f8827fab 100644 --- a/src/file/n3ds/SDL_rwopsromfs.h +++ b/src/file/n3ds/SDL_iostreamromfs.h @@ -20,9 +20,9 @@ */ #include "SDL_internal.h" -#ifndef SDL_rwopsromfs_h_ -#define SDL_rwopsromfs_h_ +#ifndef SDL_iostreamromfs_h_ +#define SDL_iostreamromfs_h_ FILE *N3DS_FileOpen(const char *file, const char *mode); -#endif /* SDL_rwopsromfs_h_ */ +#endif /* SDL_iostreamromfs_h_ */ diff --git a/test/README b/test/README index 4327b1d4f..74e4aed88 100644 --- a/test/README +++ b/test/README @@ -6,7 +6,7 @@ These are test programs for the SDL library: testsurround Audio test -- play test tone on each audio channel testaudioinfo Lists audio device capabilities testerror Tests multi-threaded error handling - testfile Tests RWops layer + testfile Tests SDL_IOStream layer testgl A very simple example of using OpenGL with SDL testiconv Tests international string conversion testkeys List the available keyboard keys diff --git a/test/testautomation_rwops.c b/test/testautomation_iostream.c similarity index 100% rename from test/testautomation_rwops.c rename to test/testautomation_iostream.c diff --git a/test/testfile.c b/test/testfile.c index 642bea611..30e41844e 100644 --- a/test/testfile.c +++ b/test/testfile.c @@ -10,7 +10,7 @@ freely. */ -/* sanity tests on SDL_rwops.c (useful for alternative implementations of stdio rwops) */ +/* sanity tests on SDL_iostream.c (useful for alternative implementations of stdio iostream) */ /* quiet windows compiler warnings */ #if defined(_MSC_VER) && !defined(_CRT_NONSTDC_NO_WARNINGS)