Changeset 153 for sbliveos2/trunk/sblive/mixer.c

Timestamp:

Jul 23, 2000, 6:21:57 PM (25 years ago)

Author:

sandervl

Message:

update

File:

• sbliveos2/trunk/sblive/mixer.c (modified) (7 diffs)

sbliveos2/trunk/sblive/mixer.c

@@ -269 +269 @@
 #endif //TARGET_OS2
 
-u32 bass_table[41][5] = {
+static const u32 bass_table[41][5] = {
         { 0x3e4f844f, 0x84ed4cc3, 0x3cc69927, 0x7b03553a, 0xc4da8486 },
         { 0x3e69a17a, 0x84c280fb, 0x3cd77cd4, 0x7b2f2a6f, 0xc4b08d1d },
@@ -313 +313 @@
 };
 
-u32 treble_table[41][5] = {
+static const u32 treble_table[41][5] = {
         { 0x0125cba9, 0xfed5debd, 0x00599b6c, 0x0d2506da, 0xfa85b354 },
         { 0x0142f67e, 0xfeb03163, 0x0066cd0f, 0x0d14c69d, 0xfa914473 },
@@ -381 +381 @@
 }
 
-u32 db_table[101] = {
+static const u32 db_table[101] = {
         0x00000000, 0x01571f82, 0x01674b41, 0x01783a1b, 0x0189f540,
         0x019c8651, 0x01aff763, 0x01c45306, 0x01d9a446, 0x01eff6b8,
@@ -441 +441 @@
         }
 
-        for (i = 0; i < 18; i++) {
+        for (i = 0; i < 36; i++) {
                 if (card->digmix[i] != 0x80000000) {
-                        if ((i >= 0) && (i < 4))
+                        if (((i >= 0) && (i < 4)) || ((i >= 18) && (i < 22)))
                                 j = (i & 1) ? ((u64) db_table[r1] * (u64) db_table[r3]) : ((u64) db_table[l1] * (u64) db_table[l3]);
-                        else if ((i == 6) || (i == 7))
+                        else if ((i == 6) || (i == 7) || (i == 24) || (i == 25))
                                 j = (i & 1) ? ((u64) db_table[r1] * (u64) db_table[r4]) : ((u64) db_table[l1] * (u64) db_table[l4]);
                         else
@@ -467 +467 @@
         }
 
-        for (i = 18; i <= 90; i += 18) {
+        for (i = 36; i <= 90; i += 18) {
                 if (i != 72) {
                         for (k = 0; k < 4; k++)
@@ -489 +489 @@
 #ifdef PRIVATE_PCM_VOLUME
 
+static  unsigned char LinToLog[100] = {  0,   0,   0,   0,   
+                                         1,   2,   2,   5,   5,  10,  10,  10, 
+                                        16,  19,  20,  22,  24,  25,  27,  27, 
+                                        28,  28,  29,  30,  30,  35,  35,  35,
+                                        39,  39,  43,  45,  47,  49,  50,  50,
+                                        60,  60,  70,  72,  72,  74,  74,  74,
+                                        75,  75,  76,  77,  78,  80,  82,  83,
+                                        85,  85,  85,  88,  88,  88,  88,  90,
+                                        90,  93,  93,  93,  95,  95,  95,  95,
+                                        95,  95,  95,  96,  96,  97,  97,  98,
+                                        98,  98,  98,  99,  99,  99,  99,  99,
+                                        99,  99,  99,  99, 100, 100, 100, 100,
+                                       100, 100, 100, 100, 100, 100, 100, 100};
+
+
 /* calc & set attenuation factor for given channel */
 static int set_pcm_attn(struct emu10k1_card *card, int ch, int l)
 {
 #ifndef PCMLEVEL
-#define PCMLEVEL 140            // almost silence
+#define PCMLEVEL 110            /* almost silence */
 #endif
-        int vol = IFATN_ATTENUATION_MASK;       // silence
-
-        if (l > 0)
+        int vol = IFATN_ATTENUATION_MASK;       /* silence */
+
+        if (l > 0) {
+                if(l < 100) {
+                        l = LinToLog[l];
+                }
                 vol = (PCMLEVEL - (l * PCMLEVEL + 50) / 100);
+        }
         sblive_writeptr(card, IFATN, ch, IFATN_FILTERCUTOFF_MASK | vol);
         DPD(2, "SOUND_MIXER_PCM: channel:%d  level:%d  attn:%d\n", ch, l, vol);
@@ -548 +567 @@
                 }
         }
-        if (i == MAX_PCM_CHANNELS)
-                card->arrwVol[volidx[SOUND_MIXER_PCM]] = mixer;
+        card->arrwVol[volidx[SOUND_MIXER_PCM]] = mixer;
 
         return 0;