Adjust minor of both meantone tuning and pure intonation

by syntonic comma instead of Pythagoras tuning

diff --git a/ChangeLog b/ChangeLog
index 30d169b..2c156a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-07  TAMUKI Shoichi <tamuki@linet.gr.jp>
+
+       * timidity/playmidi.c, timidity/tables.c:
+         Adjust minor of both meantone tuning and pure intonation
+         by syntonic comma instead of Pythagoras tuning
+
 2003-09-03  Takashi Iwai <tiwai@suse.de>
 
        * interface/alsaseq_c.c:

diff --git a/timidity/playmidi.c b/timidity/playmidi.c
index 55fe5da..5c0f4f6 100644 (file)
--- a/timidity/playmidi.c
+++ b/timidity/playmidi.c
@@ -704,10 +704,7 @@ void recompute_freq(int v)
                        f = freq_table_tuning[tp][note];
                        break;
                case 1:
-                       if (current_temper_keysig < 8)
-                               f = freq_table_pytha[current_freq_table][note];
-                       else
-                               f = freq_table_pytha[current_freq_table + 12][note];
+                       f = freq_table_pytha[current_freq_table][note];
                        break;
                case 2:
                        if (current_temper_keysig < 8)
@@ -1722,10 +1719,7 @@ static int select_play_sample(Sample *splist,
                        f = freq_table_tuning[tp][note];
                        break;
                case 1:
-                       if (current_temper_keysig < 8)
-                               f = freq_table_pytha[current_freq_table][note];
-                       else
-                               f = freq_table_pytha[current_freq_table + 12][note];
+                       f = freq_table_pytha[current_freq_table][note];
                        break;
                case 2:
                        if (current_temper_keysig < 8)

diff --git a/timidity/tables.c b/timidity/tables.c
index b367017..ac82338 100644 (file)
--- a/timidity/tables.c
+++ b/timidity/tables.c
@@ -42,7 +42,7 @@
 
 int32 freq_table[128];
 int32 freq_table_tuning[128][128];
-int32 freq_table_pytha[24][128];
+int32 freq_table_pytha[12][128];
 int32 freq_table_meantone[24][128];
 int32 freq_table_pureint[24][128];
 int32 freq_table_user[4][24][128];
@@ -76,7 +76,6 @@ void init_freq_table_pytha(void)
                 81.0 / 64,   4.0 /   3, 729.0 / 512,   3.0 /   2,
                128.0 / 81,  27.0 /  16,  16.0 /   9, 243.0 / 128
        };
-       static double syntonic = 80.0 / 81;
        
        for (i = 0; i < 12; i++)
                for (j = -1; j < 11; j++) {
@@ -86,8 +85,6 @@ void init_freq_table_pytha(void)
                                if (l < 0 || l >= 128)
                                        continue;
                                freq_table_pytha[i][l] = f * ratio[k] * 1000 + 0.5;
-                               freq_table_pytha[i + 12][l] =
-                                               f * ratio[k] * syntonic * 1000 + 0.5;
                        }
                }
 }
@@ -97,6 +94,7 @@ void init_freq_table_meantone(void)
        int i, j, k, l;
        double f;
        static double major_ratio[12], minor_ratio[12];
+       static double syntonic = 80.0 / 81;
        
        major_ratio[0] = 1;
        major_ratio[1] = 8 / pow(5.0, 5.0 / 4);
@@ -132,7 +130,7 @@ void init_freq_table_meantone(void)
                                freq_table_meantone[i][l] =
                                                f * major_ratio[k] * 1000 + 0.5;
                                freq_table_meantone[i + 12][l] =
-                                               f * minor_ratio[k] * 1000 + 0.5;
+                                               f * minor_ratio[k] / syntonic * 1000 + 0.5;
                        }
                }
 }
@@ -149,6 +147,7 @@ void init_freq_table_pureint(void)
                 1.0 /  1, 25.0 / 24, 10.0 /  9, 6.0 / 5, 5.0 / 4,  4.0 / 3,
                25.0 / 18,  3.0 /  2, 25.0 / 16, 5.0 / 3, 9.0 / 5, 15.0 / 8
        };
+       static double syntonic = 80.0 / 81;
        
        for (i = 0; i < 12; i++)
                for (j = -1; j < 11; j++) {
@@ -160,7 +159,7 @@ void init_freq_table_pureint(void)
                                freq_table_pureint[i][l] =
                                                f * major_ratio[k] * 1000 + 0.5;
                                freq_table_pureint[i + 12][l] =
-                                               f * minor_ratio[k] * 1000 + 0.5;
+                                               f * minor_ratio[k] / syntonic * 1000 + 0.5;
                        }
                }
 }