X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwaveview.cc;h=9cc53355be97b3071b444f7b9d0a9e2788b2be89;hb=f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe;hp=d043a952c0d678d7787ff92f00458435390a2fd3;hpb=f69abbff90ac8b8426bb0c6e02a7f4d4a3fd5e6d;p=ardour.git

diff --git a/gtk2_ardour/waveview.cc b/gtk2_ardour/waveview.cc
index d043a952c0..9cc53355be 100644
--- a/gtk2_ardour/waveview.cc
+++ b/gtk2_ardour/waveview.cc
@@ -1,7 +1,6 @@
 #include "waveview.h"
 #include "waveview_p.h"
 
-/* $Id$ */
 
 /* waveview.cc
  *
@@ -134,13 +133,13 @@ WaveView::create_cache ()
 
 Glib::PropertyProxy<void*> WaveView::property_data_src()
 {
-	return Glib::PropertyProxy<void*> (this, "data-src");
+	return Glib::PropertyProxy<void*> (this, "data_src");
 }
 Glib::PropertyProxy_ReadOnly<void*> WaveView::property_data_src() const
 {
-	return Glib::PropertyProxy_ReadOnly<void*> (this, "data-src");
+	return Glib::PropertyProxy_ReadOnly<void*> (this, "data_src");
 }
-Glib::PropertyProxy<uint32_t> WaveView::property_channel() 
+Glib::PropertyProxy<uint32_t> WaveView::property_channel()
 {
 	return Glib::PropertyProxy<uint32_t> (this, "channel");
 }
@@ -150,43 +149,43 @@ Glib::PropertyProxy_ReadOnly<uint32_t> WaveView::property_channel()  const
 }
 Glib::PropertyProxy<void*> WaveView::property_length_function()
 {
-	return Glib::PropertyProxy<void*> (this, "length-function");
+	return Glib::PropertyProxy<void*> (this, "length_function");
 }
 Glib::PropertyProxy_ReadOnly<void*> WaveView::property_length_function() const
 {
-	return Glib::PropertyProxy_ReadOnly<void*> (this, "length-function");
+	return Glib::PropertyProxy_ReadOnly<void*> (this, "length_function");
 }
 Glib::PropertyProxy<void*> WaveView::property_sourcefile_length_function()
 {
-	return Glib::PropertyProxy<void*> (this, "sourcefile-length-function");
+	return Glib::PropertyProxy<void*> (this, "sourcefile_length_function");
 }
 Glib::PropertyProxy_ReadOnly<void*> WaveView::property_sourcefile_length_function() const
 {
-	return Glib::PropertyProxy_ReadOnly<void*> (this, "sourcefile-length-function");
+	return Glib::PropertyProxy_ReadOnly<void*> (this, "sourcefile_length_function");
 }
 Glib::PropertyProxy<void*> WaveView::property_peak_function()
 {
-	return Glib::PropertyProxy<void*> (this, "peak-function");
+	return Glib::PropertyProxy<void*> (this, "peak_function");
 }
 Glib::PropertyProxy_ReadOnly<void*> WaveView::property_peak_function() const
 {
-	return Glib::PropertyProxy_ReadOnly<void*> (this, "peak-function");
+	return Glib::PropertyProxy_ReadOnly<void*> (this, "peak_function");
 }
 Glib::PropertyProxy<void*> WaveView::property_gain_function()
 {
-	return Glib::PropertyProxy<void*> (this, "gain-function");
+	return Glib::PropertyProxy<void*> (this, "gain_function");
 }
 Glib::PropertyProxy_ReadOnly<void*> WaveView::property_gain_function() const
 {
-	return Glib::PropertyProxy_ReadOnly<void*> (this, "gain-function");
+	return Glib::PropertyProxy_ReadOnly<void*> (this, "gain_function");
 }
 Glib::PropertyProxy<void*> WaveView::property_gain_src()
 {
-	return Glib::PropertyProxy<void*> (this, "gain-src");
+	return Glib::PropertyProxy<void*> (this, "gain_src");
 }
 Glib::PropertyProxy_ReadOnly<void*> WaveView::property_gain_src() const
 {
-	return Glib::PropertyProxy_ReadOnly<void*> (this, "gain-src");
+	return Glib::PropertyProxy_ReadOnly<void*> (this, "gain_src");
 }
 Glib::PropertyProxy<void*> WaveView::property_cache()
 {
@@ -198,27 +197,27 @@ Glib::PropertyProxy_ReadOnly<void*> WaveView::property_cache() const
 }
 Glib::PropertyProxy<bool> WaveView::property_cache_updater()
 {
-	return Glib::PropertyProxy<bool> (this, "cache-updater");
+	return Glib::PropertyProxy<bool> (this, "cache_updater");
 }
 Glib::PropertyProxy_ReadOnly<bool> WaveView::property_cache_updater() const
 {
-	return Glib::PropertyProxy_ReadOnly<bool> (this, "cache-updater");
+	return Glib::PropertyProxy_ReadOnly<bool> (this, "cache_updater");
 }
 Glib::PropertyProxy<double> WaveView::property_samples_per_unit()
 {
-	return Glib::PropertyProxy<double> (this, "samples-per-unit");
+	return Glib::PropertyProxy<double> (this, "samples_per_unit");
 }
 Glib::PropertyProxy_ReadOnly<double> WaveView::property_samples_per_unit() const
 {
-	return Glib::PropertyProxy_ReadOnly<double> (this, "samples-per-unit");
+	return Glib::PropertyProxy_ReadOnly<double> (this, "samples_per_unit");
 }
 Glib::PropertyProxy<double> WaveView::property_amplitude_above_axis()
 {
-	return Glib::PropertyProxy<double> (this, "amplitude-above-axis");
+	return Glib::PropertyProxy<double> (this, "amplitude_above_axis");
 }
 Glib::PropertyProxy_ReadOnly<double> WaveView::property_amplitude_above_axis() const
 {
-	return Glib::PropertyProxy_ReadOnly<double> (this, "amplitude-above-axis");
+	return Glib::PropertyProxy_ReadOnly<double> (this, "amplitude_above_axis");
 }
 Glib::PropertyProxy<double> WaveView::property_x()
 {
@@ -252,6 +251,38 @@ Glib::PropertyProxy_ReadOnly<guint> WaveView::property_wave_color() const
 {
 	return Glib::PropertyProxy_ReadOnly<guint> (this, "wave_color");
 }
+Glib::PropertyProxy<guint> WaveView::property_clip_color()
+{
+	return Glib::PropertyProxy<guint> (this, "clip_color");
+}
+Glib::PropertyProxy_ReadOnly<guint> WaveView::property_clip_color() const
+{
+	return Glib::PropertyProxy_ReadOnly<guint> (this, "clip_color");
+}
+Glib::PropertyProxy<guint> WaveView::property_zero_color()
+{
+	return Glib::PropertyProxy<guint> (this, "zero_color");
+}
+Glib::PropertyProxy_ReadOnly<guint> WaveView::property_zero_color() const
+{
+	return Glib::PropertyProxy_ReadOnly<guint> (this, "zero_color");
+}
+Glib::PropertyProxy<guint> WaveView::property_fill_color()
+{
+	return Glib::PropertyProxy<guint> (this, "fill_color");
+}
+Glib::PropertyProxy_ReadOnly<guint> WaveView::property_fill_color() const
+{
+	return Glib::PropertyProxy_ReadOnly<guint> (this, "fill_color");
+}
+Glib::PropertyProxy<gint> WaveView::property_filled()
+{
+	return Glib::PropertyProxy<gint> (this, "filled");
+}
+Glib::PropertyProxy_ReadOnly<gint> WaveView::property_filled() const
+{
+	return Glib::PropertyProxy_ReadOnly<gint> (this, "filled");
+}
 Glib::PropertyProxy<gint> WaveView::property_rectified()
 {
 	return Glib::PropertyProxy<gint> (this, "rectified");
@@ -260,13 +291,29 @@ Glib::PropertyProxy_ReadOnly<gint> WaveView::property_rectified() const
 {
 	return Glib::PropertyProxy_ReadOnly<gint> (this, "rectified");
 }
+Glib::PropertyProxy<gint> WaveView::property_zero_line()
+{
+	return Glib::PropertyProxy<gint> (this, "zero_line");
+}
+Glib::PropertyProxy_ReadOnly<gint> WaveView::property_zero_line() const
+{
+	return Glib::PropertyProxy_ReadOnly<gint> (this, "zero_line");
+}
 Glib::PropertyProxy<guint> WaveView::property_region_start()
 {
-	return Glib::PropertyProxy<guint> (this, "region-start");
+	return Glib::PropertyProxy<guint> (this, "region_start");
 }
 Glib::PropertyProxy_ReadOnly<guint> WaveView::property_region_start() const
 {
-	return Glib::PropertyProxy_ReadOnly<guint> (this, "region-start");
+	return Glib::PropertyProxy_ReadOnly<guint> (this, "region_start");
+}
+Glib::PropertyProxy<gint> WaveView::property_logscaled()
+{
+	return Glib::PropertyProxy<gint> (this, "logscaled");
+}
+Glib::PropertyProxy_ReadOnly<gint> WaveView::property_logscaled() const
+{
+	return Glib::PropertyProxy_ReadOnly<gint> (this, "logscaled");
 }
 
 } // namespace Canvas