ci

kasper93 · Oct 26, 2023 · 4763e05 · 4763e05
1 parent 31019e2
commit 4763e05
Show file tree

Hide file tree

Showing 87 changed files with 144 additions and 3,986 deletions.
diff --git a/audio/out/ao_wasapi.h b/audio/out/ao_wasapi.h
@@ -31,7 +31,7 @@
 #include <endpointvolume.h>
 
 #include "common/msg.h"
-#include "osdep/windows_utils.h"
+#include <osdep/win32/utils.h>
 #include "internal.h"
 #include "ao.h"
 

diff --git a/input/input.c b/input/input.c
@@ -51,7 +51,7 @@
 #include "common/common.h"
 
 #if HAVE_COCOA
-#include "osdep/macosx_events.h"
+#include "events.h"
 #endif
 
 #define input_lock(ictx)    pthread_mutex_lock(&ictx->mutex)

diff --git a/input/ipc-win.c b/input/ipc-win.c
@@ -20,7 +20,7 @@
 
 #include "osdep/io.h"
 #include "osdep/threads.h"
-#include "osdep/windows_utils.h"
+#include <osdep/win32/utils.h>
 
 #include "common/common.h"
 #include "common/global.h"

diff --git a/meson.build b/meson.build
@@ -246,7 +246,7 @@ sources = files(
 
     ## osdep
     'osdep/io.c',
-    'osdep/semaphore_osx.c',
+    'osdep/darwin/semaphore.c',
     'osdep/subprocess.c',
     'osdep/threads.c',
     'osdep/timer.c',
@@ -395,40 +395,40 @@ cocoa = dependency('appleframeworks', modules: ['Cocoa', 'IOKit', 'QuartzCore'],
 features += {'cocoa': cocoa.found()}
 if features['cocoa']
     dependencies += cocoa
-    sources += files('osdep/apple_utils.c',
-                     'osdep/language-apple.c',
-                     'osdep/macosx_application.m',
-                     'osdep/macosx_events.m',
-                     'osdep/macosx_menubar.m',
-                     'osdep/main-fn-cocoa.c',
-                     'osdep/path-macosx.m',
+    sources += files('osdep/darwin/utils.c',
+                     'osdep/darwin/language.c',
+                     'osdep/darwin/application.m',
+                     'osdep/darwin/events.m',
+                     'osdep/darwin/menubar.m',
+                     'osdep/darwin/main-fn.c',
+                     'osdep/darwin/path.m',
                      'video/out/cocoa_common.m',
                      'video/out/cocoa/events_view.m',
                      'video/out/cocoa/video_view.m',
                      'video/out/cocoa/window.m')
 endif
 
 if posix
-    path_source = files('osdep/path-unix.c')
-    subprocess_source = files('osdep/subprocess-posix.c')
+    path_source = files('osdep/unix/path.c')
+    subprocess_source = files('osdep/unix/subprocess.c')
     sources += files('input/ipc-unix.c',
-                     'osdep/poll_wrapper.c',
-                     'osdep/terminal-unix.c',
+                     'osdep/unix/poll_wrapper.c',
+                     'osdep/unix/terminal.c',
                      'sub/filter_regex.c')
 endif
 
 if posix and not features['cocoa']
-    sources += files('osdep/main-fn-unix.c',
-                     'osdep/language-posix.c')
+    sources += files('osdep/unix/main-fn.c',
+                     'osdep/unix/language.c')
 endif
 
 if darwin
-    path_source = files('osdep/path-darwin.c')
-    timer_source = files('osdep/timer-darwin.c')
+    path_source = files('osdep/darwin/path.c')
+    timer_source = files('osdep/darwin/timer.c')
 endif
 
 if posix and not darwin
-    timer_source = files('osdep/timer-linux.c')
+    timer_source = files('osdep/unix/timer.c')
 endif
 
 features += {'ppoll': cc.has_function('ppoll', args: '-D_GNU_SOURCE',
@@ -479,15 +479,15 @@ uwp = cc.find_library('windowsapp', required: uwp_opt)
 features += {'uwp': uwp.found()}
 if features['uwp']
     dependencies += uwp
-    path_source = files('osdep/path-uwp.c')
+    path_source = files('osdep/uwp/path.c')
     subprocess_source = []
 endif
 
 features += {'win32-executable': win32 and get_option('cplayer')}
 if win32
-    timer_source = files('osdep/timer-win32.c')
-    sources += files('osdep/w32_keyboard.c',
-                     'osdep/windows_utils.c')
+    timer_source = files('osdep/win32/timer.c')
+    sources += files('osdep/win32/keyboard.c',
+                     'osdep/win32/utils.c')
 endif
 
 features += {'win32-desktop': win32 and not uwp.found()}
@@ -501,12 +501,12 @@ if features['win32-desktop']
                           cc.find_library('version'),
                           cc.find_library('winmm')]
     dependencies += win32_desktop_libs
-    path_source = files('osdep/path-win.c')
-    subprocess_source = files('osdep/subprocess-win.c')
+    path_source = files('osdep/win32/path.c')
+    subprocess_source = files('osdep/win32/subprocess.c')
     sources += files('input/ipc-win.c',
-                     'osdep/language-win.c',
-                     'osdep/main-fn-win.c',
-                     'osdep/terminal-win.c',
+                     'osdep/win32/language.c',
+                     'osdep/win32/main-fn.c',
+                     'osdep/win32/terminal.c',
                      'video/out/w32_common.c',
                      'video/out/win32/displayconfig.c',
                      'video/out/win32/droptarget.c')
@@ -519,12 +519,12 @@ endif
 
 features += {'glob-posix': cc.has_function('glob', prefix: '#include <glob.h>')}
 
-features += {'glob-win32': win32 and not posix}
+features += {'glob-win32': win32 and not features['glob-posix']}
 if features['glob-win32']
-    sources += files('osdep/glob-win.c')
+    sources += files('osdep/win32/glob.c')
 endif
 
-features += {'glob': features['glob-posix'] or features['glob-win32']}
+features += {'glob': features['glob-posix']}
 
 features += {'vt.h': cc.has_header_symbol('sys/vt.h', 'VT_GETMODE')}
 
@@ -589,6 +589,9 @@ if darwin
     subdir(join_paths('TOOLS', 'osxbundle'))
 endif
 
+if win32
+    subdir('osdep' / 'win32')
+endif
 
 # misc dependencies
 features += {'av-channel-layout': libavutil.version().version_compare('>= 57.24.100')}
@@ -1530,12 +1533,12 @@ features += {'swift': swift.allowed()}
 
 swift_sources = []
 if features['cocoa'] and features['swift']
-    swift_sources += files('osdep/macos/libmpv_helper.swift',
-                           'osdep/macos/log_helper.swift',
-                           'osdep/macos/mpv_helper.swift',
-                           'osdep/macos/precise_timer.swift',
-                           'osdep/macos/swift_compat.swift',
-                           'osdep/macos/swift_extensions.swift',
+    swift_sources += files('osdep/darwin/libmpv_helper.swift',
+                           'osdep/darwin/log_helper.swift',
+                           'osdep/darwin/mpv_helper.swift',
+                           'osdep/darwin/precise_timer.swift',
+                           'osdep/darwin/swift_compat.swift',
+                           'osdep/darwin/swift_extensions.swift',
                            'video/out/mac/common.swift',
                            'video/out/mac/title_bar.swift',
                            'video/out/mac/view.swift',
@@ -1563,7 +1566,7 @@ macos_media_player = get_option('macos-media-player').require(
 )
 features += {'macos-media-player': macos_media_player.allowed()}
 if features['macos-media-player']
-    swift_sources += files('osdep/macos/remote_command_center.swift')
+    swift_sources += files('osdep/darwin/remote_command_center.swift')
 endif
 
 if features['swift'] and swift_sources.length() > 0
@@ -1703,9 +1706,9 @@ if win32
                  'etc/mpv-icon-8bit-64x64.png',
                  'etc/mpv-icon-8bit-128x128.png',
                  'etc/mpv-icon.ico',
-                 'osdep/mpv.exe.manifest']
+                 'osdep/win32/mpv.exe.manifest']
 
-    sources += windows.compile_resources('osdep/mpv.rc', args: res_flags, depend_files: resources,
+    sources += windows.compile_resources('osdep/win32/mpv.rc', args: res_flags, depend_files: resources,
                                          depends: version_h, include_directories: res_includes)
 endif
 

diff --git a/osdep/apple_utils.c b/osdep/apple_utils.c
diff --git a/osdep/apple_utils.h b/osdep/apple_utils.h
diff --git a/osdep/language-apple.c b/osdep/language-apple.c
diff --git a/osdep/macOS_swift_bridge.h b/osdep/macOS_swift_bridge.h