changed speed to be loop-based, work with floats as well as gint8 and gint16, mono...

Original commit message from CVS:
* changed speed to be loop-based, work with floats as well as gint8 and gint16,
mono only now though
* added speed demo app in the test directory. try it, it's really neat.
* fixed minor bugs in passthrough and gstaudio.h. don't worry, it does build ;)

diff --git a/include/gstaudio.h b/include/gstaudio.h
index f756a35..a661159 100644 (file)
--- a/include/gstaudio.h
+++ b/include/gstaudio.h
@@ -52,8 +52,8 @@
                                                  GST_PROPS_BOOLEAN (TRUE),\
                                                  GST_PROPS_BOOLEAN(FALSE)\
                                                ),\
-            "width",            GST_PROPS_INT_RANGE (8, 16),\
-            "depth",            GST_PROPS_INT_RANGE (8, 16),\
+            "width",            GST_PROPS_LIST (GST_PROPS_INT(8), GST_PROPS_INT(16)),\
+            "depth",            GST_PROPS_LIST (GST_PROPS_INT(8), GST_PROPS_INT(16)),\
             "rate",             GST_PROPS_INT_RANGE (4000, 96000),\
             "channels",         GST_PROPS_INT_RANGE (1, G_MAXINT),\
           NULL)
@@ -67,8 +67,8 @@
                                                  GST_PROPS_BOOLEAN (TRUE),\
                                                  GST_PROPS_BOOLEAN(FALSE)\
                                                ),\
-            "width",            GST_PROPS_INT_RANGE (8, 16),\
-            "depth",            GST_PROPS_INT_RANGE (8, 16),\
+            "width",            GST_PROPS_LIST (GST_PROPS_INT(8), GST_PROPS_INT(16)),\
+            "depth",            GST_PROPS_LIST (GST_PROPS_INT(8), GST_PROPS_INT(16)),\
             "rate",             GST_PROPS_INT_RANGE (4000, 96000),\
             "channels",         GST_PROPS_INT (1),\
           NULL)

diff --git a/test/Makefile.am b/test/Makefile.am
index 7e29a75..fb872a0 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,7 +4,7 @@ if HAVE_GNOME
 GNOME_PROGS = spectrum wave mp1parse videotest aviparse \
                videotest2 video2mp1 dvshow dv2mp1 \
                mpeg2parse mpeg2parse2 mpeg2parse3 \
-               mp2tomp1v2 main
+               mp2tomp1v2 main testspeed
 else
 GNOME_PROGS =
 endif

diff --git a/test/testspeed.c b/test/testspeed.c
new file mode 100644 (file)
index 0000000..ff79669
--- /dev/null
+++ b/test/testspeed.c
@@ -0,0 +1,67 @@
+#include <gtk/gtk.h>
+#include <gst/gst.h>
+
+void set_speed (GtkAdjustment *adj, gpointer data)
+{
+    GstElement *speed = GST_ELEMENT(data);
+    gtk_object_set(GTK_OBJECT(speed), "speed", adj->value, NULL);
+}
+
+int main(int argc, char **argv) 
+{
+    GtkWidget *window, *vbox, *hscale, *button;
+    GstElement *disksrc, *mad, *stereo2mono, *speed, *osssink, *pipeline;
+    
+    gst_init (&argc, &argv);
+    gtk_init (&argc, &argv);
+    
+    if (argc!=2) {
+        g_print("usage: %s <your.mp3>\n", argv[0]);
+        exit(-1);
+    }
+    
+    window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    gtk_window_set_default_size(GTK_WINDOW(window), 400, 80);
+    vbox = gtk_vbox_new(FALSE, 0);
+    gtk_widget_show(vbox);
+    hscale = gtk_hscale_new(GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.01, 4.0,
+                                                              0.1, 0.0, 0.0)));
+    gtk_scale_set_digits(GTK_SCALE(hscale), 2);
+    gtk_range_set_update_policy(GTK_RANGE(hscale), GTK_UPDATE_CONTINUOUS);
+    button = gtk_button_new_with_label("quit");
+    gtk_container_add(GTK_CONTAINER(window), vbox);
+    gtk_box_pack_start(GTK_BOX(vbox), hscale, TRUE, TRUE, 2);
+    gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 2);
+    gtk_widget_show(hscale);
+    gtk_signal_connect(GTK_OBJECT(button), "clicked", gtk_main_quit, NULL);
+    gtk_widget_show(button);
+    
+    disksrc = gst_elementfactory_make("disksrc", "disksrc");
+    mad = gst_elementfactory_make("mad", "mad");
+    stereo2mono = gst_elementfactory_make("stereo2mono", "stereo2mono");
+    speed = gst_elementfactory_make("speed", "speed");
+    osssink = gst_elementfactory_make("osssink", "osssink");
+    gtk_object_set(GTK_OBJECT(osssink), "fragment", 0x00180008, NULL);
+    
+    gtk_signal_connect(GTK_OBJECT(gtk_range_get_adjustment(GTK_RANGE(hscale))),
+                       "value_changed", set_speed, speed);
+    
+    pipeline = gst_pipeline_new("app");
+    gst_bin_add(GST_BIN(pipeline), disksrc);
+    gst_bin_add(GST_BIN(pipeline), mad);
+    gst_bin_add(GST_BIN(pipeline), stereo2mono);
+    gst_bin_add(GST_BIN(pipeline), speed);
+    gst_bin_add(GST_BIN(pipeline), osssink);
+    gst_element_connect(disksrc, "src", mad, "sink");
+    gst_element_connect(mad, "src", stereo2mono, "sink");
+    gst_element_connect(stereo2mono, "src", speed, "sink");
+    gst_element_connect(speed, "src", osssink, "sink");
+    gtk_object_set(GTK_OBJECT(disksrc), "location", argv[1], NULL);
+    
+    gst_element_set_state(pipeline, GST_STATE_PLAYING);
+    
+    gtk_widget_show(window);
+    gtk_idle_add((GtkFunction)gst_bin_iterate, pipeline);
+    
+    gtk_main();
+}