[beast: 23/29] BEAST: convert enum type Bst::QSamplerDrawMode to enum class Bst::QSamplerDrawMode

[Tim Janik <timj src gnome org>]

commit dd137d4e7f0e2a74b6a50cf46e6a9e974d32780c
Author: Tim Janik <timj gnu org>
Date:   Wed Feb 3 00:04:55 2016 +0100

    BEAST: convert enum type Bst::QSamplerDrawMode to enum class Bst::QSamplerDrawMode
    
    Signed-off-by: Tim Janik <timj gnu org>

 beast-gtk/bstqsampler.cc     |   26 +++++++++++++-------------
 beast-gtk/bstsampleeditor.cc |   16 ++++++++--------
 beast-gtk/bstwaveeditor.cc   |   18 +++++++++---------
 3 files changed, 30 insertions(+), 30 deletions(-)
---
diff --git a/beast-gtk/bstqsampler.cc b/beast-gtk/bstqsampler.cc
index 3b6e2a5..c309a5e 100644
--- a/beast-gtk/bstqsampler.cc
+++ b/beast-gtk/bstqsampler.cc
@@ -93,9 +93,9 @@ bst_qsampler_class_init (BstQSamplerClass *klass)
   g_object_class_install_property (G_OBJECT_CLASS (object_class),
                                   PROP_DRAW_MODE,
                                   g_param_spec_int ("draw_mode", "Draw Mode", NULL,
-                                                     int64 (Bst::QSAMPLER_DRAW_CRANGE),
-                                                     int64 (Bst::QSAMPLER_DRAW_MAXIMUM_LINE),
-                                                     int64 (Bst::QSAMPLER_DRAW_CRANGE),
+                                                     int64 (Bst::QSamplerDrawMode::CRANGE),
+                                                     int64 (Bst::QSamplerDrawMode::MAXIMUM_LINE),
+                                                     int64 (Bst::QSamplerDrawMode::CRANGE),
                                                      G_PARAM_READWRITE));
 }
 
@@ -119,7 +119,7 @@ bst_qsampler_init (BstQSampler *qsampler)
   qsampler->green = default_green;
   qsampler->red_gc = NULL;
   qsampler->green_gc = NULL;
-  qsampler->draw_mode = Bst::QSAMPLER_DRAW_CRANGE;
+  qsampler->draw_mode = Bst::QSamplerDrawMode::CRANGE;
   qsampler->src_filler = NULL;
   qsampler->src_data = NULL;
   qsampler->src_destroy = NULL;
