!Run file change.

Resources/!Run,feb

@@ -8,13 +8,13 @@ IF "<Choices$Write>" = "" THEN Error No !Boot application has been run.
 Set SoundConfig$Dir <Obey$Dir>
 Iconsprites <SoundConfig$Dir>.!Sprites
 
-RMEnsure Toolbox   1.36  RMLoad System:modules.toolbox.toolbox
-RMEnsure Toolbox   1.36  Error You need Toolbox 1.36 or later to run Sound Configure
-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 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 SoundCtrl 0.00  Error You need SoundCtrl 0.00 or later to run Sound Configure.
+RMEnsure Toolbox      1.36  RMLoad System:modules.toolbox.toolbox
+RMEnsure Toolbox      1.36  Error You need Toolbox 1.36 or later to run Sound Configure
+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 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 SoundControl 0.00  Error You need SoundControl 0.00 or later to run Sound Configure.
 
 WimpSlot -min 256k -max 256k
 Run <SoundConfig$Dir>.!RunImage %*0

UrsulaLog

@@ -22,7 +22,10 @@ Version 0.04 (Richard Leggett)
 Fri 05-Jun-98
   - 'Sound configuration' renamed as 'Sound setup'.
 
+Wed 01-Jul-98
+  - Updated Res file.
+  
 Checked in.
 
-Wed 01-Jul-98
-  - Updated Res file.
\ No newline at end of file
+Tue 11-Aug-98
+  - !Run file change.
\ No newline at end of file

c/sound

@@ -33,8 +33,8 @@
 
 #define SoundCtrl_SetVolume   0x50002
 #define SoundCtrl_ChannelInfo 0x50004
-#define Flag_LeftMuted     1u<<0
-#define Flag_RightMuted    2u<<1
+#define Flag_LeftMuted     1
+#define Flag_RightMuted    2
 
 /* SndSetup numbers channels from 0 to NumberOfChannels. The toolbox ID of the slider
    gadget equals this channel number. However, SoundCtrl adopts different numbering, so
@@ -45,7 +45,7 @@
 static char *channel_name[NumberOfChannels] = { "Master",  "System",   "CD",       "Line",
                                                 "Mic",     "Capture",  "Playback", "Wavetable" };
 static int   channel_no[NumberOfChannels] =   {  0,         11,         2,          1,
-                                                 5,         12,         8,         10 };
+                                                 5,         12,         8,          3 };
 static int   min_volume[NumberOfChannels];
 static int   menu_to_voice_map[16];
 static int   cmos_voice, cmos_volume;
@@ -110,8 +110,14 @@ void sound_set_volume(int channel, int volume)
     int   flags;
 
     /* If volume is minimum value, then mute instead */
-    if (volume == min_volume[channel]) flags = Flag_LeftMuted + Flag_RightMuted;
-    else flags = 0;
+    if (volume == min_volume[channel])
+    {
+        flags = Flag_LeftMuted + Flag_RightMuted;
+    }
+    else
+    {
+        flags = 0;
+    }
 
     /* Convert a volume integer (db*10 eg. -125 means -12.5db) into 32bit with 16bit fraction */
     db = (1<<16) * ((float)volume) / 10;