gst/spectrum/demo-osssrc.c: Use more defines

Original commit message from CVS:
* gst/spectrum/demo-osssrc.c: (draw_spectrum), (main):
Use more defines
* gst/spectrum/gstspectrum.c: (gst_spectrum_init),
(gst_spectrum_dispose), (gst_spectrum_set_caps),
(gst_spectrum_transform_ip):
* gst/spectrum/gstspectrum.h:
Apply some of the spectrum cleanup changes suggested in #348085.

1 files changed, 6 insertions, 4 deletions

diff --git a/gst/spectrum/demo-osssrc.c b/gst/spectrum/demo-osssrc.c
index e3d7f7e1..c00db82c 100644
--- a/gst/spectrum/demo-osssrc.c
+++ b/gst/spectrum/demo-osssrc.c
@@ -27,6 +27,8 @@
 
 #define DEFAULT_AUDIOSRC "alsasrc"
 #define SPECT_BANDS 256
+#define SPECT_WIDTH (SPECT_BANDS)
+#define SPECT_HEIGHT 64
 
 static GtkWidget *drawingarea = NULL;
 
@@ -42,17 +44,17 @@ static void
 draw_spectrum (guchar * data)
 {
   gint i;
-  GdkRectangle rect = { 0, 0, SPECT_BANDS, 50 };
+  GdkRectangle rect = { 0, 0, SPECT_WIDTH, SPECT_HEIGHT };
 
   if (!drawingarea)
     return;
 
   gdk_window_begin_paint_rect (drawingarea->window, &rect);
   gdk_draw_rectangle (drawingarea->window, drawingarea->style->black_gc,
-      TRUE, 0, 0, SPECT_BANDS, 50);
+      TRUE, 0, 0, SPECT_BANDS, SPECT_HEIGHT);
   for (i = 0; i < SPECT_BANDS; i++) {
     gdk_draw_rectangle (drawingarea->window, drawingarea->style->white_gc,
-        TRUE, i, 64 - data[i], 1, data[i]);
+        TRUE, i, SPECT_HEIGHT - data[i], 1, data[i]);
   }
   gdk_window_end_paint (drawingarea->window);
 }
@@ -120,7 +122,7 @@ main (int argc, char *argv[])
       G_CALLBACK (on_window_destroy), NULL);
 
   drawingarea = gtk_drawing_area_new ();
-  gtk_widget_set_size_request (drawingarea, SPECT_BANDS, 64);
+  gtk_widget_set_size_request (drawingarea, SPECT_WIDTH, SPECT_HEIGHT);
   gtk_container_add (GTK_CONTAINER (appwindow), drawingarea);
   gtk_widget_show_all (appwindow);