gst/spectrum/demo-osssrc.c: Use 32 for the graph since it's the dimension of the drawing window; use proper buffersiz...

Original commit message from CVS:
Reviewed by: Tim-Philipp Müller  <tim at centricular dot net>
* gst/spectrum/demo-osssrc.c: (spectrum_chain), (main):
Use 32 for the graph since it's the dimension of the
drawing window; use proper buffersize (bytes != samples);
connect delete-event to gtk_main_quit.
* gst/spectrum/gstspectrum.c: (gst_spectrum_class_init),
(gst_spectrum_chain):
Specify max. width of 1024 in property param spec;
spec_base must be 10 instead of 8, since it's the
exponent of the N pased to the FFT (2^10=1024);
memcpy the buffer in the mono case (fixes a  crash).

1 files changed, 16 insertions, 6 deletions

diff --git a/gst/spectrum/demo-osssrc.c b/gst/spectrum/demo-osssrc.c
index b51e8c2a..0312df87 100644
--- a/gst/spectrum/demo-osssrc.c
+++ b/gst/spectrum/demo-osssrc.c
@@ -15,12 +15,12 @@ spectrum_chain (GstElement * sink, GstBuffer * buf, GstPad * pad,
     gpointer unused)
 {
   gint i;
-  guchar *data = buf->data;
-  GdkRectangle rect = { 0, 0, GST_BUFFER_SIZE (buf), 25 };
+  guchar *data = GST_BUFFER_DATA (buf);
+  GdkRectangle rect = { 0, 0, GST_BUFFER_SIZE (buf), 32 };
 
   gdk_window_begin_paint_rect (drawingarea->window, &rect);
   gdk_draw_rectangle (drawingarea->window, drawingarea->style->black_gc,
-      TRUE, 0, 0, GST_BUFFER_SIZE (buf), 25);
+      TRUE, 0, 0, GST_BUFFER_SIZE (buf), 32);
   for (i = 0; i < GST_BUFFER_SIZE (buf); i++) {
     gdk_draw_rectangle (drawingarea->window, drawingarea->style->white_gc,
         TRUE, i, 32 - data[i], 1, data[i]);
@@ -33,7 +33,7 @@ main (int argc, char *argv[])
 {
   GstElement *bin;
   GstElement *src, *spectrum, *sink;
-
+  GstCaps *filtercaps;
   GtkWidget *appwindow;
 
   gst_init (&argc, &argv);
@@ -42,7 +42,8 @@ main (int argc, char *argv[])
   bin = gst_pipeline_new ("bin");
 
   src = gst_element_factory_make (DEFAULT_AUDIOSRC, "src");
-  g_object_set (G_OBJECT (src), "buffersize", (gulong) 1024, NULL);
+  g_object_set (G_OBJECT (src), "buffersize", (gulong) 1024 * sizeof (gint16),
+      NULL);
   spectrum = gst_element_factory_make ("spectrum", "spectrum");
   g_object_set (G_OBJECT (spectrum), "width", 256, NULL);
   sink = gst_element_factory_make ("fakesink", "sink");
@@ -50,9 +51,18 @@ main (int argc, char *argv[])
   g_signal_connect (sink, "handoff", G_CALLBACK (spectrum_chain), NULL);
 
   gst_bin_add_many (GST_BIN (bin), src, spectrum, sink, NULL);
-  gst_element_link_many (src, spectrum, sink, NULL);
+
+  filtercaps =
+      gst_caps_new_simple ("audio/x-raw-int", "rate", G_TYPE_INT, 11025, NULL);
+  if (!gst_element_link_filtered (src, spectrum, filtercaps))
+    g_error ("Linking source to spectrum failed\n");
+  gst_caps_free (filtercaps);
+  if (!gst_element_link (spectrum, sink))
+    g_error ("Linking spectrum to sink failed\n");
 
   appwindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  g_signal_connect (appwindow, "delete-event", G_CALLBACK (gtk_main_quit),
+      NULL);
   drawingarea = gtk_drawing_area_new ();
   gtk_drawing_area_size (GTK_DRAWING_AREA (drawingarea), 256, 32);
   gtk_container_add (GTK_CONTAINER (appwindow), drawingarea);