ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/include/audio.h
(Generate patch)

Comparing BasiliskII/src/include/audio.h (file contents):
Revision 1.1 by cebix, 1999-10-03T14:16:26Z vs.
Revision 1.10 by cebix, 2004-01-12T15:29:27Z

# Line 1 | Line 1
1   /*
2   *  audio.h - Audio support
3   *
4 < *  Basilisk II (C) 1997-1999 Christian Bauer
4 > *  Basilisk II (C) 1997-2004 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 21 | Line 21
21   #ifndef AUDIO_H
22   #define AUDIO_H
23  
24 + #include <vector>
25 +
26 + #ifndef NO_STD_NAMESPACE
27 + using std::vector;
28 + #endif
29 +
30   extern int32 AudioDispatch(uint32 params, uint32 ti);
31  
32   extern bool AudioAvailable;             // Flag: audio output available (from the software point of view)
33  
34 + extern int16 SoundInOpen(uint32 pb, uint32 dce);
35 + extern int16 SoundInPrime(uint32 pb, uint32 dce);
36 + extern int16 SoundInControl(uint32 pb, uint32 dce);
37 + extern int16 SoundInStatus(uint32 pb, uint32 dce);
38 + extern int16 SoundInClose(uint32 pb, uint32 dce);
39 +
40   // System specific and internal functions/data
41   extern void AudioInit(void);
42   extern void AudioExit(void);
43 + extern void AudioReset(void);
44  
45   extern void AudioInterrupt(void);
46  
47   extern void audio_enter_stream(void);
48   extern void audio_exit_stream(void);
49  
50 < extern void audio_set_sample_rate(int index);
51 < extern void audio_set_sample_size(int index);
52 < extern void audio_set_channels(int index);
50 > extern bool audio_set_sample_rate(int index);
51 > extern bool audio_set_sample_size(int index);
52 > extern bool audio_set_channels(int index);
53  
54   extern bool audio_get_main_mute(void);
55   extern uint32 audio_get_main_volume(void);
56 < extern bool audio_get_dac_mute(void);
57 < extern uint32 audio_get_dac_volume(void);
56 > extern bool audio_get_speaker_mute(void);
57 > extern uint32 audio_get_speaker_volume(void);
58   extern void audio_set_main_mute(bool mute);
59   extern void audio_set_main_volume(uint32 vol);
60 < extern void audio_set_dac_mute(bool mute);
61 < extern void audio_set_dac_volume(uint32 vol);
60 > extern void audio_set_speaker_mute(bool mute);
61 > extern void audio_set_speaker_volume(uint32 vol);
62  
63   // Current audio status
64   struct audio_status {
# Line 61 | Line 74 | extern bool audio_open;                                        // Flag: aud
74   extern int audio_frames_per_block;              // Number of audio frames per block
75   extern uint32 audio_component_flags;    // Component feature flags
76  
77 < extern int audio_num_sample_rates;              // Number of supported sample rates
78 < extern uint32 audio_sample_rates[];             // Array of supported sample rates (16.16 fixed point)
79 < extern int audio_num_sample_sizes;              // Number of supported sample sizes
67 < extern uint16 audio_sample_sizes[];             // Array of supported sample sizes
68 < extern int audio_num_channel_counts;    // Number of supported channel counts
69 < extern uint16 audio_channel_counts[];   // Array of supported channels counts
77 > extern vector<uint32> audio_sample_rates;       // Vector of supported sample rates (16.16 fixed point)
78 > extern vector<uint16> audio_sample_sizes;       // Vector of supported sample sizes
79 > extern vector<uint16> audio_channel_counts;     // Array of supported channels counts
80  
81   // Audio component global data and 68k routines
82   enum {
# Line 77 | Line 87 | enum {
87          adatSetInfo = 78,                       // 68k code to call SetInfo()
88          adatPlaySourceBuffer = 102,     // 68k code to call PlaySourceBuffer()
89          adatGetSourceData = 126,        // 68k code to call GetSourceData()
90 <        adatData = 146,                         // SoundComponentData struct
91 <        adatMixer = 174,                        // Mac address of mixer, returned by adatOpenMixer
92 <        adatStreamInfo = 178,           // Mac address of stream info, returned by adatGetSourceData
93 <        SIZEOF_adat = 182
90 >        adatStartSource = 146,          // 68k code to call StartSource()
91 >        adatData = 168,                         // SoundComponentData struct
92 >        adatMixer = 196,                        // Mac address of mixer, returned by adatOpenMixer
93 >        adatStreamInfo = 200,           // Mac address of stream info, returned by adatGetSourceData
94 >        SIZEOF_adat = 204
95   };
96  
97   extern uint32 audio_data;               // Mac address of global data area

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines