Commit 952bc1c7 authored by Richard Leggett's avatar Richard Leggett
Browse files

!Run file change.

parent d7f75fa2
...@@ -14,7 +14,7 @@ RMEnsure Window 1.41 RMLoad System:modules.toolbox.window ...@@ -14,7 +14,7 @@ RMEnsure Window 1.41 RMLoad System:modules.toolbox.window
RMEnsure Window 1.41 Error You need Window 1.41 or later to run Sound Configure. RMEnsure Window 1.41 Error You need Window 1.41 or later to run Sound Configure.
RMEnsure Menu 0.28 RMLoad System:modules.toolbox.menu RMEnsure Menu 0.28 RMLoad System:modules.toolbox.menu
RMEnsure Menu 0.28 Error You need Menu 0.28 or later to run Sound Configure. RMEnsure Menu 0.28 Error You need Menu 0.28 or later to run Sound Configure.
RMEnsure SoundCtrl 0.00 Error You need SoundCtrl 0.00 or later to run Sound Configure. RMEnsure SoundControl 0.00 Error You need SoundControl 0.00 or later to run Sound Configure.
WimpSlot -min 256k -max 256k WimpSlot -min 256k -max 256k
Run <SoundConfig$Dir>.!RunImage %*0 Run <SoundConfig$Dir>.!RunImage %*0
No preview for this file type
...@@ -22,7 +22,10 @@ Version 0.04 (Richard Leggett) ...@@ -22,7 +22,10 @@ Version 0.04 (Richard Leggett)
Fri 05-Jun-98 Fri 05-Jun-98
- 'Sound configuration' renamed as 'Sound setup'. - 'Sound configuration' renamed as 'Sound setup'.
Checked in.
Wed 01-Jul-98 Wed 01-Jul-98
- Updated Res file. - Updated Res file.
Checked in.
Tue 11-Aug-98
- !Run file change.
\ No newline at end of file
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
#define SoundCtrl_SetVolume 0x50002 #define SoundCtrl_SetVolume 0x50002
#define SoundCtrl_ChannelInfo 0x50004 #define SoundCtrl_ChannelInfo 0x50004
#define Flag_LeftMuted 1u<<0 #define Flag_LeftMuted 1
#define Flag_RightMuted 2u<<1 #define Flag_RightMuted 2
/* SndSetup numbers channels from 0 to NumberOfChannels. The toolbox ID of the slider /* SndSetup numbers channels from 0 to NumberOfChannels. The toolbox ID of the slider
gadget equals this channel number. However, SoundCtrl adopts different numbering, so gadget equals this channel number. However, SoundCtrl adopts different numbering, so
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
static char *channel_name[NumberOfChannels] = { "Master", "System", "CD", "Line", static char *channel_name[NumberOfChannels] = { "Master", "System", "CD", "Line",
"Mic", "Capture", "Playback", "Wavetable" }; "Mic", "Capture", "Playback", "Wavetable" };
static int channel_no[NumberOfChannels] = { 0, 11, 2, 1, static int channel_no[NumberOfChannels] = { 0, 11, 2, 1,
5, 12, 8, 10 }; 5, 12, 8, 3 };
static int min_volume[NumberOfChannels]; static int min_volume[NumberOfChannels];
static int menu_to_voice_map[16]; static int menu_to_voice_map[16];
static int cmos_voice, cmos_volume; static int cmos_voice, cmos_volume;
...@@ -110,8 +110,14 @@ void sound_set_volume(int channel, int volume) ...@@ -110,8 +110,14 @@ void sound_set_volume(int channel, int volume)
int flags; int flags;
/* If volume is minimum value, then mute instead */ /* If volume is minimum value, then mute instead */
if (volume == min_volume[channel]) flags = Flag_LeftMuted + Flag_RightMuted; if (volume == min_volume[channel])
else flags = 0; {
flags = Flag_LeftMuted + Flag_RightMuted;
}
else
{
flags = 0;
}
/* Convert a volume integer (db*10 eg. -125 means -12.5db) into 32bit with 16bit fraction */ /* Convert a volume integer (db*10 eg. -125 means -12.5db) into 32bit with 16bit fraction */
db = (1<<16) * ((float)volume) / 10; db = (1<<16) * ((float)volume) / 10;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment