Move panner guts out of header.

Makefile

@@ -26,8 +26,8 @@ $(OBJS): Makefile
 test: $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LIBS) $(OBJS) -o $@
 
-mixer: Mixer_Strip.o Mixer.o DPM.o Fl_Scalepack.o
+mixer: Mixer_Strip.o Mixer.o DPM.o Fl_Scalepack.o Panner.o
-	$(CXX) $(CXXFLAGS) $(LIBS) Mixer_Strip.o Mixer.o DPM.o Fl_Scalepack.o -o $@
+	$(CXX) $(CXXFLAGS) $(LIBS) Mixer_Strip.o Mixer.o DPM.o Fl_Scalepack.o Panner.o -o $@
 
 
 ESRCS=Audio_File.C Audio_File_SF.C Loggable.C

Panner.C

@@ -0,0 +1,150 @@
+
+/*******************************************************************************/
+/* Copyright (C) 2008 Jonathan Moore Liles                                     */
+/*                                                                             */
+/* This program is free software; you can redistribute it and/or modify it     */
+/* under the terms of the GNU General Public License as published by the       */
+/* Free Software Foundation; either version 2 of the License, or (at your      */
+/* option) any later version.                                                  */
+/*                                                                             */
+/* This program is distributed in the hope that it will be useful, but WITHOUT */
+/* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       */
+/* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for   */
+/* more details.                                                               */
+/*                                                                             */
+/* You should have received a copy of the GNU General Public License along     */
+/* with This program; see the file COPYING.  If not,write to the Free Software */
+/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+/*******************************************************************************/
+
+
+#include "Panner.H"
+
+/* 2D Panner widget. Supports various multichannel configurations. */
+
+/* multichannel layouts, in degrees */
+int Panner::_configs[][12] =
+{
+    /* mono */
+    { -1 },
+    /* stereo */
+    { 270, 90, -1 },
+    /* quad */
+    { 315, 45, 225, 135, -1 },
+    /* 5.1 */
+    { 315, 45, 225, 135, 0, -1 },
+    /* 7.1 */
+    { 315, 45, 225, 135, 0, 270, 90, -1 },
+
+};
+
+
+Panner::Point *
+Panner::event_point ( void )
+{
+
+    int X, Y, W, H;
+
+    bbox( X, Y, W, H );
+
+    for ( int i = _ins; i--; )
+    {
+        Point *p = &_points[ i ];
+
+        if ( Fl::event_inside( X + ((p->x * (W / 2)) + (W / 2)),
+                               Y + ((p->y * (H / 2)) + (H / 2)), pw(), ph() ) )
+            return p;
+    }
+
+    return NULL;
+}
+
+void
+Panner::draw ( void )
+{
+    draw_box();
+//            draw_box( FL_FLAT_BOX, x(), y(), w(), h(), FL_BLACK );
+    draw_label();
+
+    int tw, th, tx, ty;
+
+    bbox( tx, ty, tw, th );
+
+    fl_color(  FL_GRAY );
+
+    switch ( _outs )
+    {
+        case 2:                                         /* stereo */
+
+        case 4:                                         /* quad */
+            fl_line( x(), y(), x()+ w(), y() + h() );
+            fl_line( x() + w(), y(), x(), y() + h() );
+            break;
+        case 5:                                         /* 5.1 */
+            fl_line( x(), y(), x() + w(), y() + h() );
+            fl_line( x() + w(), y(), x(), y() + h() );
+            fl_line( x() + (w() / 2), y(), x() + (w() / 2), y() + (h() / 2) );
+            break;
+
+
+    }
+
+
+
+    for ( int i = _ins; i--; )
+    {
+        Point *p = &_points[ i ];
+
+        fl_color( (Fl_Color) 10 + i );
+
+        const int bx = tx + ((tw / 2) * p->x + (tw / 2));
+        const int by = ty + ((th / 2) * p->y + (th / 2));
+
+        fl_rectf( bx, by, pw(), ph() );
+
+        char pat[4];
+        snprintf( pat, 4, "%d", i + 1 );
+
+        fl_color( FL_BLACK );
+        fl_font( FL_HELVETICA, ph() + 2 );
+        fl_draw( pat, bx, by + ph() );
+    }
+}
+
+
+int
+Panner::handle ( int m )
+{
+    static Point *drag;
+
+    switch ( m )
+    {
+
+        case FL_PUSH:
+            if ( ( drag = event_point() ) )
+            {
+                printf( "bing\n" );
+                return 1;
+            }
+            else
+                return 0;
+        case FL_RELEASE:
+            drag = NULL;
+            return 1;
+        case FL_DRAG:
+        {
+            float X = Fl::event_x() - x();
+            float Y = Fl::event_y() - y();
+
+            drag->x = (float)(X / (w() / 2)) - 1.0f;
+            drag->y = (float)(Y / (h() / 2)) - 1.0f;
+
+            redraw();
+
+            return 1;
+        }
+
+    }
+
+    return 0;
+}

