From 7a702eefb8761e93de8037121762a0bcb7d55383 Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Tue, 2 Feb 2010 17:55:58 -0600
Subject: [PATCH] Fix a mismerge that caused meter indicators not to be
 updated.

---
 mixer/src/Meter_Indicator_Module.C | 4 +++-
 mixer/src/Meter_Indicator_Module.H | 5 +----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/mixer/src/Meter_Indicator_Module.C b/mixer/src/Meter_Indicator_Module.C
index c66e219..23eda8f 100644
--- a/mixer/src/Meter_Indicator_Module.C
+++ b/mixer/src/Meter_Indicator_Module.C
@@ -257,13 +257,15 @@ Meter_Indicator_Module::handle_control_changed ( Port *p )
 /**********/
 
 void
-Meter_Indicator_Module::process ( void )
+Meter_Indicator_Module::process ( nframes_t )
 {
     if ( control_input[0].connected() )
     {
         Port *p = control_input[0].connected_port();
 
         for ( int i = 0; i < p->hints.dimensions; ++i )
+	  {
             control_value[i] = ((float*)control_input[0].buffer())[i];
+	  }
     }
 }
diff --git a/mixer/src/Meter_Indicator_Module.H b/mixer/src/Meter_Indicator_Module.H
index 3bffd70..b828359 100644
--- a/mixer/src/Meter_Indicator_Module.H
+++ b/mixer/src/Meter_Indicator_Module.H
@@ -58,16 +58,13 @@ public:
 
     LOG_CREATE_FUNC( Meter_Indicator_Module );
 
-    void process ( nframes_t ) { }
+    void process ( nframes_t );
 
 protected:
 
     void get ( Log_Entry &e ) const;
     void set ( Log_Entry &e );
 
-    //   virtual void draw ( void );
-    virtual void process ( void );
-
     virtual void draw ( void )
         {
             draw_box();