1 files changed, 23 insertions, 23 deletions

diff --git a/plugins/eg-scope.lv2/examploscope_ui.c b/plugins/eg-scope.lv2/examploscope_ui.c
index 1c82d44..50b8f4c 100644
--- a/plugins/eg-scope.lv2/examploscope_ui.c
+++ b/plugins/eg-scope.lv2/examploscope_ui.c
@@ -1,14 +1,14 @@
 // Copyright 2013 Robin Gareus <robin@gareus.org>
 // SPDX-License-Identifier: ISC
 
-#include "./uris.h"
+#include "uris.h"
 
-#include "lv2/atom/atom.h"
-#include "lv2/atom/forge.h"
-#include "lv2/atom/util.h"
-#include "lv2/core/lv2.h"
-#include "lv2/ui/ui.h"
-#include "lv2/urid/urid.h"
+#include <lv2/atom/atom.h>
+#include <lv2/atom/forge.h>
+#include <lv2/atom/util.h>
+#include <lv2/core/lv2.h>
+#include <lv2/ui/ui.h>
+#include <lv2/urid/urid.h>
 
 #include <cairo.h>
 #include <gdk/gdk.h>
@@ -167,7 +167,7 @@ send_ui_enable(LV2UI_Handle handle)
 static gboolean
 on_cfg_changed(GtkWidget* widget, gpointer data)
 {
-  EgScopeUI* ui = (EgScopeUI*)data;
+  const EgScopeUI* ui = (const EgScopeUI*)data;
   if (!ui->updating) {
     // Only send UI state if the change is from user interaction
     send_ui_state(data);
@@ -206,6 +206,7 @@ on_expose_event(GtkWidget* widget, GdkEventExpose* ev, gpointer data)
   assert(start < DAWIDTH);
   assert(end <= DAWIDTH);
   assert(start < end);
+  assert(ui->n_channels <= 2U);
 
   for (uint32_t c = 0; c < ui->n_channels; ++c) {
     ScoChan* chn = &ui->chn[c];
@@ -219,10 +220,10 @@ on_expose_event(GtkWidget* widget, GdkEventExpose* ev, gpointer data)
      *      - (DAHEIGHT / 2) * (VAL) * (GAIN)
      *    )
      */
-    const float chn_y_offset = DAHEIGHT * c + DAHEIGHT * 0.5f - 0.5f;
-    const float chn_y_scale  = DAHEIGHT * 0.5f * gain;
+    const float chn_y_offset = (DAHEIGHT * c) + (DAHEIGHT * 0.5f) - 0.5f;
+    const float chn_y_scale  = (DAHEIGHT * 0.5f) * gain;
 
-#define CYPOS(VAL) (chn_y_offset - (VAL)*chn_y_scale)
+#define CYPOS(VAL) (chn_y_offset - ((VAL) * chn_y_scale))
 
     cairo_save(cr);
 
@@ -292,15 +293,15 @@ on_expose_event(GtkWidget* widget, GdkEventExpose* ev, gpointer data)
     // Channel separator
     if (c > 0) {
       cairo_set_source_rgba(cr, .5, .5, .5, 1.0);
-      cairo_move_to(cr, 0, DAHEIGHT * c - .5);
-      cairo_line_to(cr, DAWIDTH, DAHEIGHT * c - .5);
+      cairo_move_to(cr, 0, (DAHEIGHT * c) - .5);
+      cairo_line_to(cr, DAWIDTH, (DAHEIGHT * c) - .5);
       cairo_stroke(cr);
     }
 
     // Zero scale line
     cairo_set_source_rgba(cr, .3, .3, .7, .5);
-    cairo_move_to(cr, 0, DAHEIGHT * (c + .5) - .5);
-    cairo_line_to(cr, DAWIDTH, DAHEIGHT * (c + .5) - .5);
+    cairo_move_to(cr, 0, (DAHEIGHT * (c + .5)) - .5);
+    cairo_line_to(cr, DAWIDTH, (DAHEIGHT * (c + .5)) - .5);
     cairo_stroke(cr);
   }
 
@@ -327,12 +328,12 @@ on_expose_event(GtkWidget* widget, GdkEventExpose* ev, gpointer data)
    and https://github.com/x42/sisco.lv2
 */
 static int
-process_channel(EgScopeUI*   ui,
-                ScoChan*     chn,
-                const size_t n_elem,
-                float const* data,
-                uint32_t*    idx_start,
-                uint32_t*    idx_end)
+process_channel(const EgScopeUI* ui,
+                ScoChan*         chn,
+                const size_t     n_elem,
+                float const*     data,
+                uint32_t*        idx_start,
+                uint32_t*        idx_end)
 {
   int overflow = 0;
   *idx_start   = chn->idx;
@@ -655,8 +656,7 @@ static const LV2UI_Descriptor descriptor = {SCO_URI "#ui",
                                             port_event,
                                             NULL};
 
-LV2_SYMBOL_EXPORT
-const LV2UI_Descriptor*
+LV2_SYMBOL_EXPORT const LV2UI_Descriptor*
 lv2ui_descriptor(uint32_t index)
 {
   return index == 0 ? &descriptor : NULL;