From 505031874471adf416d443c75e499b978cb4aee3 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Mon, 16 Apr 2001 19:38:56 +0000 Subject: [PATCH] changed volume envelope; should do a nice transition between both songs now Original commit message from CVS: changed volume envelope; should do a nice transition between both songs now --- examples/mixer/mixer.c | 26 +++++++++++--------------- tests/old/examples/mixer/mixer.c | 26 +++++++++++--------------- 2 files changed, 22 insertions(+), 30 deletions(-) diff --git a/examples/mixer/mixer.c b/examples/mixer/mixer.c index 8d3a54ac47..917727ada0 100644 --- a/examples/mixer/mixer.c +++ b/examples/mixer/mixer.c @@ -4,7 +4,8 @@ gboolean playing; /* example based on helloworld by thomas@apestaart.org - demonstrates the adder plugin and the volume envelope plugin */ + demonstrates the adder plugin and the volume envelope plugin + work in progress but do try it out */ /* eos will be called when the src element has an end of stream */ void eos(GstElement *element) @@ -120,22 +121,17 @@ int main(int argc,char *argv[]) /* register the volume envelope */ - gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "0:0.0001", NULL); - gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "2:1", NULL); - gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "4:1", NULL); - gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "5:.1", NULL); - gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "6:1", NULL); - gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "7:.1", NULL); - gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "8:1", NULL); - gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "15:0.8", NULL); + gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "0:0.000001", NULL); + gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "5:0.000001", NULL); + gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "10:1", NULL); + gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "15:1", NULL); + gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "20:0.000001", NULL); - gtk_object_set(GTK_OBJECT(volenv2), "controlpoint", "0:0.001", NULL); - gtk_object_set(GTK_OBJECT(volenv2), "controlpoint", "4:0.001", NULL); + gtk_object_set(GTK_OBJECT(volenv2), "controlpoint", "0:1", NULL); gtk_object_set(GTK_OBJECT(volenv2), "controlpoint", "5:1", NULL); - gtk_object_set(GTK_OBJECT(volenv2), "controlpoint", "6:.1", NULL); - gtk_object_set(GTK_OBJECT(volenv2), "controlpoint", "7:1", NULL); - gtk_object_set(GTK_OBJECT(volenv2), "controlpoint", "8:.1", NULL); - gtk_object_set(GTK_OBJECT(volenv2), "controlpoint", "15:0.001", NULL); + gtk_object_set(GTK_OBJECT(volenv2), "controlpoint", "10:0.000001", NULL); + gtk_object_set(GTK_OBJECT(volenv2), "controlpoint", "15:0.000001", NULL); + gtk_object_set(GTK_OBJECT(volenv2), "controlpoint", "20:1", NULL); /* start playing */ gst_element_set_state(main_bin, GST_STATE_PLAYING); diff --git a/tests/old/examples/mixer/mixer.c b/tests/old/examples/mixer/mixer.c index 8d3a54ac47..917727ada0 100644 --- a/tests/old/examples/mixer/mixer.c +++ b/tests/old/examples/mixer/mixer.c @@ -4,7 +4,8 @@ gboolean playing; /* example based on helloworld by thomas@apestaart.org - demonstrates the adder plugin and the volume envelope plugin */ + demonstrates the adder plugin and the volume envelope plugin + work in progress but do try it out */ /* eos will be called when the src element has an end of stream */ void eos(GstElement *element) @@ -120,22 +121,17 @@ int main(int argc,char *argv[]) /* register the volume envelope */ - gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "0:0.0001", NULL); - gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "2:1", NULL); - gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "4:1", NULL); - gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "5:.1", NULL); - gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "6:1", NULL); - gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "7:.1", NULL); - gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "8:1", NULL); - gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "15:0.8", NULL); + gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "0:0.000001", NULL); + gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "5:0.000001", NULL); + gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "10:1", NULL); + gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "15:1", NULL); + gtk_object_set(GTK_OBJECT(volenv1), "controlpoint", "20:0.000001", NULL); - gtk_object_set(GTK_OBJECT(volenv2), "controlpoint", "0:0.001", NULL); - gtk_object_set(GTK_OBJECT(volenv2), "controlpoint", "4:0.001", NULL); + gtk_object_set(GTK_OBJECT(volenv2), "controlpoint", "0:1", NULL); gtk_object_set(GTK_OBJECT(volenv2), "controlpoint", "5:1", NULL); - gtk_object_set(GTK_OBJECT(volenv2), "controlpoint", "6:.1", NULL); - gtk_object_set(GTK_OBJECT(volenv2), "controlpoint", "7:1", NULL); - gtk_object_set(GTK_OBJECT(volenv2), "controlpoint", "8:.1", NULL); - gtk_object_set(GTK_OBJECT(volenv2), "controlpoint", "15:0.001", NULL); + gtk_object_set(GTK_OBJECT(volenv2), "controlpoint", "10:0.000001", NULL); + gtk_object_set(GTK_OBJECT(volenv2), "controlpoint", "15:0.000001", NULL); + gtk_object_set(GTK_OBJECT(volenv2), "controlpoint", "20:1", NULL); /* start playing */ gst_element_set_state(main_bin, GST_STATE_PLAYING);