comparison src/sunplay.c @ 613:023b83f4e54b

[xemacs-hg @ 2001-06-10 10:42:16 by ben] ------ signal-code changes ------ data.c, device-tty.c, emacs.c, floatfns.c, linuxplay.c, nas.c, process-unix.c, signal.c, sunplay.c, sysdep.c, syssignal.h: use EMACS_SIGNAL everywhere instead of playing preprocessing games with signal(). s\windowsnt.h, s\mingw32.h, syssignal.h: Remove mswindows signal code from s+m headers and move to syssignal.h as one of the five ways of signal handling, instead of playing preprocessing games. fileio.c, sysdep.c: Rename sys_do_signal to qxe_reliable_signal. signal.c, process-unix.c, profile.c: Create set_timeout_signal(); use instead of just EMACS_SIGNAL to establish a signal handler on a timeout signal; this does special things under Cygwin. nt.c: Eliminate term_ntproc(), which is blank; used as a SIGABRT handler, which was wrong anyway. nt.c, win32.c: Move signal code from nt.c to win32.c, since Cygwin needs it too when dealing with timeout signals. s\cygwin32.h: Define CYGWIN_BROKEN_SIGNALS. ------ other changes ------ s\mingw32.h: Fix problems with NOT_C_CODE being in the wrong place and excluding defines needed when building Makefile.in.in. filelock.c, mule-canna.c, mule-ccl.c, mule-ccl.h, ralloc.c, unexalpha.c, unexapollo.c, unexcw.c, unexelfsgi.c, unexnt.c, unexsni.c, s\aix3-1.h, s\bsd4-1.h, s\bsd4-2.h, s\bsd4-3.h, s\cxux.h, s\cygwin32.h, s\dgux.h, s\dgux5-4r2.h, s\dgux5-4r3.h, s\dgux5-4r4.h, s\ewsux5r4.h, s\gnu.h, s\hpux.h, s\iris3-5.h, s\iris3-6.h, s\irix3-3.h, s\linux.h, s\mingw32.h, s\newsos5.h, s\nextstep.h, s\ptx.h, s\riscix1-1.h, s\riscix1-2.h, s\rtu.h, s\sco4.h, s\sco5.h, s\template.h, s\ultrix.h, s\umax.h, s\umips.h, s\unipl5-0.h, s\unipl5-2.h, s\usg5-0.h, s\usg5-2-2.h, s\usg5-2.h, s\usg5-3.h, s\usg5-4.h, s\windowsnt.h, s\xenix.h: Rename 'GNU Emacs' to XEmacs in the copyright and comments. nas.c: Stylistic cleanup. Avoid preprocessing games with names such as play_sound_file. ------ signal-code changes ------ data.c, device-tty.c, emacs.c, floatfns.c, linuxplay.c, nas.c, process-unix.c, signal.c, sunplay.c, sysdep.c, syssignal.h: use EMACS_SIGNAL everywhere instead of playing preprocessing games with signal(). s\windowsnt.h, s\mingw32.h, syssignal.h: Remove mswindows signal code from s+m headers and move to syssignal.h as one of the five ways of signal handling, instead of playing preprocessing games. fileio.c, sysdep.c: Rename sys_do_signal to qxe_reliable_signal. signal.c, process-unix.c, profile.c: Create set_timeout_signal(); use instead of just EMACS_SIGNAL to establish a signal handler on a timeout signal; this does special things under Cygwin. nt.c: Eliminate term_ntproc(), which is blank; used as a SIGABRT handler, which was wrong anyway. nt.c, win32.c: Move signal code from nt.c to win32.c, since Cygwin needs it too when dealing with timeout signals. s\cygwin32.h: Define CYGWIN_BROKEN_SIGNALS. ------ other changes ------ s\mingw32.h: Fix problems with NOT_C_CODE being in the wrong place and excluding defines needed when building Makefile.in.in. filelock.c, mule-canna.c, mule-ccl.c, mule-ccl.h, ralloc.c, unexalpha.c, unexapollo.c, unexcw.c, unexelfsgi.c, unexnt.c, unexsni.c, s\aix3-1.h, s\bsd4-1.h, s\bsd4-2.h, s\bsd4-3.h, s\cxux.h, s\cygwin32.h, s\dgux.h, s\dgux5-4r2.h, s\dgux5-4r3.h, s\dgux5-4r4.h, s\ewsux5r4.h, s\gnu.h, s\hpux.h, s\iris3-5.h, s\iris3-6.h, s\irix3-3.h, s\linux.h, s\mingw32.h, s\newsos5.h, s\nextstep.h, s\ptx.h, s\riscix1-1.h, s\riscix1-2.h, s\rtu.h, s\sco4.h, s\sco5.h, s\template.h, s\ultrix.h, s\umax.h, s\umips.h, s\unipl5-0.h, s\unipl5-2.h, s\usg5-0.h, s\usg5-2-2.h, s\usg5-2.h, s\usg5-3.h, s\usg5-4.h, s\windowsnt.h, s\xenix.h: Rename 'GNU Emacs' to XEmacs in the copyright and comments. nas.c: Stylistic cleanup. Avoid preprocessing games with names such as play_sound_file. xemacs-faq.texi: Update sections on Windows and MacOS availability. alist.el, apropos.el, autoload.el, bytecomp.el, cl-compat.el, cl-extra.el, cl-macs.el, cl-seq.el, cl.el, cmdloop.el, cus-edit.el, derived.el, gpm.el, itimer.el, lisp-mode.el, shadow.el, version.el, wid-browse.el: Rename 'GNU Emacs' to XEmacs in the copyright. Fix other references to GNU Emacs that should be XEmacs or just Emacs. files.el: Fix warning. simple.el: transpose-line-up/down will now move the region up or down by a line if active. cvtmail.c, fakemail.c, gnuserv.c, gnuserv.h, gnuslib.c, make-msgfile.c, make-path.c, pop.c, pop.h, profile.c, tcp.c: Rename 'GNU Emacs' to XEmacs in the copyright. Fix comments in similar ways. digest-doc.c, sorted-doc.c: Fix program and author name to reflect XEmacs.
author ben
date Sun, 10 Jun 2001 10:42:39 +0000
parents 13e3d7ae7155
children 943eaba38521
comparison
equal deleted inserted replaced
612:ff0d9e7facba 613:023b83f4e54b
142 sound_perror ("open /dev/audio"); 142 sound_perror ("open /dev/audio");
143 return; 143 return;
144 } 144 }
145 145
146 /* where to find the proto for signal()... */ 146 /* where to find the proto for signal()... */
147 sighup_handler = (SIGTYPE (*) (int)) signal (SIGHUP, sighandler); 147 sighup_handler = (SIGTYPE (*) (int)) EMACS_SIGNAL (SIGHUP, sighandler);
148 sigint_handler = (SIGTYPE (*) (int)) signal (SIGINT, sighandler); 148 sigint_handler = (SIGTYPE (*) (int)) EMACS_SIGNAL (SIGINT, sighandler);
149 149
150 file_fd = open (sound_file, O_RDONLY, 0); 150 file_fd = open (sound_file, O_RDONLY, 0);
151 if (file_fd < 0) 151 if (file_fd < 0)
152 { 152 {
153 sound_perror (sound_file); 153 sound_perror (sound_file);
200 { 200 {
201 reset_device (1); 201 reset_device (1);
202 close (audio_fd); 202 close (audio_fd);
203 } 203 }
204 204
205 signal (SIGHUP, sighup_handler); 205 EMACS_SIGNAL (SIGHUP, sighup_handler);
206 signal (SIGINT, sigint_handler); 206 EMACS_SIGNAL (SIGINT, sigint_handler);
207 } 207 }
208 208
209 209
210 int 210 int
211 play_sound_data (UChar_Binary *data, int length, int volume) 211 play_sound_data (UChar_Binary *data, int length, int volume)
233 audio_fd = audio_open (); 233 audio_fd = audio_open ();
234 if (audio_fd < 0) 234 if (audio_fd < 0)
235 return 0; 235 return 0;
236 236
237 /* where to find the proto for signal()... */ 237 /* where to find the proto for signal()... */
238 sighup_handler = (SIGTYPE (*) (int)) signal (SIGHUP, sighandler); 238 sighup_handler = (SIGTYPE (*) (int)) EMACS_SIGNAL (SIGHUP, sighandler);
239 sigint_handler = (SIGTYPE (*) (int)) signal (SIGINT, sighandler); 239 sigint_handler = (SIGTYPE (*) (int)) EMACS_SIGNAL (SIGINT, sighandler);
240 240
241 if (init_device (volume, data, 0, &ilen)) 241 if (init_device (volume, data, 0, &ilen))
242 goto END_OF_PLAY; 242 goto END_OF_PLAY;
243 243
244 data += (ilen<<2); 244 data += (ilen<<2);
278 { 278 {
279 reset_device (1); 279 reset_device (1);
280 close (audio_fd); 280 close (audio_fd);
281 } 281 }
282 282
283 signal (SIGHUP, sighup_handler); 283 EMACS_SIGNAL (SIGHUP, sighup_handler);
284 signal (SIGINT, sigint_handler); 284 EMACS_SIGNAL (SIGINT, sigint_handler);
285 285
286 return result; 286 return result;
287 } 287 }
288 288
289 /* #### sigcontext doesn't exist in Solaris. This should be updated 289 /* #### sigcontext doesn't exist in Solaris. This should be updated