ViewVC Help

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

root/cebix/BasiliskII/src/audio.cpp

Comparing BasiliskII/src/audio.cpp (file contents):
Revision 1.1 by cebix, 1999-10-03T14:16:25Z vs.
Revision 1.2 by cebix, 1999-10-20T15:13:52Z

#	Line 113 | Line 113 | static int32 AudioGetInfo(uint32 infoPtr
113		}
114
115		case siSpeakerMute:
116	<	WriteMacInt16(infoPtr, audio_get_main_mute());
116	>	WriteMacInt16(infoPtr, audio_get_speaker_mute());
117		break;
118
119		case siSpeakerVolume:
120	<	WriteMacInt32(infoPtr, audio_get_main_volume());
120	>	WriteMacInt32(infoPtr, audio_get_speaker_volume());
121	>	break;
122	>
123	>	case siHeadphoneMute:
124	>	WriteMacInt16(infoPtr, 0);
125	>	break;
126	>
127	>	case siHeadphoneVolume:
128	>	WriteMacInt32(infoPtr, 0x01000100);
129	>	break;
130	>
131	>	case siHeadphoneVolumeSteps:
132	>	WriteMacInt16(infoPtr, 13);
133		break;
134
135		case siHardwareMute:
136	<	WriteMacInt16(infoPtr, audio_get_dac_mute());
136	>	WriteMacInt16(infoPtr, audio_get_main_mute());
137		break;
138
139		case siHardwareVolume:
140	<	WriteMacInt32(infoPtr, audio_get_dac_volume());
140	>	WriteMacInt32(infoPtr, audio_get_main_volume());
141		break;
142
143	<	case siHardwareBusy:
144	<	WriteMacInt16(infoPtr, AudioStatus.num_sources != 0);
143	>	case siHardwareVolumeSteps:
144	>	WriteMacInt16(infoPtr, 13);
145		break;
146
147	<	case siHardwareVolumeSteps:
148	<	WriteMacInt16(infoPtr, 64);
147	>	case siHardwareBusy:
148	>	WriteMacInt16(infoPtr, AudioStatus.num_sources != 0);
149		break;
150
151		default:        // Delegate to Apple Mixer
#	Line 197 | Line 209 | static int32 AudioSetInfo(uint32 infoPtr
209		return badChannel;
210
211		case siSpeakerMute:
212	<	audio_set_main_mute((uint16)infoPtr);
212	>	audio_set_speaker_mute((uint16)infoPtr);
213		break;
214
215		case siSpeakerVolume:
216		D(bug("  set speaker volume %08lx\n", infoPtr));
217	<	audio_set_main_volume(infoPtr);
217	>	audio_set_speaker_volume(infoPtr);
218	>	break;
219	>
220	>	case siHeadphoneMute:
221	>	case siHeadphoneVolume:
222		break;
223
224		case siHardwareMute:
225	<	audio_set_dac_mute((uint16)infoPtr);
225	>	audio_set_main_mute((uint16)infoPtr);
226		break;
227
228		case siHardwareVolume:
229		D(bug("  set hardware volume %08lx\n", infoPtr));
230	<	audio_set_dac_volume(infoPtr);
230	>	audio_set_main_volume(infoPtr);
231		break;
232
233		default:        // Delegate to Apple Mixer
#	Line 351 | Line 367 | adat_error:    printf("FATAL: audio compone
367		return noErr;
368
369		case kComponentVersionSelect:
370	<	return 0x00010002;
370	>	return 0x00010003;
371
372		case kComponentCloseSelect:
373		open_count--;

Diff Legend

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