fix(macos): address PR review comments from Copilot

Author: ShresthSamyak

mpv.py

@@ -842,7 +842,7 @@ def update(self, filename=None, size=None, stride=None, pos=None):
         w, h = self.size  # type: ignore
         stride = self.stride or 4*w
 
-        self.m.overlay_add(self, self.overlay_id, x, y, self.filename, 0, 'bgra', w, h, stride)  # pyre-ignore
+        self.m.overlay_add(self.overlay_id, x, y, self.filename, 0, 'bgra', w, h, stride)  # pyre-ignore
 
     def remove(self):
         self.m.remove_overlay(self.overlay_id)
@@ -1115,6 +1115,8 @@ def observer(name, val):
                 except:
                     pass
 
+        err_unregister = lambda: None
+
         try:
             result.set_running_or_notify_cancel()
 

tests/test_mpv.py

@@ -990,3 +990,63 @@ def t(self, *args, **kw):
         m.slang = 'ru'
         m.terminate() # needed for synchronization of event thread
         handler.assert_has_calls([mock.call('slang', ['jp']), mock.call('slang', ['ru'])])
+
+class TestMacOSWait(MpvTestCase):
+    @mock.patch('sys.platform', 'darwin')
+    def test_macos_wait_for_future(self):
+        future = Future()
+        
+        with mock.patch('threading.current_thread') as mock_current_thread, \
+             mock.patch('threading.main_thread') as mock_main_thread, \
+             mock.patch('ctypes.cdll.LoadLibrary') as mock_load_library, \
+             mock.patch('ctypes.util.find_library') as mock_find_library:
+            
+            # Make sure threading check passes
+            mock_current_thread.return_value = 'main'
+            mock_main_thread.return_value = 'main'
+            
+            # Setup CFRunLoopRunInMode mock
+            mock_cf = mock.Mock()
+            mock_load_library.return_value = mock_cf
+            
+            # Reset globals from mpv module to force re-initialization
+            mpv._core_foundation = None
+            mpv._cf_runloop_default_mode = None
+            
+            def resolve_future():
+                time.sleep(0.1)
+                try:
+                    future.set_result('success')
+                except InvalidStateError:
+                    pass
+                
+            threading.Thread(target=resolve_future).start()
+            
+            res = self.m._wait_for_future(future, timeout=1.0)
+            
+            self.assertEqual(res, 'success')
+            self.assertTrue(mock_cf.CFRunLoopRunInMode.called)
+
+    @mock.patch('sys.platform', 'darwin')
+    def test_macos_wait_for_future_timeout(self):
+        future = Future()
+        
+        with mock.patch('threading.current_thread') as mock_current_thread, \
+             mock.patch('threading.main_thread') as mock_main_thread, \
+             mock.patch('ctypes.cdll.LoadLibrary') as mock_load_library, \
+             mock.patch('ctypes.util.find_library') as mock_find_library:
+            
+            mock_current_thread.return_value = 'main'
+            mock_main_thread.return_value = 'main'
+            
+            mock_cf = mock.Mock()
+            mock_load_library.return_value = mock_cf
+            
+            mpv._core_foundation = None
+            mpv._cf_runloop_default_mode = None
+            
+            from concurrent.futures import TimeoutError
+            with self.assertRaises(TimeoutError):
+                self.m._wait_for_future(future, timeout=0.1)
+                
+            self.assertTrue(mock_cf.CFRunLoopRunInMode.called)