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.1 by cebix, 1999-10-03T14:16:25Z vs.
Revision 1.4 by cebix, 1999-10-21T22:39:56Z

# Line 57 | Line 57 | static int audio_block_fetched = 0;                            /
57  
58  
59   // Prototypes
60 < static __saveds __asm ULONG audio_callback(register __a0 struct Hook *hook, register __a2 struct AHIAudioCtrl *ahi_ctrl, register __a1 struct AHISoundMessage *msg);
60 > #ifdef __GNUC__
61 > static __saveds __attribute__((regparm(3))) ULONG audio_callback(struct Hook *hook /*a0*/, struct AHISoundMessage *msg /*a1*/, struct AHIAudioCtrl *ahi_ctrl /*a2*/);
62 > #else
63 > static __saveds __regargs ULONG audio_callback(struct Hook *hook /*a0*/, struct AHISoundMessage *msg /*a1*/, struct AHIAudioCtrl *ahi_ctrl /*a2*/);
64 > #endif
65  
66  
67   /*
# Line 174 | Line 178 | void audio_exit_stream()
178   *  AHI sound callback, request next buffer
179   */
180  
181 < static __saveds __asm ULONG audio_callback(register __a0 struct Hook *hook, register __a2 struct AHIAudioCtrl *ahi_ctrl, register __a1 struct AHISoundMessage *msg)
181 > #ifdef __GNUC__
182 > static __saveds __attribute__((regparm(3))) ULONG audio_callback(struct Hook *hook /*a0*/, struct AHISoundMessage *msg /*a1*/, struct AHIAudioCtrl *ahi_ctrl /*a2*/)
183 > #else
184 > static __saveds __regargs ULONG audio_callback(struct Hook *hook /*a0*/, struct AHISoundMessage *msg /*a1*/, struct AHIAudioCtrl *ahi_ctrl /*a2*/)
185 > #endif
186   {
187          play_buf ^= 1;
188  
# Line 279 | Line 287 | uint32 audio_get_main_volume(void)
287          return 0x01000100;
288   }
289  
290 < bool audio_get_dac_mute(void)
290 > bool audio_get_speaker_mute(void)
291   {
292          return false;
293   }
294  
295 < uint32 audio_get_dac_volume(void)
295 > uint32 audio_get_speaker_volume(void)
296   {
297          return 0x01000100;
298   }
# Line 297 | Line 305 | void audio_set_main_volume(uint32 vol)
305   {
306   }
307  
308 < void audio_set_dac_mute(bool mute)
308 > void audio_set_speaker_mute(bool mute)
309   {
310   }
311  
312 < void audio_set_dac_volume(uint32 vol)
312 > void audio_set_speaker_volume(uint32 vol)
313   {
314   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines