Merge lp:~toni-ruottu/kunquat/triangle-dev into lp:kunquat/0.2

[Toni Ruottu]

[Toni Ruottu (toni-ruottu)]

The triangle wave generator should work now. My branch uses it for the demo song. I think it is nice to hear something different, but the code for triangle wave generation is rough and not very optimized, so we could choose to continue using sine for the demo or polish the generator before a merge happens.

[lp:~toni-ruottu/kunquat/triangle-dev]

236. By Toni Ruottu on 2009-04-24

...

[Sanna Fröblom (sanna-froblom)]

Tried this on my EeePC, with Ubuntu Intrepid, and the song was lagging throughout the whole demo. It's unplayable unless optimised.

=== modified file 'src/Listener/Listener_ins.c'
--- src/Listener/Listener_ins.c	2009-04-12 20:36:04 +0000
+++ src/Listener/Listener_ins.c	2009-04-24 19:52:05 +0000
@@ -34,6 +34,7 @@
 #include <Ins_table.h>
 #include <Generator_debug.h>
 #include <Generator_sine.h>
+#include <Generator_triangle.h>
 #include <Generator_pcm.h>
 #include <Instrument.h>
 #include <Song_limits.h>
@@ -143,6 +144,16 @@
                 gen = (Generator*)gen_sine;
             }
             break;
+            case GEN_TYPE_TRIANGLE:
+            {
+                Generator_triangle* gen_triangle = new_Generator_triangle(Instrument_get_params(ins));
+                if (gen_triangle == NULL)
+                {
+                    send_memory_fail(lr, "the Generator of the new Instrument");
+                }
+                gen = (Generator*)gen_triangle;
+            }
+            break;
             case GEN_TYPE_PCM:
             {
                 Generator_pcm* gen_pcm = new_Generator_pcm(Instrument_get_params(ins));

=== added file 'src/core/Generator_triangle.c'
--- src/core/Generator_triangle.c	1970-01-01 00:00:00 +0000
+++ src/core/Generator_triangle.c	2009-04-24 19:52:05 +0000
@@ -0,0 +1,153 @@
+
+
+/*
+ * Copyright 2009 Tomi Jylhä-Ollila
+ *
+ * This file is part of Kunquat.
+ *
+ * Kunquat is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Kunquat is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Kunquat.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <stdlib.h>
+#include <assert.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <math.h>
+
+#include <Generator.h>
+#include <Generator_triangle.h>
+
+#include <xmemory.h>
+
+
+#define PI_2 (3.14159265358979323846 * 2)
+
+
+Generator_triangle* new_Generator_triangle(Instrument_params* ins_params)
+{
+    assert(ins_params != NULL);
+    Generator_triangle* triangle = xalloc(Generator_triangle);
+    if (triangle == NULL)
+    {
+        return NULL;
+    }
+    triangle->parent.destroy = del_Generator_triangle;
+    triangle->parent.type = GEN_TYPE_TRIANGLE;
+    triangle->parent.init_state = Voice_state_triangle_init;
+    triangle->parent.mix = Generator_triangle_mix;
+    triangle->parent.ins_params = ins_params;
+    srand (0);
+    return triangle;
+}
+
+double triangle(double x)
+{
+    return acos(sin(x));
+} 
+
+void Generator_triangle_mix(Generator* gen,
+        Voice_state* state,
+        uint32_t nframes,
+        uint32_t offset,
+        uint32_t freq)
+{
+    assert(gen != NULL);
+    assert(gen->type == GEN_TYPE_TRIANGLE);
+    assert(state != NULL);
+//  assert(nframes <= ins->buf_len); XXX: Revisit after adding instrument buffers
+    assert(freq > 0);
+    assert(gen->ins_params->bufs[0] != NULL);
+    assert(gen->ins_params->bufs[1] != NULL);
+    if (!state->active)
+    {
+        return;
+    }
+//    double max_amp = 0;
+//  fprintf(stderr, "bufs are %p and %p\n", ins->bufs[0], ins->bufs[1]);
+    for (uint32_t i = offset; i < nframes; ++i)
+    {
+        double val_l = 0;
+        double val_r = 0;
+        val_l = val_r = triangle(state->ins_fields.triangle.phase) / 6;
+        if (!state->note_on && (state->pos_rem == 0)
+                && !gen->ins_params->volume_off_env_enabled)
+        {
+            return;
+        }
+        if (state->pos_rem < 0.002)
+        {
+            val_l = val_r = val_l * (state->pos_rem * 500);
+            state->pos_rem += 1.0 / freq;
+        }
+        state->ins_fields.triangle.phase += state->freq * PI_2 / freq;
+        if (state->ins_fields.triangle.phase >= PI_2)
+        {
+            state->ins_fields.triangle.phase -= floor(state->ins_fields.triangle.phase / PI_2) * PI_2;
+            ++state->pos;
+        }
+        if (!state->note_on)
+        {
+            if (gen->ins_params->volume_off_env_enabled)
+            {
+                double scale = Envelope_get_value(gen->ins_params->volume_off_env,
+                        state->off_ve_pos);
+                if (!isfinite(scale))
+                {
+                    state->active = false;
+                    return;
+                }
+                if (state->pedal < 0.5)
+                {
+                    state->off_ve_pos += 1.0 / freq;
+                }
+                val_l *= scale;
+                val_r *= scale;
+            }
+            else
+            {
+                if (state->noff_pos_rem < 1)
+                {
+                    val_l = val_r = val_l * (1 - state->noff_pos_rem);
+                }
+                else
+                {
+                    state->active = false;
+                    return;
+                }
+                state->noff_pos_rem += 2.0 / freq;
+            }
+        }
+        gen->ins_params->bufs[0][i] += val_l;
+        gen->ins_params->bufs[1][i] += val_r;
+/*        if (fabs(val_l) > max_amp)
+        {
+            max_amp = fabs(val_l);
+        } */
+    }
+//  fprintf(stderr, "max_amp is %lf\n", max_amp);
+    return;
+}
+
+
+void del_Generator_triangle(Generator* gen)
+{
+    assert(gen != NULL);
+    assert(gen->type == GEN_TYPE_TRIANGLE);
+    Generator_triangle* triangle = (Generator_triangle*)gen;
+    xfree(triangle);
+    return;
+}
+
+

=== added file 'src/core/Generator_triangle.h'
--- src/core/Generator_triangle.h	1970-01-01 00:00:00 +0000
+++ src/core/Generator_triangle.h	2009-04-24 19:52:05 +0000
@@ -0,0 +1,65 @@
+
+
+/*
+ * Copyright 2009 Tomi Jylhä-Ollila, Toni Ruottu
+ *
+ * This file is part of Kunquat.
+ *
+ * Kunquat is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Kunquat is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Kunquat.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef K_GENERATOR_TRIANGLE_H
+#define K_GENERATOR_TRIANGLE_H
+
+
+#include <Generator.h>
+#include <Voice_state.h>
+
+
+typedef struct Generator_triangle
+{
+    Generator parent;
+} Generator_triangle;
+
+
+/**
+ * Creates a new Triangle Generator.
+ *
+ * \param ins_params   The Instrument parameters -- must not be \c NULL.
+ *
+ * \return   The new Triangle Generator if successful, or \c NULL if memory
+ *           allocation failed.
+ */
+Generator_triangle* new_Generator_triangle(Instrument_params* ins_params);
+
+
+void Generator_triangle_mix(Generator* gen,
+        Voice_state* state,
+        uint32_t nframes,
+        uint32_t offset,
+        uint32_t freq);
+
+
+/**
+ * Destroys an existing Triangle Generator.
+ *
+ * \param gen   The Triangle Generator -- must not be \c NULL.
+ */
+void del_Generator_triangle(Generator* gen);
+
+
+#endif // K_GENERATOR_TRIANGLE_H
+
+

=== modified file 'src/core/Generator_type.h'
--- src/core/Generator_type.h	2009-04-12 20:36:04 +0000
+++ src/core/Generator_type.h	2009-04-24 19:52:05 +0000
@@ -35,6 +35,8 @@
     GEN_TYPE_DEBUG,
     /// A simple sine wave instrument for testing by ear.
     GEN_TYPE_SINE,
+    /// A simple triangle wave instrument.
+    GEN_TYPE_TRIANGLE,
     /// A sample-based type common in tracker programs.
     GEN_TYPE_PCM,
     /// A type for reading audio data from disk -- used for large audio files.

=== modified file 'src/core/SConscript'
--- src/core/SConscript	2009-04-12 20:36:04 +0000
+++ src/core/SConscript	2009-04-24 19:52:05 +0000
@@ -60,6 +60,7 @@
     'Playdata.c',
     'Player.c',
     'Playlist.c',
+    'Generator_triangle.c',
 ]
 
 if env['with_jack']:

=== modified file 'src/core/Voice_state.c'
--- src/core/Voice_state.c	2009-04-12 23:05:15 +0000
+++ src/core/Voice_state.c	2009-04-24 19:52:05 +0000
@@ -67,3 +67,11 @@
 }
 
 
+void Voice_state_triangle_init(Voice_state* state)
+{
+    assert(state != NULL);
+    state->ins_fields.triangle.phase = 0;
+    return;
+}
+
+

=== modified file 'src/core/Voice_state.h'
--- src/core/Voice_state.h	2009-03-11 01:10:24 +0000
+++ src/core/Voice_state.h	2009-04-24 19:52:05 +0000
@@ -31,6 +31,12 @@
 #include <pitch_t.h>
 
 
+typedef struct Voice_state_triangle
+{
+    double phase;
+} Voice_state_triangle;
+
+
 typedef struct Voice_state_sine
 {
     double phase;
@@ -67,6 +73,7 @@
     union
     {
         Voice_state_sine sine;
+        Voice_state_triangle triangle;
 //        Voice_state_pcm pcm;
     } ins_fields;
 } Voice_state;
@@ -101,6 +108,14 @@
 void Voice_state_sine_init(Voice_state* state);
 
 
+/**
+ * Initialises the Triangle Instrument parameters.
+ *
+ * \param triangle   The Triangle parameters -- must not be \c NULL.
+ */
+void Voice_state_triangle_init(Voice_state* state);
+
+
 #endif // K_VOICE_STATE_H
 
 

=== modified file 'src/demo/demo_song.c'
--- src/demo/demo_song.c	2009-04-12 20:36:04 +0000
+++ src/demo/demo_song.c	2009-04-24 19:52:05 +0000
@@ -24,7 +24,7 @@
 
 #include "demo_song.h"
 
-#include <Generator_sine.h>
+#include <Generator_triangle.h>
 
 
 typedef struct Ndesc
@@ -139,14 +139,14 @@
     {
         goto cleanup;
     }
-    Generator_sine* sine_gen = new_Generator_sine(Instrument_get_params(ins));
-    if (sine_gen == NULL)
+    Generator_triangle* triangle_gen = new_Generator_triangle(Instrument_get_params(ins));
+    if (triangle_gen == NULL)
     {
         del_Instrument(ins);
         goto cleanup;
     }
-    Instrument_set_gen(ins, 0, (Generator*)sine_gen);
-    Instrument_set_name(ins, L"sine");
+    Instrument_set_gen(ins, 0, (Generator*)triangle_gen);
+    Instrument_set_name(ins, L"triangle");
     Instrument_set_note_table(ins, Song_get_active_notes(song));
     Ins_table* insts = Song_get_insts(song);
     if (!Ins_table_set(insts, 1, ins))

=== modified file 'src/ui_pygtk/Instruments.py'
--- src/ui_pygtk/Instruments.py	2009-01-07 00:07:37 +0000
+++ src/ui_pygtk/Instruments.py	2009-04-24 19:52:05 +0000
@@ -479,6 +479,7 @@
         self.types = gtk.combo_box_new_text()
         self.types.append_text('None')
         self.types.append_text('Sine')
+        self.types.append_text('Triangle')
         self.types.append_text('PCM')
         self.types.set_active(0)
         self.htypes = self.types.connect('changed', self.change_type)