ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/AmigaOS/audio_amiga.cpp
(Generate patch)

Comparing BasiliskII/src/AmigaOS/audio_amiga.cpp (file contents):
Revision 1.2 by cebix, 1999-10-19T19:28:14Z vs.
Revision 1.8 by cebix, 2001-02-02T20:52:57Z

# Line 1 | Line 1
1   /*
2   *  audio_amiga.cpp - Audio support, AmigaOS implementation using AHI
3   *
4 < *  Basilisk II (C) 1997-1999 Christian Bauer
4 > *  Basilisk II (C) 1997-2001 Christian Bauer
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# 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;
# Line 279 | Line 279 | uint32 audio_get_main_volume(void)
279          return 0x01000100;
280   }
281  
282 < bool audio_get_dac_mute(void)
282 > bool audio_get_speaker_mute(void)
283   {
284          return false;
285   }
286  
287 < uint32 audio_get_dac_volume(void)
287 > uint32 audio_get_speaker_volume(void)
288   {
289          return 0x01000100;
290   }
# Line 297 | Line 297 | void audio_set_main_volume(uint32 vol)
297   {
298   }
299  
300 < void audio_set_dac_mute(bool mute)
300 > void audio_set_speaker_mute(bool mute)
301   {
302   }
303  
304 < void audio_set_dac_volume(uint32 vol)
304 > void audio_set_speaker_volume(uint32 vol)
305   {
306   }

Diff Legend

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