@@ -403,7 +403,7 @@ bst_qsampler_get_property (GObject    *object,
       g_value_set_double (value, qsampler->vscale_factor * 100.0);
       break;
     case PROP_DRAW_MODE:
-      g_value_set_int (value, qsampler->draw_mode);
+      g_value_set_int (value, int64 (qsampler->draw_mode));
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -781,15 +781,15 @@ bst_qsampler_draw_peak (BstQSampler *qsampler,
   switch (qsampler->draw_mode)
     {
       gint yb, yn;
-    case Bst::QSAMPLER_DRAW_MINIMUM_LINE:
+    case Bst::QSamplerDrawMode::MINIMUM_LINE:
       last_middle_value = last_mvalue;
       middle_value = mvalue;
       next_middle_value = next_mvalue;
-    case Bst::QSAMPLER_DRAW_MIDDLE_LINE:
+    case Bst::QSamplerDrawMode::MIDDLE_LINE:
       last_value = last_middle_value;
       value = middle_value;
       next_value = next_middle_value;
-    case Bst::QSAMPLER_DRAW_MAXIMUM_LINE:
+    case Bst::QSamplerDrawMode::MAXIMUM_LINE:
       y = zero - range * value;
       yb = zero - range * last_value;
       yn = zero - range * next_value;
@@ -797,20 +797,20 @@ bst_qsampler_draw_peak (BstQSampler *qsampler,
       yn = (y + yn) / 2;
       gdk_draw_line (canvas, fore_gc, x, MIN (y, MIN (yb, yn)), x, MAX (y, MAX (yb, yn)));
       break;
-    case Bst::QSAMPLER_DRAW_MINIMUM_SHAPE:
+    case Bst::QSamplerDrawMode::MINIMUM_SHAPE:
       y = low - (mvalue + 1) * range;
       gdk_draw_line (canvas, fore_gc, x, hi, x, y);
       break;
-    case Bst::QSAMPLER_DRAW_MAXIMUM_SHAPE:
+    case Bst::QSamplerDrawMode::MAXIMUM_SHAPE:
       y = low - (value + 1) * range;
       gdk_draw_line (canvas, fore_gc, x,  y, x, low);
       break;
-    case Bst::QSAMPLER_DRAW_CSHAPE:
+    case Bst::QSamplerDrawMode::CSHAPE:
       y = low - (value + 1) * range;
       yb = low - (mvalue + 1) * range;
       gdk_draw_line (canvas, fore_gc, x,  y, x, yb);
       break;
-    case Bst::QSAMPLER_DRAW_CRANGE:
+    case Bst::QSamplerDrawMode::CRANGE:
       {
        gint last_min = last_mpeak, last_max = last_peak;
        gint next_min = next_mpeak, next_max = next_peak;
@@ -840,7 +840,7 @@ bst_qsampler_draw_peak (BstQSampler *qsampler,
        gdk_draw_line (canvas, fore_gc, x, y1, x, y2);
       }
       break;
-    case Bst::QSAMPLER_DRAW_ZERO_SHAPE:
+    case Bst::QSamplerDrawMode::ZERO_SHAPE:
       if (middle_value > 0)
        {
          y = zero - middle_value * range;
diff --git a/beast-gtk/bstsampleeditor.cc b/beast-gtk/bstsampleeditor.cc
index ac62a99..3b55e8a 100644
--- a/beast-gtk/bstsampleeditor.cc
+++ b/beast-gtk/bstsampleeditor.cc
@@ -493,14 +493,14 @@ bst_sample_editor_rebuild (BstSampleEditor *editor)
                                    NULL);
   gtk_option_menu_set_menu (GTK_OPTION_MENU (any),
                            bst_choice_menu_createv ("<BEAST-SampleEditor>/Popup",
-                                                    BST_CHOICE (Bst::QSAMPLER_DRAW_CRANGE, _("Shape Range"), 
NONE),
-                                                    BST_CHOICE (Bst::QSAMPLER_DRAW_ZERO_SHAPE, _("Shape 
Average"), NONE),
-                                                    BST_CHOICE (Bst::QSAMPLER_DRAW_MINIMUM_SHAPE, _("Shape 
Minimum"), NONE),
-                                                    BST_CHOICE (Bst::QSAMPLER_DRAW_MAXIMUM_SHAPE, _("Shape 
Maximum"), NONE),
-                                                    BST_CHOICE (Bst::QSAMPLER_DRAW_CSHAPE, _("Sketch 
Range"), NONE),
-                                                    BST_CHOICE (Bst::QSAMPLER_DRAW_MIDDLE_LINE, _("Sketch 
Average"), NONE),
-                                                    BST_CHOICE (Bst::QSAMPLER_DRAW_MINIMUM_LINE, _("Sketch 
Minimum"), NONE),
-                                                    BST_CHOICE (Bst::QSAMPLER_DRAW_MAXIMUM_LINE, _("Sketch 
Maximum"), NONE),
+                                                    BST_CHOICE (Bst::QSamplerDrawMode::CRANGE, _("Shape 
Range"), NONE),
+                                                    BST_CHOICE (Bst::QSamplerDrawMode::ZERO_SHAPE, _("Shape 
Average"), NONE),
+                                                    BST_CHOICE (Bst::QSamplerDrawMode::MINIMUM_SHAPE, 
_("Shape Minimum"), NONE),
+                                                    BST_CHOICE (Bst::QSamplerDrawMode::MAXIMUM_SHAPE, 
_("Shape Maximum"), NONE),
+                                                    BST_CHOICE (Bst::QSamplerDrawMode::CSHAPE, _("Sketch 
Range"), NONE),
+                                                    BST_CHOICE (Bst::QSamplerDrawMode::MIDDLE_LINE, 
_("Sketch Average"), NONE),
+                                                    BST_CHOICE (Bst::QSamplerDrawMode::MINIMUM_LINE, 
_("Sketch Minimum"), NONE),
+                                                    BST_CHOICE (Bst::QSamplerDrawMode::MAXIMUM_LINE, 
_("Sketch Maximum"), NONE),
                                                     BST_CHOICE_END));
   g_object_connect (any,
                    "swapped_signal::changed", change_draw_mode, editor,
diff --git a/beast-gtk/bstwaveeditor.cc b/beast-gtk/bstwaveeditor.cc
index 96a8b2a..ab31d80 100644
--- a/beast-gtk/bstwaveeditor.cc
+++ b/beast-gtk/bstwaveeditor.cc
@@ -197,18 +197,18 @@ bst_wave_editor_init (BstWaveEditor *self)
   any = (GtkWidget*) g_object_new (GTK_TYPE_OPTION_MENU, "visible", TRUE, NULL);
   gtk_option_menu_set_menu (GTK_OPTION_MENU (any),
                            bst_choice_menu_createv ("<BEAST-WaveEditor>/QSamplerDrawType",
-                                                    BST_CHOICE (Bst::QSAMPLER_DRAW_CRANGE, _("Shape Range"), 
NONE),
-                                                    BST_CHOICE (Bst::QSAMPLER_DRAW_ZERO_SHAPE, _("Shape 
Average"), NONE),
-                                                    BST_CHOICE (Bst::QSAMPLER_DRAW_MINIMUM_SHAPE, _("Shape 
Minimum"), NONE),
-                                                    BST_CHOICE (Bst::QSAMPLER_DRAW_MAXIMUM_SHAPE, _("Shape 
Maximum"), NONE),
-                                                    BST_CHOICE (Bst::QSAMPLER_DRAW_CSHAPE, _("Sketch 
Range"), NONE),
-                                                    BST_CHOICE (Bst::QSAMPLER_DRAW_MIDDLE_LINE, _("Sketch 
Average"), NONE),
-                                                    BST_CHOICE (Bst::QSAMPLER_DRAW_MINIMUM_LINE, _("Sketch 
Minimum"), NONE),
-                                                    BST_CHOICE (Bst::QSAMPLER_DRAW_MAXIMUM_LINE, _("Sketch 
Maximum"), NONE),
+                                                    BST_CHOICE (Bst::QSamplerDrawMode::CRANGE, _("Shape 
Range"), NONE),
+                                                    BST_CHOICE (Bst::QSamplerDrawMode::ZERO_SHAPE, _("Shape 
Average"), NONE),
+                                                    BST_CHOICE (Bst::QSamplerDrawMode::MINIMUM_SHAPE, 
_("Shape Minimum"), NONE),
+                                                    BST_CHOICE (Bst::QSamplerDrawMode::MAXIMUM_SHAPE, 
_("Shape Maximum"), NONE),
+                                                    BST_CHOICE (Bst::QSamplerDrawMode::CSHAPE, _("Sketch 
Range"), NONE),
+                                                    BST_CHOICE (Bst::QSamplerDrawMode::MIDDLE_LINE, 
_("Sketch Average"), NONE),
+                                                    BST_CHOICE (Bst::QSamplerDrawMode::MINIMUM_LINE, 
_("Sketch Minimum"), NONE),
+                                                    BST_CHOICE (Bst::QSamplerDrawMode::MAXIMUM_LINE, 
_("Sketch Maximum"), NONE),
                                                     BST_CHOICE_END));
   g_object_connect (any, "swapped_signal::changed", change_draw_mode, self, NULL);
   gtk_option_menu_set_history (GTK_OPTION_MENU (any), 0);
-  self->draw_mode = Bst::QSAMPLER_DRAW_CRANGE;
+  self->draw_mode = Bst::QSamplerDrawMode::CRANGE;
   gmask = bst_gmask_quick (self->gmask_parent, 2, NULL, any, NULL);
 
   /* playback handle */