Panner.H

@@ -21,11 +21,11 @@
 
 #include <FL/Fl_Widget.H>
 #include <FL/fl_draw.H>
+#include <FL/Fl.H>
 
 #include <vector>
 using namespace std;
 
-
 class Panner : public Fl_Widget
 {
 
@@ -48,6 +48,8 @@ class Panner : public Fl_Widget
     static int pw ( void ) { return 6; }
     static int ph ( void ) { return 6; }
 
+    static int _configs[][12];
+
     void bbox ( int &X, int &Y, int &W, int &H )
         {
             W = w() - Fl::box_dw( box() ) - pw();
@@ -56,6 +58,8 @@ class Panner : public Fl_Widget
             Y = y() + Fl::box_dy( box() );
         }
 
+    Point * event_point ( void );
+
 public:
 
     Panner ( int X, int Y, int W, int H, const char *L = 0 ) :
@@ -73,113 +77,8 @@ public:
 
     virtual ~Panner ( ) { }
 
-    Point *
+    virtual void draw ( void );
-    event_point ( void )
+    virtual int handle ( int );
-        {
 
-            int X, Y, W, H;
-
-            bbox( X, Y, W, H );
-
-            for ( int i = _ins; i--; )
-            {
-                Point *p = &_points[ i ];
-
-                if ( Fl::event_inside( X + ((p->x * (W / 2)) + (W / 2)),
-                                       Y + ((p->y * (H / 2)) + (H / 2)), pw(), ph() ) )
-                    return p;
-            }
-
-            return NULL;
-        }
-
-    virtual void
-    draw ( void )
-        {
-            draw_box();
-//            draw_box( FL_FLAT_BOX, x(), y(), w(), h(), FL_BLACK );
-            draw_label();
-
-            int tw, th, tx, ty;
-
-            bbox( tx, ty, tw, th );
-
-            fl_color(  FL_GRAY );
-
-            switch ( _outs )
-            {
-                case 2:                                         /* stereo */
-
-                case 4:                                         /* quad */
-                    fl_line( x(), y(), x()+ w(), y() + h() );
-                    fl_line( x() + w(), y(), x(), y() + h() );
-                    break;
-                case 5:                                         /* 5.1 */
-                    fl_line( x(), y(), x() + w(), y() + h() );
-                    fl_line( x() + w(), y(), x(), y() + h() );
-                    fl_line( x() + (w() / 2), y(), x() + (w() / 2), y() + (h() / 2) );
-                    break;
-
-
-            }
-
-
-
-            for ( int i = _ins; i--; )
-            {
-                Point *p = &_points[ i ];
-
-                fl_color( (Fl_Color) 10 + i );
-
-                const int bx = tx + ((tw / 2) * p->x + (tw / 2));
-                const int by = ty + ((th / 2) * p->y + (th / 2));
-
-                fl_rectf( bx, by, pw(), ph() );
-
-                char pat[4];
-                snprintf( pat, 4, "%d", i + 1 );
-
-                fl_color( FL_BLACK );
-                fl_font( FL_HELVETICA, ph() + 2 );
-                fl_draw( pat, bx, by + ph() );
-            }
-        }
-
-    virtual int
-    handle ( int m )
-        {
-            static Point *drag;
-
-            switch ( m )
-            {
-
-                case FL_PUSH:
-                    if ( ( drag = event_point() ) )
-                    {
-                        printf( "bing\n" );
-                        return 1;
-                    }
-                    else
-                        return 0;
-                case FL_RELEASE:
-                    drag = NULL;
-                    return 1;
-                case FL_DRAG:
-                {
-                    float X = Fl::event_x() - x();
-                    float Y = Fl::event_y() - y();
-
-                    drag->x = (float)(X / (w() / 2)) - 1.0f;
-                    drag->y = (float)(Y / (h() / 2)) - 1.0f;
-
-                    redraw();
-
-                    return 1;
-                }
-
-            }
-
-            return 0;
-        }
 
 };