X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcanvas-waveview.h;h=81cf35910ee72ed6b04bdfbb6e85dab2eb03187d;hb=fc26b49ac5e177857a155a567ff9f966f330e261;hp=b868abfa6113ec5e0a2295489d229c7d9d2c914d;hpb=209d967b1bb80a9735d690d8f4f0455ecb9970ca;p=ardour.git

diff --git a/gtk2_ardour/canvas-waveview.h b/gtk2_ardour/canvas-waveview.h
index b868abfa61..81cf35910e 100644
--- a/gtk2_ardour/canvas-waveview.h
+++ b/gtk2_ardour/canvas-waveview.h
@@ -1,4 +1,4 @@
-/* gtk-canvas-waveview.h: GtkCanvas item for displaying wave data
+/* libgnomecanvas/gnome-canvas-waveview.h: GnomeCanvas item for displaying wave data
  *
  * Copyright (C) 2001 Paul Davis <pbd@op.net>
  *
@@ -19,56 +19,56 @@
  *
  */
 
-#ifndef __GTK_CANVAS_WAVEVIEW_H__
-#define __GTK_CANVAS_WAVEVIEW_H__
+#ifndef __GNOME_CANVAS_WAVEVIEW_H__
+#define __GNOME_CANVAS_WAVEVIEW_H__
 
 #include <stdint.h>
 
-#include <gtk-canvas/gtk-canvas-defs.h>
-#include "gtk-canvas/gtk-canvas.h"
+#include <libgnomecanvas/libgnomecanvas.h>
 
-BEGIN_GTK_CANVAS_DECLS
+G_BEGIN_DECLS
 
 /* Wave viewer item for canvas.
  */
 
-#define GTK_CANVAS_TYPE_CANVAS_WAVEVIEW            (gtk_canvas_waveview_get_type ())
-#define GTK_CANVAS_WAVEVIEW(obj)                   (GTK_CHECK_CAST ((obj), GTK_CANVAS_TYPE_CANVAS_WAVEVIEW, GtkCanvasWaveView))
-#define GTK_CANVAS_WAVEVIEW_CLASS(klass)           (GTK_CHECK_CLASS_CAST ((klass), GTK_CANVAS_TYPE_CANVAS_WAVEVIEW, GtkCanvasWaveViewClass))
-#define GTK_CANVAS_IS_CANVAS_WAVEVIEW(obj)         (GTK_CHECK_TYPE ((obj), GTK_CANVAS_TYPE_CANVAS_WAVEVIEW))
-#define GTK_CANVAS_IS_CANVAS_WAVEVIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_CANVAS_TYPE_CANVAS_WAVEVIEW))
+#define GNOME_TYPE_CANVAS_WAVEVIEW            (gnome_canvas_waveview_get_type ())
+#define GNOME_CANVAS_WAVEVIEW(obj)            (GTK_CHECK_CAST ((obj), GNOME_TYPE_CANVAS_WAVEVIEW, GnomeCanvasWaveView))
+#define GNOME_CANVAS_WAVEVIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_CANVAS_WAVEVIEW, GnomeCanvasWaveViewClass))
+#define GNOME_IS_CANVAS_WAVEVIEW(obj)         (GTK_CHECK_TYPE ((obj), GNOME_TYPE_CANVAS_WAVEVIEW))
+#define GNOME_IS_CANVAS_WAVEVIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_CANVAS_WAVEVIEW))
+#define GNOME_CANVAS_WAVEVIEW_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_CANVAS_WAVEVIEW, GnomeCanvasWaveViewClass))
 
-typedef struct _GtkCanvasWaveView            GtkCanvasWaveView;
-typedef struct _GtkCanvasWaveViewClass       GtkCanvasWaveViewClass;
-typedef struct _GtkCanvasWaveViewChannelInfo GtkCanvasWaveViewChannelInfo;
-typedef struct _GtkCanvasWaveViewCacheEntry  GtkCanvasWaveViewCacheEntry;
-typedef struct _GtkCanvasWaveViewCache       GtkCanvasWaveViewCache;
+typedef struct _GnomeCanvasWaveView            GnomeCanvasWaveView;
+typedef struct _GnomeCanvasWaveViewClass       GnomeCanvasWaveViewClass;
+typedef struct _GnomeCanvasWaveViewChannelInfo GnomeCanvasWaveViewChannelInfo;
+typedef struct _GnomeCanvasWaveViewCacheEntry  GnomeCanvasWaveViewCacheEntry;
+typedef struct _GnomeCanvasWaveViewCache       GnomeCanvasWaveViewCache;
 
 /* XXX this needs to be synced with ardour/source.h PeakData */
 
-struct _GtkCanvasWaveViewCacheEntry
+struct _GnomeCanvasWaveViewCacheEntry
 {
     float  min;
     float  max;
 };
 
-struct _GtkCanvasWaveViewCache
+struct _GnomeCanvasWaveViewCache
 {
-    GtkCanvasWaveViewCacheEntry* data;
+    GnomeCanvasWaveViewCacheEntry* data;
     gint32                       allocated;
     gint32                       data_size;
     gulong                       start;
     gulong                       end;
 };    
 
-GtkCanvasWaveViewCache* gtk_canvas_waveview_cache_new ();
-void                    gtk_canvas_waveview_cache_destroy (GtkCanvasWaveViewCache*);
+GnomeCanvasWaveViewCache* gnome_canvas_waveview_cache_new ();
+void                    gnome_canvas_waveview_cache_destroy (GnomeCanvasWaveViewCache*);
 
-struct _GtkCanvasWaveView
+struct _GnomeCanvasWaveView
 {
-    GtkCanvasItem item;
+    GnomeCanvasItem item;
     
-    GtkCanvasWaveViewCache *cache;
+    GnomeCanvasWaveViewCache *cache;
     gboolean                cache_updater;
     gint                    screen_width;
 
@@ -76,14 +76,14 @@ struct _GtkCanvasWaveView
     guint32 channel;
 	void (*peak_function)(void*,gulong,gulong,gulong,gpointer,guint32,double);
     gulong (*length_function)(void *);
-    gulong (*sourcefile_length_function)(void*);
+    gulong (*sourcefile_length_function)(void*,double);
     void (*gain_curve_function)(void *arg, double start, double end, float* vector, guint32 veclen);
     void *gain_src;
 
-    /* x-axis: samples per canvas unit. */
+    /** x-axis: samples per canvas unit. */
     double samples_per_unit;
     
-    /* y-axis: amplitude_above_axis.
+    /** y-axis: amplitude_above_axis.
      * 
      * the default is that an (scaled, normalized -1.0 ... +1.0) amplitude of 1.0
      * corresponds to the top of the area assigned to the waveview.
@@ -92,8 +92,8 @@ struct _GtkCanvasWaveView
      * smaller values will decrease the vertical scale, moving peaks/troughs toward
      * the middle of the area assigned to the waveview.
      */
-
     double amplitude_above_axis;
+
     double x;
     double y;
     double height;
@@ -101,7 +101,8 @@ struct _GtkCanvasWaveView
     uint32_t wave_color;
 
     char rectified;
-
+    char logscaled; 
+	
     /* These are updated by the update() routine
        to optimize the render() routine, which may
        be called several times after a single update().
@@ -117,12 +118,12 @@ struct _GtkCanvasWaveView
     int32_t reload_cache_in_render;
 };
 
-struct _GtkCanvasWaveViewClass {
-	GtkCanvasItemClass parent_class;
+struct _GnomeCanvasWaveViewClass {
+	GnomeCanvasItemClass parent_class;
 };
 
-GtkType gtk_canvas_waveview_get_type (void);
+GType gnome_canvas_waveview_get_type (void) G_GNUC_CONST;
 
-END_GTK_CANVAS_DECLS
+G_END_DECLS
 
-#endif /* __GTK_CANVAS_WAVEVIEW_H__ */
+#endif /* __GNOME_CANVAS_WAVEVIEW_H__ */