ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/AmigaOS/audio_amiga.cpp

Comparing BasiliskII/src/AmigaOS/audio_amiga.cpp (file contents):
Revision 1.3 by cebix, 1999-10-20T15:13:55Z vs.
Revision 1.6 by cebix, 1999-11-03T10:56:18Z

#	Line 57 | Line 57 | static int audio_block_fetched = 0;                            /
57
58
59		// Prototypes
60	<	static __saveds __regargs ULONG audio_callback(struct Hook *hook /*a0*/, struct AHISoundMessage *msg /*a1*/, struct AHIAudioCtrl *ahi_ctrl /*a2*/);
60	>	static __saveds __attribute__((regparm(3))) ULONG audio_callback(struct Hook *hook /*a0*/, struct AHISoundMessage *msg /*a1*/, struct AHIAudioCtrl *ahi_ctrl /*a2*/);
61
62
63		/*
#	Line 174 | Line 174 | void audio_exit_stream()
174		*  AHI sound callback, request next buffer
175		*/
176
177	<	static __saveds __regargs ULONG audio_callback(struct Hook *hook /*a0*/, struct AHISoundMessage *msg /*a1*/, struct AHIAudioCtrl *ahi_ctrl /*a2*/)
177	>	static __saveds __attribute__((regparm(3))) ULONG audio_callback(struct Hook *hook /*a0*/, struct AHISoundMessage *msg /*a1*/, struct AHIAudioCtrl *ahi_ctrl /*a2*/)
178		{
179		play_buf ^= 1;
180
#	Line 192 | Line 192 | static __saveds __regargs ULONG audio_ca
192
193		// Put data into AHI buffer (convert 8-bit data unsigned->signed)
194		if (AudioStatus.sample_size == 16)
195	<	memcpy(sample[play_buf].ahisi_Address, Mac2HostAddr(ReadMacInt32(apple_stream_info + scd_buffer)), work_size);
195	>	Mac2Host_memcpy(sample[play_buf].ahisi_Address, ReadMacInt32(apple_stream_info + scd_buffer), work_size);
196		else {
197		uint32 *p = (uint32 *)Mac2HostAddr(ReadMacInt32(apple_stream_info + scd_buffer));
198		uint32 *q = (uint32 *)sample[play_buf].ahisi_Address;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines