Skip to content

Commit b008d78

Browse files
sezerosezero
committed
removed several 'f' suffixes after f1784d8, changed another float cast to double.
1 parent f1784d8 commit b008d78

File tree

1 file changed

+62
-62
lines changed

1 file changed

+62
-62
lines changed

‎src/internal_midi.c

+62-62
Original file line numberDiff line numberDiff line change
@@ -62,61 +62,61 @@ int16_t _WM_lin_volume[] = { 0, 8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 88, 96,
6262
951, 959, 967, 975, 983, 991, 999, 1007, 1015, 1024 };
6363

6464
/* f: As per midi 2 standard */
65-
static double dBm_volume[] = { -999999.999999f, -84.15214884f, -72.11094901f,
66-
-65.06729865f, -60.06974919f, -56.19334866f, -53.02609882f, -50.34822724f,
67-
-48.02854936f, -45.98244846f, -44.15214884f, -42.49644143f, -40.984899f,
68-
-39.59441475f, -38.30702741f, -37.10849848f, -35.98734953f, -34.93419198f,
69-
-33.94124863f, -33.0020048f, -32.11094901f, -31.26337705f, -30.45524161f,
70-
-29.6830354f, -28.94369917f, -28.23454849f, -27.55321492f, -26.89759827f,
71-
-26.26582758f, -25.65622892f, -25.06729865f, -24.49768108f, -23.94614971f,
72-
-23.41159124f, -22.89299216f, -22.38942706f, -21.90004881f, -21.42407988f,
73-
-20.96080497f, -20.50956456f, -20.06974919f, -19.64079457f, -19.22217722f,
74-
-18.81341062f, -18.41404178f, -18.02364829f, -17.64183557f, -17.26823452f,
75-
-16.90249934f, -16.54430564f, -16.19334866f, -15.84934179f, -15.51201509f,
76-
-15.18111405f, -14.85639845f, -14.53764126f, -14.22462776f, -13.91715461f,
77-
-13.6150291f, -13.31806837f, -13.02609882f, -12.73895544f, -12.45648126f,
78-
-12.17852686f, -11.90494988f, -11.63561457f, -11.37039142f, -11.10915673f,
79-
-10.85179233f, -10.59818521f, -10.34822724f, -10.10181489f, -9.858848981f,
80-
-9.619234433f, -9.382880049f, -9.149698303f, -8.919605147f, -8.692519831f,
81-
-8.468364731f, -8.247065187f, -8.028549359f, -7.812748083f, -7.599594743f,
82-
-7.389025143f, -7.180977396f, -6.97539181f, -6.772210788f, -6.571378733f,
83-
-6.372841952f, -6.176548572f, -5.982448461f, -5.790493145f, -5.600635744f,
84-
-5.412830896f, -5.227034694f, -5.043204627f, -4.861299517f, -4.681279468f,
85-
-4.503105811f, -4.326741054f, -4.152148838f, -3.979293887f, -3.808141968f,
86-
-3.63865985f, -3.470815266f, -3.304576875f, -3.139914228f, -2.976797731f,
87-
-2.815198619f, -2.655088921f, -2.496441432f, -2.339229687f, -2.183427931f,
88-
-2.029011099f, -1.875954785f, -1.724235224f, -1.573829269f, -1.424714368f,
89-
-1.276868546f, -1.130270383f, -0.9848989963f, -0.8407340256f, -0.6977556112f,
90-
-0.5559443807f, -0.4152814317f, -0.2757483179f, -0.1373270335f, 0.0f };
65+
static double dBm_volume[] = { -999999.999999, -84.15214884, -72.11094901,
66+
-65.06729865, -60.06974919, -56.19334866, -53.02609882, -50.34822724,
67+
-48.02854936, -45.98244846, -44.15214884, -42.49644143, -40.984899,
68+
-39.59441475, -38.30702741, -37.10849848, -35.98734953, -34.93419198,
69+
-33.94124863, -33.0020048, -32.11094901, -31.26337705, -30.45524161,
70+
-29.6830354, -28.94369917, -28.23454849, -27.55321492, -26.89759827,
71+
-26.26582758, -25.65622892, -25.06729865, -24.49768108, -23.94614971,
72+
-23.41159124, -22.89299216, -22.38942706, -21.90004881, -21.42407988,
73+
-20.96080497, -20.50956456, -20.06974919, -19.64079457, -19.22217722,
74+
-18.81341062, -18.41404178, -18.02364829, -17.64183557, -17.26823452,
75+
-16.90249934, -16.54430564, -16.19334866, -15.84934179, -15.51201509,
76+
-15.18111405, -14.85639845, -14.53764126, -14.22462776, -13.91715461,
77+
-13.6150291, -13.31806837, -13.02609882, -12.73895544, -12.45648126,
78+
-12.17852686, -11.90494988, -11.63561457, -11.37039142, -11.10915673,
79+
-10.85179233, -10.59818521, -10.34822724, -10.10181489, -9.858848981,
80+
-9.619234433, -9.382880049, -9.149698303, -8.919605147, -8.692519831,
81+
-8.468364731, -8.247065187, -8.028549359, -7.812748083, -7.599594743,
82+
-7.389025143, -7.180977396, -6.97539181, -6.772210788, -6.571378733,
83+
-6.372841952, -6.176548572, -5.982448461, -5.790493145, -5.600635744,
84+
-5.412830896, -5.227034694, -5.043204627, -4.861299517, -4.681279468,
85+
-4.503105811, -4.326741054, -4.152148838, -3.979293887, -3.808141968,
86+
-3.63865985, -3.470815266, -3.304576875, -3.139914228, -2.976797731,
87+
-2.815198619, -2.655088921, -2.496441432, -2.339229687, -2.183427931,
88+
-2.029011099, -1.875954785, -1.724235224, -1.573829269, -1.424714368,
89+
-1.276868546, -1.130270383, -0.9848989963, -0.8407340256, -0.6977556112,
90+
-0.5559443807, -0.4152814317, -0.2757483179, -0.1373270335, 0.0 };
9191

9292
/* f: As per midi 2 standard */
93-
static double dBm_pan_volume[] = { -999999.999999f, -38.15389834f, -32.13396282f,
94-
-28.61324502f, -26.1160207f, -24.179814f, -22.5986259f, -21.26257033f,
95-
-20.10605521f, -19.08677237f, -18.17583419f, -17.35263639f, -16.60196565f,
96-
-15.91226889f, -15.2745658f, -14.6817375f, -14.12804519f, -13.60879499f,
97-
-13.12009875f, -12.65869962f, -12.22184237f, -11.80717543f, -11.41267571f,
98-
-11.03659017f, -10.67738981f, -10.33373306f, -10.00443638f, -9.6884504f,
99-
-9.384840381f, -9.092770127f, -8.811488624f, -8.540318866f, -8.278648457f,
100-
-8.025921658f, -7.781632628f, -7.545319633f, -7.316560087f, -7.094966257f,
101-
-6.880181552f, -6.671877289f, -6.46974987f, -6.273518306f, -6.082922045f,
102-
-5.897719045f, -5.717684082f, -5.542607236f, -5.372292553f, -5.206556845f,
103-
-5.045228616f, -4.888147106f, -4.735161423f, -4.586129765f, -4.44091872f,
104-
-4.299402626f, -4.161462998f, -4.026988004f, -3.895871989f, -3.76801504f,
105-
-3.643322591f, -3.52170506f, -3.403077519f, -3.287359388f, -3.174474158f,
106-
-3.064349129f, -2.956915181f, -2.852106549f, -2.749860626f, -2.650117773f,
107-
-2.55282115f, -2.457916557f, -2.36535228f, -2.27507896f, -2.187049463f,
108-
-2.101218759f, -2.017543814f, -1.935983486f,-1.856498429f, -1.779051001f,
109-
-1.703605184f, -1.630126502f, -1.558581949f, -1.48893992f, -1.421170148f,
110-
-1.35524364f, -1.291132623f, -1.228810491f, -1.168251755f, -1.109431992f,
111-
-1.052327808f, -0.9969167902f, -0.9431774708f, -0.8910892898f, -0.8406325604f,
112-
-0.7917884361f, -0.7445388804f, -0.6988666373f, -0.6547552046f, -0.612188808f,
113-
-0.5711523768f, -0.5316315211f, -0.4936125107f, -0.4570822543f, -0.4220282808f,
114-
-0.3884387214f, -0.3563022927f, -0.3256082808f, -0.2963465264f, -0.2685074109f,
115-
-0.2420818435f, -0.2170612483f, -0.1934375538f, -0.1712031815f, -0.1503510361f,
116-
-0.1308744964f, -0.1127674066f, -0.09602406855f, -0.08063923423f,
117-
-0.06660809932f, -0.05392629701f, -0.04258989258f, -0.03259537844f,
118-
-0.02393966977f, -0.01662010072f, -0.01063442111f, -0.005980793601f,
119-
-0.002657791522f, -0.000664397052f, 0.0f };
93+
static double dBm_pan_volume[] = { -999999.999999, -38.15389834, -32.13396282,
94+
-28.61324502, -26.1160207, -24.179814, -22.5986259, -21.26257033,
95+
-20.10605521, -19.08677237, -18.17583419, -17.35263639, -16.60196565,
96+
-15.91226889, -15.2745658, -14.6817375, -14.12804519, -13.60879499,
97+
-13.12009875, -12.65869962, -12.22184237, -11.80717543, -11.41267571,
98+
-11.03659017, -10.67738981, -10.33373306, -10.00443638, -9.6884504,
99+
-9.384840381, -9.092770127, -8.811488624, -8.540318866, -8.278648457,
100+
-8.025921658, -7.781632628, -7.545319633, -7.316560087, -7.094966257,
101+
-6.880181552, -6.671877289, -6.46974987, -6.273518306, -6.082922045,
102+
-5.897719045, -5.717684082, -5.542607236, -5.372292553, -5.206556845,
103+
-5.045228616, -4.888147106, -4.735161423, -4.586129765, -4.44091872,
104+
-4.299402626, -4.161462998, -4.026988004, -3.895871989, -3.76801504,
105+
-3.643322591, -3.52170506, -3.403077519, -3.287359388, -3.174474158,
106+
-3.064349129, -2.956915181, -2.852106549, -2.749860626, -2.650117773,
107+
-2.55282115, -2.457916557, -2.36535228, -2.27507896, -2.187049463,
108+
-2.101218759, -2.017543814, -1.935983486,-1.856498429, -1.779051001,
109+
-1.703605184, -1.630126502, -1.558581949, -1.48893992, -1.421170148,
110+
-1.35524364, -1.291132623, -1.228810491, -1.168251755, -1.109431992,
111+
-1.052327808, -0.9969167902, -0.9431774708, -0.8910892898, -0.8406325604,
112+
-0.7917884361, -0.7445388804, -0.6988666373, -0.6547552046, -0.612188808,
113+
-0.5711523768, -0.5316315211, -0.4936125107, -0.4570822543, -0.4220282808,
114+
-0.3884387214, -0.3563022927, -0.3256082808, -0.2963465264, -0.2685074109,
115+
-0.2420818435, -0.2170612483, -0.1934375538, -0.1712031815, -0.1503510361,
116+
-0.1308744964, -0.1127674066, -0.09602406855, -0.08063923423,
117+
-0.06660809932, -0.05392629701, -0.04258989258, -0.03259537844,
118+
-0.02393966977, -0.01662010072, -0.01063442111, -0.005980793601,
119+
-0.002657791522, -0.000664397052, 0.0 };
120120

121121
uint32_t _WM_freq_table[] = { 837201792, 837685632, 838169728,
122122
838653568, 839138240, 839623232, 840108480, 840593984, 841079680,
@@ -483,8 +483,8 @@ void _WM_AdjustNoteVolumes(struct _mdi *mdi, uint8_t ch, struct _note *nte) {
483483
NOTE: The lower the value the higher the chance of clipping.
484484
FIXME: Still needs tuning. Clipping heard at a value of 3.75
485485
*/
486-
#define VOL_DIVISOR 4.0f
487-
volume_adj = ((double)_WM_MasterVolume / 1024.0f) / VOL_DIVISOR;
486+
#define VOL_DIVISOR 4.0
487+
volume_adj = ((double)_WM_MasterVolume / 1024.0) / VOL_DIVISOR;
488488

489489
MIDI_EVENT_DEBUG(__FUNCTION__,ch, 0);
490490

@@ -498,16 +498,16 @@ void _WM_AdjustNoteVolumes(struct _mdi *mdi, uint8_t ch, struct _note *nte) {
498498
premix_dBm_left += premix_dBm;
499499
premix_dBm_right += premix_dBm;
500500

501-
premix_left = (pow(10.0f, (premix_dBm_left / 20.0f))) * volume_adj;
502-
premix_right = (pow(10.0f, (premix_dBm_right / 20.0f))) * volume_adj;
501+
premix_left = (pow(10.0, (premix_dBm_left / 20.0))) * volume_adj;
502+
premix_right = (pow(10.0, (premix_dBm_right / 20.0))) * volume_adj;
503503
} else {
504-
premix_lin = (float)(_WM_lin_volume[vol_ofs]) / 1024.0f;
504+
premix_lin = (double)(_WM_lin_volume[vol_ofs]) / 1024.0;
505505

506-
premix_left = premix_lin * pow(10.0f, (premix_dBm_left / 20)) * volume_adj;
507-
premix_right = premix_lin * pow(10.0f, (premix_dBm_right / 20)) * volume_adj;
506+
premix_left = premix_lin * pow(10.0, (premix_dBm_left / 20)) * volume_adj;
507+
premix_right = premix_lin * pow(10.0, (premix_dBm_right / 20)) * volume_adj;
508508
}
509-
nte->left_mix_volume = (int32_t)(premix_left * 1024.0f);
510-
nte->right_mix_volume = (int32_t)(premix_right * 1024.0f);
509+
nte->left_mix_volume = (int32_t)(premix_left * 1024.0);
510+
nte->right_mix_volume = (int32_t)(premix_right * 1024.0);
511511
}
512512

513513
/* Should be called in any function that effects channel volumes */

0 commit comments

Comments
 (0)