From 870203b3ddb8c1145b28ba033a407b7d791a5d11 Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Wed, 20 Jun 2012 00:55:58 -0700
Subject: [PATCH] Mixer: Update for NTK transparency.

---
 mixer/src/DPM.C                    | 2 +-
 mixer/src/Meter_Indicator_Module.C | 4 +++-
 mixer/src/Mixer.C                  | 8 ++++----
 mixer/src/Mixer_Strip.C            | 3 +--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/mixer/src/DPM.C b/mixer/src/DPM.C
index 818b693..d193a75 100644
--- a/mixer/src/DPM.C
+++ b/mixer/src/DPM.C
@@ -55,7 +55,7 @@ DPM::DPM ( int X, int Y, int W, int H, const char *L ) :
     if ( DPM::_gradient[ 0 ] == 0 )
         DPM::blend( FL_GREEN, FL_RED );
 
-    box( FL_ROUNDED_BOX );
+    box( FL_FLAT_BOX );
     color( FL_BACKGROUND_COLOR );
 }
 
diff --git a/mixer/src/Meter_Indicator_Module.C b/mixer/src/Meter_Indicator_Module.C
index d06e06c..8015232 100644
--- a/mixer/src/Meter_Indicator_Module.C
+++ b/mixer/src/Meter_Indicator_Module.C
@@ -48,7 +48,7 @@ Meter_Indicator_Module::Meter_Indicator_Module ( bool is_default )
     : Module ( is_default, 50, 100, name() )
 {
     box( FL_FLAT_BOX );
-    color( FL_GREEN );
+    color( FL_BACKGROUND_COLOR );
 
     _pad = true;
     control_value = 0;
@@ -56,6 +56,8 @@ Meter_Indicator_Module::Meter_Indicator_Module ( bool is_default )
     add_port( Port( this, Port::INPUT, Port::CONTROL ) );
 
     dpm_pack = new Fl_Scalepack( x(), y(), w(), h() );
+    dpm_pack->color( FL_BACKGROUND_COLOR );
+    dpm_pack->box( FL_FLAT_BOX );
     dpm_pack->type( FL_HORIZONTAL );
 
     end();
diff --git a/mixer/src/Mixer.C b/mixer/src/Mixer.C
index 779de8a..5273969 100644
--- a/mixer/src/Mixer.C
+++ b/mixer/src/Mixer.C
@@ -360,7 +360,7 @@ Mixer::Mixer ( int X, int Y, int W, int H, const char *L ) :
     Loggable::dirty_callback( &Mixer::handle_dirty, this );
 
     _rows = 1;
-    box( FL_NO_BOX );
+    box( FL_FLAT_BOX );
     labelsize( 96 );
     { Fl_Group *o = new Fl_Group( X, Y, W, 24 );
 
@@ -411,14 +411,14 @@ Mixer::Mixer ( int X, int Y, int W, int H, const char *L ) :
         o->end();
     }
     { Fl_Scroll *o = scroll = new Fl_Scroll( X, Y + 24, W, H - 24 );
-        o->box( FL_NO_BOX );
+        o->box( FL_FLAT_BOX );
 //        o->type( Fl_Scroll::HORIZONTAL_ALWAYS );
 //        o->box( Fl_Scroll::BOTH );
         {
             Fl_Flowpack *o = mixer_strips = new Fl_Flowpack( X, Y + 24, W, H - 18 - 24 );
-            label( "Non-Mixer" );
+//            label( "Non-Mixer" );
             align( (Fl_Align)(FL_ALIGN_CENTER | FL_ALIGN_INSIDE) );
-            o->box( FL_NO_BOX );
+            o->box( FL_FLAT_BOX );
             o->type( Fl_Pack::HORIZONTAL );
             o->hspacing( 2 );
             o->vspacing( 2 );
diff --git a/mixer/src/Mixer_Strip.C b/mixer/src/Mixer_Strip.C
index cbd5230..0b2c440 100644
--- a/mixer/src/Mixer_Strip.C
+++ b/mixer/src/Mixer_Strip.C
@@ -359,8 +359,7 @@ Mixer_Strip::init ( )
     _gain_controller_mode = 0;
     _chain = 0;
 
-//    box(FL_THIN_UP_BOX);
-    box( FL_RFLAT_BOX );
+    box( FL_BORDER_BOX );
     labeltype( FL_NO_LABEL );
 
     Fl_Group::color( FL_BACKGROUND_COLOR );