Mercurial > vim
comparison src/ui.c @ 30719:71137f73c94d v9.0.0694
patch 9.0.0694: no native sound support on Mac OS
Commit: https://github.com/vim/vim/commit/4314e4f7da4db5d85f63cdf43b73be3689502c93
Author: Yee Cheng Chin <ychin.git@gmail.com>
Date: Sat Oct 8 13:50:05 2022 +0100
patch 9.0.0694: no native sound support on Mac OS
Problem: No native sound support on Mac OS.
Solution: Add sound support for Mac OS. (Yee Cheng Chin, closes https://github.com/vim/vim/issues/11274)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 08 Oct 2022 15:00:05 +0200 |
parents | c1c795a61545 |
children | 33ca088dbd3e |
comparison
equal
deleted
inserted
replaced
30718:118268e20251 | 30719:71137f73c94d |
---|---|
458 // timer may have used feedkeys() | 458 // timer may have used feedkeys() |
459 return FAIL; | 459 return FAIL; |
460 } | 460 } |
461 if (due_time <= 0 || (wtime > 0 && due_time > remaining)) | 461 if (due_time <= 0 || (wtime > 0 && due_time > remaining)) |
462 due_time = remaining; | 462 due_time = remaining; |
463 # if defined(FEAT_JOB_CHANNEL) || defined(FEAT_SOUND_CANBERRA) | 463 # if defined(FEAT_JOB_CHANNEL) || defined(FEAT_SOUND_CANBERRA) || defined(FEAT_SOUND_MACOSX) |
464 if ((due_time < 0 || due_time > 10L) && ( | 464 if ((due_time < 0 || due_time > 10L) && ( |
465 # if defined(FEAT_JOB_CHANNEL) | 465 # if defined(FEAT_JOB_CHANNEL) |
466 ( | 466 ( |
467 # if defined(FEAT_GUI) | 467 # if defined(FEAT_GUI) |
468 !gui.in_use && | 468 !gui.in_use && |
469 # endif | 469 # endif |
470 (has_pending_job() || channel_any_readahead())) | 470 (has_pending_job() || channel_any_readahead())) |
471 # ifdef FEAT_SOUND_CANBERRA | 471 # if defined(FEAT_SOUND_CANBERRA) || defined(FEAT_SOUND_MACOSX) |
472 || | 472 || |
473 # endif | 473 # endif |
474 # endif | 474 # endif |
475 # ifdef FEAT_SOUND_CANBERRA | 475 # if defined(FEAT_SOUND_CANBERRA) || defined(FEAT_SOUND_MACOSX) |
476 has_any_sound_callback() | 476 has_any_sound_callback() |
477 # endif | 477 # endif |
478 )) | 478 )) |
479 { | 479 { |
480 // There is a pending job or channel, should return soon in order | 480 // There is a pending job or channel, should return soon in order |