comparison src/sound.c @ 17610:c08a3c552c1d v8.1.1802

patch 8.1.1802: missing change to call_callback() commit https://github.com/vim/vim/commit/b2129068a55261bea1e293a6a1ce8491a03e7de6 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Aug 3 18:31:11 2019 +0200 patch 8.1.1802: missing change to call_callback() Problem: Missing change to call_callback(). Solution: Add missing change.
author Bram Moolenaar <Bram@vim.org>
date Sat, 03 Aug 2019 18:45:05 +0200
parents be5a5cfc991a
children fe637f192d80
comparison
equal deleted inserted replaced
17609:7c5f8c130300 17610:c08a3c552c1d
93 void *userdata) 93 void *userdata)
94 { 94 {
95 soundcb_T *soundcb = (soundcb_T *)userdata; 95 soundcb_T *soundcb = (soundcb_T *)userdata;
96 typval_T argv[3]; 96 typval_T argv[3];
97 typval_T rettv; 97 typval_T rettv;
98 int dummy;
99 98
100 argv[0].v_type = VAR_NUMBER; 99 argv[0].v_type = VAR_NUMBER;
101 argv[0].vval.v_number = id; 100 argv[0].vval.v_number = id;
102 argv[1].v_type = VAR_NUMBER; 101 argv[1].v_type = VAR_NUMBER;
103 argv[1].vval.v_number = error_code == CA_SUCCESS ? 0 102 argv[1].vval.v_number = error_code == CA_SUCCESS ? 0
104 : error_code == CA_ERROR_CANCELED 103 : error_code == CA_ERROR_CANCELED
105 || error_code == CA_ERROR_DESTROYED 104 || error_code == CA_ERROR_DESTROYED
106 ? 1 : 2; 105 ? 1 : 2;
107 argv[2].v_type = VAR_UNKNOWN; 106 argv[2].v_type = VAR_UNKNOWN;
108 107
109 call_callback(&soundcb->snd_callback, -1, 108 call_callback(&soundcb->snd_callback, -1, &rettv, 2, argv);
110 &rettv, 2, argv, NULL, 0L, 0L, &dummy, TRUE, NULL);
111 clear_tv(&rettv); 109 clear_tv(&rettv);
112 110
113 delete_sound_callback(soundcb); 111 delete_sound_callback(soundcb);
114 redraw_after_callback(TRUE); 112 redraw_after_callback(TRUE);
115 } 113 }
243 argv[1].vval.v_number = 241 argv[1].vval.v_number =
244 wParam == MCI_NOTIFY_SUCCESSFUL ? 0 242 wParam == MCI_NOTIFY_SUCCESSFUL ? 0
245 : wParam == MCI_NOTIFY_ABORTED ? 1 : 2; 243 : wParam == MCI_NOTIFY_ABORTED ? 1 : 2;
246 argv[2].v_type = VAR_UNKNOWN; 244 argv[2].v_type = VAR_UNKNOWN;
247 245
248 call_callback(&p->snd_callback, -1, 246 call_callback(&p->snd_callback, -1, &rettv, 2, argv);
249 &rettv, 2, argv, NULL, 0L, 0L, &dummy, TRUE, NULL);
250 clear_tv(&rettv); 247 clear_tv(&rettv);
251 248
252 delete_sound_callback(p); 249 delete_sound_callback(p);
253 redraw_after_callback(TRUE); 250 redraw_after_callback(TRUE);
254 251