misc ctrl editor fixes&cleanups for midi editors

57 files changed, 952 insertions, 321 deletions

diff --git a/muse/muse/arranger/canvas.cpp b/muse/muse/arranger/canvas.cpp
index e9f24bc4..ae6c2457 100644
--- a/muse/muse/arranger/canvas.cpp
+++ b/muse/muse/arranger/canvas.cpp
@@ -980,7 +980,7 @@ void PartCanvas::dragMove(QDragMoveEvent* event)
       state = S_DRAG4;
       ArrangerTrack* at = &(track->arrangerTrack);
       int y = at->tw->y() - splitWidth/2;
-      int h = at->tw->height();
+//      int h = at->tw->height();
 
       PartCanvas* cw = (PartCanvas*)event->source();
       QRect updateRect(drag);
diff --git a/muse/muse/arranger/tlswidget.cpp b/muse/muse/arranger/tlswidget.cpp
index 1285904d..1bc72bd4 100644
--- a/muse/muse/arranger/tlswidget.cpp
+++ b/muse/muse/arranger/tlswidget.cpp
@@ -142,9 +142,6 @@ TLSWidget::TLSWidget(Track* t, ArrangerTrack* atrack, TimeCanvas* timeC)
       l->addWidget(ctrlList);
       ctrlList->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 
-      updateController();
-
-      connect(_track, SIGNAL(clChanged()), SLOT(updateController()));
       connect(_track, SIGNAL(selectionChanged(bool)), SLOT(selectionChanged()));
       connect(_track, SIGNAL(controllerChanged(int)), SLOT(controllerListChanged(int)));
       connect(_track, SIGNAL(autoReadChanged(bool)), SLOT(autoReadChanged()));
@@ -193,14 +190,6 @@ void TLSWidget::configChanged()
       }
 
 //---------------------------------------------------------
-//   updateController
-//---------------------------------------------------------
-
-void TLSWidget::updateController()
-      {
-      }
-
-//---------------------------------------------------------
 //   showControllerList
 //---------------------------------------------------------
 
@@ -224,7 +213,6 @@ void TLSWidget::showControllerList()
                   break;
             ConfigMidiCtrl* mce = new ConfigMidiCtrl((MidiTrack*)_track);
             mce->exec();
-            updateController();
             delete mce;
             }
       setCtrl(id);
@@ -244,7 +232,6 @@ void TLSWidget::setCtrl(int ctrl)
             }
       
       if (_ctrlTrack && _ctrlTrack != _track) {
-            disconnect(_ctrlTrack, SIGNAL(clChanged()), this, SLOT(updateController()));
             disconnect(_ctrlTrack, SIGNAL(controllerChanged(int)), this, SLOT(controllerListChanged(int)));
             }
       if (ctrl == CTRL_VELOCITY) {
@@ -261,7 +248,6 @@ void TLSWidget::setCtrl(int ctrl)
                   MidiChannel* mc = ((MidiTrack*)_track)->channel();
                   at->controller = mc->getController(ctrl);
                   _ctrlTrack = mc;
-                  connect(_ctrlTrack, SIGNAL(clChanged()), SLOT(updateController()));
                   connect(_ctrlTrack, SIGNAL(controllerChanged(int)), SLOT(controllerListChanged(int)));
                   }
             else
diff --git a/muse/muse/arranger/tlswidget.h b/muse/muse/arranger/tlswidget.h
index a6e8045f..8f30a482 100644
--- a/muse/muse/arranger/tlswidget.h
+++ b/muse/muse/arranger/tlswidget.h
@@ -44,7 +44,6 @@ class TLSWidget : public QWidget, public CtrlEditor {
       Track* _ctrlTrack;      // track were ctrl belongs to
       TimeCanvas* _tc;
       QToolButton* ctrlList;
-//      CtrlDialog* ctrlMenu;
       QLineEdit* nameEdit;
       ArrangerTrack* at;
 
@@ -59,7 +58,6 @@ class TLSWidget : public QWidget, public CtrlEditor {
 
    private slots:
       void labelMinusClicked();
-      void updateController();
       void showControllerList();
       void selectionChanged();
       void configChanged();
diff --git a/muse/muse/ctrl/ctrleditor.cpp b/muse/muse/ctrl/ctrleditor.cpp
index e0e1db3b..1623ae4f 100644
--- a/muse/muse/ctrl/ctrleditor.cpp
+++ b/muse/muse/ctrl/ctrleditor.cpp
@@ -108,7 +108,7 @@ void CtrlEditor::paint(QPainter& p, const QRect& r)
             }
       else {
             if (!ctrl()->empty()) {
-                  int x1 = from, y1, x2, y2;
+                  int x1 = from, y1 = 0, x2 = 0, y2 = 0;
                   ciCtrlVal i = ctrl()->begin();
                   if (i != ctrl()->end()) {
                         x1 = tc()->pos2pix(Pos(i->first, tt));
@@ -378,51 +378,3 @@ void CtrlEditor::mouseMove(const QPoint& pos)
             }
       tc()->widget()->update();
       }
-
-//---------------------------------------------------------
-//   populateControllerMenu
-//---------------------------------------------------------
-
-void CtrlEditor::populateControllerMenu(QMenu* ctrlMenu)
-      {
-      ctrlMenu->clear();
-      int idx = 0;
-
-      QAction* a;
-      if (track()->type() == Track::MIDI) {
-            a = ctrlMenu->addAction("Velocity");
-            a->setData(CTRL_VELOCITY);
-            if (CTRL_VELOCITY == ctrl()->id())
-                  ctrlMenu->setActiveAction(a);
-            if (((MidiTrack*)(track()))->drumMap()) {
-            	a = ctrlMenu->addAction("Single Velocity");
-            	a->setData(CTRL_SVELOCITY);
-            	if (CTRL_SVELOCITY == ctrl()->id())
-                  	ctrlMenu->setActiveAction(a);
-                  }
-            }
-
-      ControllerNameList* cn = track()->controllerNames();
-      for (iControllerName i = cn->begin(); i != cn->end(); ++i, ++idx) {
-            a = ctrlMenu->addAction(i->name);
-            a->setData(i->id);
-            if (i->id == ctrl()->id())
-                  ctrlMenu->setActiveAction(a);
-            }
-      if (track()->type() == Track::MIDI) {
-            MidiChannel* mc = ((MidiTrack*)track())->channel();
-            if (mc) {
-                  ControllerNameList* cn = mc->controllerNames();
-                  for (iControllerName i = cn->begin(); i != cn->end(); ++i, ++idx) {
-                        a = ctrlMenu->addAction(i->name);
-                        a->setData(i->id);
-                        if (i->id == ctrl()->id())
-                              ctrlMenu->setActiveAction(a);
-                        }
-                  }
-            }
-      a = ctrlMenu->addAction("other");
-      a->setData(CTRL_OTHER);
-      delete cn;
-      }
-
diff --git a/muse/muse/ctrl/ctrleditor.h b/muse/muse/ctrl/ctrleditor.h
index d0f2152e..3df29507 100644
--- a/muse/muse/ctrl/ctrleditor.h
+++ b/muse/muse/ctrl/ctrleditor.h
@@ -52,7 +52,6 @@ class CtrlEditor {
 
    protected:
       int singlePitch;
-      void populateControllerMenu(QMenu* ctrlMenu);
 
    public:
       CtrlEditor();
diff --git a/muse/muse/driver/alsamidi.cpp b/muse/muse/driver/alsamidi.cpp
index a0353db5..f36ec681 100644
--- a/muse/muse/driver/alsamidi.cpp
+++ b/muse/muse/driver/alsamidi.cpp
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: alsamidi.cpp,v 1.35 2006/04/20 10:07:34 wschweer Exp $
-//  (C) Copyright 2000-2001 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "alsamidi.h"
 #include "globals.h"
diff --git a/muse/muse/driver/alsamidi.h b/muse/muse/driver/alsamidi.h
index 02beb29c..57c255d8 100644
--- a/muse/muse/driver/alsamidi.h
+++ b/muse/muse/driver/alsamidi.h
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: alsamidi.h,v 1.10 2005/12/19 16:16:27 wschweer Exp $
-//  (C) Copyright 2001 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __ALSAMIDI_H__
 #define __ALSAMIDI_H__
diff --git a/muse/muse/driver/alsatimer.cpp b/muse/muse/driver/alsatimer.cpp
index 40d8902d..9aae9f10 100644
--- a/muse/muse/driver/alsatimer.cpp
+++ b/muse/muse/driver/alsatimer.cpp
@@ -1,13 +1,25 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: alsatimer.cpp,v 1.4 2006/01/13 18:23:39 spamatica Exp $
+//  $Id:$
 //
 //  Plenty of code borrowed from timer.c example in
 //  alsalib 1.0.7
 //
 //  (C) Copyright 2004 Robert Jonsson (rj@spamatica.se)
-//=========================================================
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "alsatimer.h"
 
diff --git a/muse/muse/driver/alsatimer.h b/muse/muse/driver/alsatimer.h
index 9a1632f6..b04d9264 100644
--- a/muse/muse/driver/alsatimer.h
+++ b/muse/muse/driver/alsatimer.h
@@ -1,13 +1,25 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: alsatimer.h,v 1.4 2006/01/13 18:23:39 spamatica Exp $
+//  $Id:$
 //
 //  Plenty of code borrowed from timer.c example in
 //  alsalib 1.0.7
 //
 //  (C) Copyright 2004 Robert Jonsson (rj@spamatica.se)
-//=========================================================
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __ALSATIMER_H__
 #define __ALSATIMER_H__
diff --git a/muse/muse/driver/audiodev.h b/muse/muse/driver/audiodev.h
index 92ef8c76..607162b0 100644
--- a/muse/muse/driver/audiodev.h
+++ b/muse/muse/driver/audiodev.h
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: audiodev.h,v 1.10 2006/01/17 17:18:07 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 1999/2000 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __AUDIODEV_H__
 #define __AUDIODEV_H__
diff --git a/muse/muse/driver/coremidi.cpp b/muse/muse/driver/coremidi.cpp
index 6abfe43c..b785fb03 100644
--- a/muse/muse/driver/coremidi.cpp
+++ b/muse/muse/driver/coremidi.cpp
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: alsamidi.cpp,v 1.35 2006/04/20 10:07:34 wschweer Exp $
-//  (C) Copyright 2000-2001 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "coremidi.h"
 #include "globals.h"
diff --git a/muse/muse/driver/coremidi.h b/muse/muse/driver/coremidi.h
index cca3ddf2..316bd9f1 100644
--- a/muse/muse/driver/coremidi.h
+++ b/muse/muse/driver/coremidi.h
@@ -1,16 +1,26 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: alsamidi.h,v 1.10 2005/12/19 16:16:27 wschweer Exp $
-//  (C) Copyright 2001 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __COREMIDI_H__
 #define __COREMIDI_H__
 
-// #include <config.h>
-//#include <alsa/asoundlib.h>
-
 #include "driver.h"
 
 class MidiSeq;
diff --git a/muse/muse/driver/coretimer.cpp b/muse/muse/driver/coretimer.cpp
index 2c2da475..627960d5 100644
--- a/muse/muse/driver/coretimer.cpp
+++ b/muse/muse/driver/coretimer.cpp
@@ -1,13 +1,23 @@
-  //=========================================================
-  //  MusE
-  //  Linux Music Editor
-  //  $Id: rtctimer.cpp,v 1.1.2.8 2006/01/13 18:10:55 wschweer Exp $
-  //
-  //  Most code moved from midiseq.cpp by Werner Schweer.
-  //
-  //  (C) Copyright 2004 Robert Jonsson (rj@spamatica.se)
-  //  (C) Copyright -2004 Werner Schweer (werner@seh.de)
-  //=========================================================
+//=============================================================================
+//  MusE
+//  Linux Music Editor
+//  $Id:$
+//
+//  (C) Copyright 2004 Robert Jonsson (rj@spamatica.se)
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "coretimer.h"
 #include "globals.h"
diff --git a/muse/muse/driver/coretimer.h b/muse/muse/driver/coretimer.h
index 6096101f..a6342098 100644
--- a/muse/muse/driver/coretimer.h
+++ b/muse/muse/driver/coretimer.h
@@ -1,18 +1,29 @@
-  //=========================================================
-  //  MusE
-  //  Linux Music Editor
-  //  $Id: rtctimer.h,v 1.1.2.3 2005/08/21 18:11:28 spamatica Exp $
-  //
-  //  (C) Copyright 2004-2006 Robert Jonsson (rj@spamatica.se)
-  //  (C) Copyright -2004 Werner Schweer (werner@seh.de)
-  //=========================================================
+//=============================================================================
+//  MusE
+//  Linux Music Editor
+//  $Id:$
+//
+//  (C) Copyright 2004-2006 Robert Jonsson (rj@spamatica.se)
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __CORETIMER_H__
 #define __CORETIMER_H__
 
 #include "timerdev.h"
 
-
 //---------------------------------------------------------
 //   AlsaTimer
 //---------------------------------------------------------
diff --git a/muse/muse/driver/driver.h b/muse/muse/driver/driver.h
index 835cac58..38ae8d4d 100644
--- a/muse/muse/driver/driver.h
+++ b/muse/muse/driver/driver.h
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: driver.h,v 1.4 2005/12/19 16:16:27 wschweer Exp $
-//  (C) Copyright 2005 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __DRIVER_H__
 #define __DRIVER_H__
diff --git a/muse/muse/driver/dummyaudio.cpp b/muse/muse/driver/dummyaudio.cpp
index 6b680ab9..7abe8196 100644
--- a/muse/muse/driver/dummyaudio.cpp
+++ b/muse/muse/driver/dummyaudio.cpp
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: dummyaudio.cpp,v 1.20 2006/01/17 17:18:07 wschweer Exp $
-//  (C) Copyright 2002-2003 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "al/al.h"
 #include "widgets/utils.h"
diff --git a/muse/muse/driver/jack.cpp b/muse/muse/driver/jack.cpp
index c8df9101..4d81a459 100644
--- a/muse/muse/driver/jack.cpp
+++ b/muse/muse/driver/jack.cpp
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: jack.cpp,v 1.51 2006/01/26 16:11:22 wschweer Exp $
-//  (C) Copyright 2002-2005 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "al/al.h"
 #include "al/tempo.h"
diff --git a/muse/muse/driver/jackaudio.h b/muse/muse/driver/jackaudio.h
index b0d1c527..35eba57d 100644
--- a/muse/muse/driver/jackaudio.h
+++ b/muse/muse/driver/jackaudio.h
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: jackaudio.h,v 1.29 2006/01/17 17:18:07 wschweer Exp $
-//  (C) Copyright 2002 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __JACKAUDIO_H__
 #define __JACKAUDIO_H__
diff --git a/muse/muse/driver/mididev.h b/muse/muse/driver/mididev.h
index 10f4bcd6..0d52e2d3 100644
--- a/muse/muse/driver/mididev.h
+++ b/muse/muse/driver/mididev.h
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: audiodev.h,v 1.10 2006/01/17 17:18:07 wschweer Exp $
+//  $Id:$
 //
 //  (C) Copyright 2006 Robert Jonsson rj at spamatica.se
-//=========================================================
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __MIDIDEV_H__
 #define __MIDIDEV_H__
diff --git a/muse/muse/driver/posixtimer.cpp b/muse/muse/driver/posixtimer.cpp
index e8601063..c5622bb3 100644
--- a/muse/muse/driver/posixtimer.cpp
+++ b/muse/muse/driver/posixtimer.cpp
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: posixtimer.cpp,v 1.2 2005/11/23 13:55:32 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2005 Werner Schweer (werner@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 //
 // support posix high resolution timers
diff --git a/muse/muse/driver/posixtimer.h b/muse/muse/driver/posixtimer.h
index 62bd483a..c68945b2 100644
--- a/muse/muse/driver/posixtimer.h
+++ b/muse/muse/driver/posixtimer.h
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: posixtimer.h,v 1.1 2005/11/14 20:05:36 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2005 Werner Schweer (werner@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __POSIXTIMER_H__
 #define __POSIXTIMER_H__
diff --git a/muse/muse/driver/rtctimer.cpp b/muse/muse/driver/rtctimer.cpp
index 2e33cb02..d683f4c6 100644
--- a/muse/muse/driver/rtctimer.cpp
+++ b/muse/muse/driver/rtctimer.cpp
@@ -1,13 +1,23 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: rtctimer.cpp,v 1.9 2006/01/13 18:23:39 spamatica Exp $
-//
-//  Most code moved from midiseq.cpp by Werner Schweer.
+//  $Id:$
 //
 //  (C) Copyright 2004 Robert Jonsson (rj@spamatica.se)
-//  (C) Copyright -2004 Werner Schweer (werner@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include <linux/version.h>
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
diff --git a/muse/muse/driver/rtctimer.h b/muse/muse/driver/rtctimer.h
index c699439c..ca4532df 100644
--- a/muse/muse/driver/rtctimer.h
+++ b/muse/muse/driver/rtctimer.h
@@ -1,13 +1,23 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: rtctimer.h,v 1.5 2006/01/13 18:23:39 spamatica Exp $
-//
-//  Most code moved from midiseq.cpp
+//  $Id:$
 //
 //  (C) Copyright 2004 Robert Jonsson (rj@spamatica.se)
-//  (C) Copyright 2004 Werner Schweer (werner@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __RTCTIMER_H__
 #define __RTCTIMER_H__
diff --git a/muse/muse/driver/timerdev.h b/muse/muse/driver/timerdev.h
index f791372f..923d39a3 100644
--- a/muse/muse/driver/timerdev.h
+++ b/muse/muse/driver/timerdev.h
@@ -1,13 +1,25 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: timerdev.h,v 1.6 2006/01/13 18:23:39 spamatica Exp $
+//  $Id:$
 //
 //  Plenty of code borrowed from timer.c example in
 //  alsalib 1.0.7
 //
 //  (C) Copyright 2004 Robert Jonsson (rj@spamatica.se)
-//=========================================================
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __TIMERDEV_H__
 #define __TIMERDEV_H__
diff --git a/muse/muse/instruments/editinstrument.cpp b/muse/muse/instruments/editinstrument.cpp
index 9b06c78f..c0a1c736 100644
--- a/muse/muse/instruments/editinstrument.cpp
+++ b/muse/muse/instruments/editinstrument.cpp
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: editinstrument.cpp,v 1.6 2005/12/12 22:03:44 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2005 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "editinstrument.h"
 #include "minstrument.h"
diff --git a/muse/muse/instruments/editinstrument.h b/muse/muse/instruments/editinstrument.h
index a5d5cec9..54f6f5e5 100644
--- a/muse/muse/instruments/editinstrument.h
+++ b/muse/muse/instruments/editinstrument.h
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: editinstrument.h,v 1.5 2005/12/12 22:09:09 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2003 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __EDITINSTRUMENT_H__
 #define __EDITINSTRUMENT_H__
diff --git a/muse/muse/instruments/midictrledit.cpp b/muse/muse/instruments/midictrledit.cpp
index 9c340cb2..b2f33e30 100644
--- a/muse/muse/instruments/midictrledit.cpp
+++ b/muse/muse/instruments/midictrledit.cpp
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: midictrledit.cpp,v 1.3 2005/09/22 20:12:59 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2003 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "app.h"
 #include "driver/mididev.h"
diff --git a/muse/muse/instruments/midictrledit.h b/muse/muse/instruments/midictrledit.h
index c42b9be5..321f14b7 100644
--- a/muse/muse/instruments/midictrledit.h
+++ b/muse/muse/instruments/midictrledit.h
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: midictrledit.h,v 1.2 2005/09/22 20:12:59 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 1999/2000 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __MIDICTRLEDIT_H__
 #define __MIDICTRLEDIT_H__
diff --git a/muse/muse/instruments/minstrument.cpp b/muse/muse/instruments/minstrument.cpp
index 5394dcec..e7d16af4 100644
--- a/muse/muse/instruments/minstrument.cpp
+++ b/muse/muse/instruments/minstrument.cpp
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: minstrument.cpp,v 1.28 2006/01/27 10:35:25 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2000-2004 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "minstrument.h"
 #include "track.h"
diff --git a/muse/muse/instruments/minstrument.h b/muse/muse/instruments/minstrument.h
index a18c7e82..b18eaa13 100644
--- a/muse/muse/instruments/minstrument.h
+++ b/muse/muse/instruments/minstrument.h
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: minstrument.h,v 1.15 2006/01/14 17:08:48 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2000 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __MINSTRUMENT_H__
 #define __MINSTRUMENT_H__
diff --git a/muse/muse/marker/markerview.cpp b/muse/muse/marker/markerview.cpp
index e07e7ab0..0e3dc55c 100644
--- a/muse/muse/marker/markerview.cpp
+++ b/muse/muse/marker/markerview.cpp
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: markerview.cpp,v 1.25 2006/02/06 17:57:21 wschweer Exp $
-//  (C) Copyright 2000 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "markerview.h"
 #include "globals.h"
diff --git a/muse/muse/marker/markerview.h b/muse/muse/marker/markerview.h
index 844ce2fd..2129d415 100644
--- a/muse/muse/marker/markerview.h
+++ b/muse/muse/marker/markerview.h
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: markerview.h,v 1.16 2006/02/06 17:57:21 wschweer Exp $
-//  (C) Copyright 2000 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __MARKERVIEW_H__
 #define __MARKERVIEW_H__
diff --git a/muse/muse/master/master.cpp b/muse/muse/master/master.cpp
index 6a9dd96b..d033753c 100644
--- a/muse/muse/master/master.cpp
+++ b/muse/muse/master/master.cpp
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: master.cpp,v 1.16 2006/02/06 17:57:21 wschweer Exp $
-//  (C) Copyright 2000 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "master.h"
 #include "icons.h"
diff --git a/muse/muse/master/master.h b/muse/muse/master/master.h
index 1c353775..54899663 100644
--- a/muse/muse/master/master.h
+++ b/muse/muse/master/master.h
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: master.h,v 1.12 2005/12/09 17:54:16 wschweer Exp $
-//  (C) Copyright 1999 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __MASTER_H__
 #define __MASTER_H__
diff --git a/muse/muse/master/masteredit.cpp b/muse/muse/master/masteredit.cpp
index 6f130cfc..2b2d84d7 100644
--- a/muse/muse/master/masteredit.cpp
+++ b/muse/muse/master/masteredit.cpp
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: masteredit.cpp,v 1.31 2006/02/01 18:40:47 wschweer Exp $
-//  (C) Copyright 1999-2006 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "song.h"
 #include "masteredit.h"
diff --git a/muse/muse/master/masteredit.h b/muse/muse/master/masteredit.h
index 48ed5d36..e60f3a67 100644
--- a/muse/muse/master/masteredit.h
+++ b/muse/muse/master/masteredit.h
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: masteredit.h,v 1.20 2006/02/01 18:40:47 wschweer Exp $
-//  (C) Copyright 1999 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __MASTER_EDIT_H__
 #define __MASTER_EDIT_H__
diff --git a/muse/muse/midiedit/citem.cpp b/muse/muse/midiedit/citem.cpp
index be987ddf..0f3070f2 100644
--- a/muse/muse/midiedit/citem.cpp
+++ b/muse/muse/midiedit/citem.cpp
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: citem.cpp,v 1.5 2006/01/07 16:29:13 wschweer Exp $
-//  (C) Copyright 1999 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "part.h"
 #include "citem.h"
diff --git a/muse/muse/midiedit/citem.h b/muse/muse/midiedit/citem.h
index f6880ac8..8b718838 100644
--- a/muse/muse/midiedit/citem.h
+++ b/muse/muse/midiedit/citem.h
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: citem.h,v 1.6 2006/01/27 21:12:10 wschweer Exp $
-//  (C) Copyright 1999-2006 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __CITEM_H__
 #define __CITEM_H__
diff --git a/muse/muse/midiedit/cmd.h b/muse/muse/midiedit/cmd.h
index c05480aa..7f51abdd 100644
--- a/muse/muse/midiedit/cmd.h
+++ b/muse/muse/midiedit/cmd.h
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: cmd.h,v 1.3 2005/12/12 22:03:44 wschweer Exp $
-//  (C) Copyright 2000 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __CMD_H__
 #define __CMD_H__
diff --git a/muse/muse/midiedit/ctrledit.cpp b/muse/muse/midiedit/ctrledit.cpp
index 6822d2c6..3676198c 100644
--- a/muse/muse/midiedit/ctrledit.cpp
+++ b/muse/muse/midiedit/ctrledit.cpp
@@ -1,15 +1,29 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: ctrledit.cpp,v 1.11 2006/02/08 17:33:41 wschweer Exp $
-//  (C) Copyright 1999-2005 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "ctrledit.h"
 #include "midictrl.h"
 #include "widgets/simplebutton.h"
 #include "widgets/utils.h"
 #include "ctrl/configmidictrl.h"
+#include "ctrl/ctrldialog.h"
 #include "widgets/tools.h"
 #include "miditrack.h"
 
@@ -29,21 +43,19 @@ CtrlEdit::CtrlEdit(QWidget* parent, TimeCanvas* timeCanvas, Track* t)
       _drawCtrlName = true;
 
       _tc    = timeCanvas;
-      _ctrl   = &veloList;
+      _ctrl  = &veloList;
       ctrlId = CTRL_VELOCITY;
 
-      connect(_track, SIGNAL(controllerChanged(int)), SLOT(controllerListChanged(int)));
-
-      sel = new SimpleButton(QString("Sel"), parent);
+      sel = new SimpleButton(tr("Sel"), parent);
+      sel->setToolTip(tr("select controller"));
       sel->setAutoRaise(false);
+
       minus = newMinusButton(parent);
+      minus->setToolTip(tr("remove controller view"));
       minus->setAutoRaise(false);
 
-      ctrlList = new QMenu;
-      sel->setMenu(ctrlList);
-      sel->setPopupMode(QToolButton::InstantPopup);
-      connect(ctrlList, SIGNAL(aboutToShow()), SLOT(populateController()));
-      connect(ctrlList, SIGNAL(triggered(QAction*)), SLOT(changeController(QAction*)));
+      connect(_track, SIGNAL(controllerChanged(int)), SLOT(controllerListChanged(int)));
+      connect(sel, SIGNAL(clicked()), SLOT(showControllerList()));
       }
 
 //---------------------------------------------------------
@@ -57,24 +69,73 @@ CtrlEdit::~CtrlEdit()
       }
 
 //---------------------------------------------------------
-//   populateController
+//   setCtrl
 //---------------------------------------------------------
 
-void CtrlEdit::populateController()
+void CtrlEdit::setCtrl(int id)
       {
-      populateControllerMenu(ctrlList);
+      _ctrl = 0;
+
+      if (_ctrlTrack->type() == Track::MIDI) {
+            MidiTrack* mt = (MidiTrack*)_ctrlTrack;
+            if (id == CTRL_VELOCITY)
+                  _ctrl = &veloList;
+            else if (id == CTRL_SVELOCITY)
+                  _ctrl = &sveloList;
+            else
+                  _ctrl = _ctrlTrack->getController(id);
+            if (!_ctrl) {
+                  MidiChannel* mc = mt->channel();
+                  if (mc) {
+                        _ctrl = mc->getController(id);
+                        if (!_ctrl)
+                              _ctrl = mc->port()->getController(id);
+                        }
+                  }
+            }
+      else
+            _ctrl = _ctrlTrack->getController(id);
+      
+      if (!_ctrl)
+            printf("CtrlEdit::setCtrl(%d): not found for track <%s>\n", id,
+               _ctrlTrack->name().toLocal8Bit().data());
       }
 
 //---------------------------------------------------------
-//   changeController
+//   showControllerList
 //---------------------------------------------------------
 
-void CtrlEdit::changeController(QAction* a)
+void CtrlEdit::showControllerList()
       {
-      if (a == 0)
-            return;
-      int id = a->data().toInt();
+      Ctrl* c = ctrl();
+      int id;
+      if (c)
+            id = c->id();
+      else
+            id = CTRL_NO_CTRL;
+      for (;;) {
+            CtrlDialog cd(_ctrlTrack, id);
+            int rv = cd.exec();
+            if (rv != 1)
+                        return;
+            id = cd.curId();
+            if (id == CTRL_NO_CTRL)
+                  return;
+            if (id != CTRL_OTHER)
+                  break;
+            ConfigMidiCtrl* mce = new ConfigMidiCtrl((MidiTrack*)_track);
+            mce->exec();
+            delete mce;
+            }
+      changeController(id);
+      }
+
+//---------------------------------------------------------
+//   changeController
+//---------------------------------------------------------
 
+void CtrlEdit::changeController(int id)
+      {
       if (id == CTRL_VELOCITY) {
             ctrlId = id;
             _ctrl = &veloList;
diff --git a/muse/muse/midiedit/ctrledit.h b/muse/muse/midiedit/ctrledit.h
index cf19093d..e37e9028 100644
--- a/muse/muse/midiedit/ctrledit.h
+++ b/muse/muse/midiedit/ctrledit.h
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: ctrledit.h,v 1.9 2006/02/08 17:33:41 wschweer Exp $
-//  (C) Copyright 1999-2006 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __CTRL_EDIT_H__
 #define __CTRL_EDIT_H__
@@ -41,8 +54,8 @@ class CtrlEdit : public QObject, public CtrlEditor {
       bool _drawCtrlName;
 
    private slots:
-      void populateController();
-      void changeController(QAction*);
+      void showControllerList();
+      void changeController(int);
       void controllerListChanged(int);
 
    public:
@@ -53,6 +66,7 @@ class CtrlEdit : public QObject, public CtrlEditor {
       int height() const          { return _height; }
       virtual int cheight() const { return _height - splitWidth; }
       void setCtrl(Ctrl* c)       { _ctrl = c; }
+      void setCtrl(int id);
       Ctrl* ctrl()                { return _ctrl; }
       void setSinglePitch(int);
       };
diff --git a/muse/muse/midiedit/dcanvas.cpp b/muse/muse/midiedit/dcanvas.cpp
index 96372d41..4a068c1a 100644
--- a/muse/muse/midiedit/dcanvas.cpp
+++ b/muse/muse/midiedit/dcanvas.cpp
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: dcanvas.cpp,v 1.60 2006/02/08 17:33:41 wschweer Exp $
-//  (C) Copyright 1999-2006 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "dcanvas.h"
 #include "song.h"
@@ -407,7 +420,7 @@ void DrumCanvas::paste()
 //   startDrag
 //---------------------------------------------------------
 
-void DrumCanvas::startDrag(CItem* /* item*/, bool copymode)
+void DrumCanvas::startDrag(CItem* /* item*/, bool /*copymode*/)
       {
 #if 0 //TD
       QMimeData* drag = getTextDrag();
@@ -425,7 +438,7 @@ void DrumCanvas::startDrag(CItem* /* item*/, bool copymode)
 //   dragEnterEvent
 //---------------------------------------------------------
 
-void DrumCanvas::dragEnterEvent(QDragEnterEvent* event)
+void DrumCanvas::dragEnterEvent(QDragEnterEvent* /*event*/)
       {
 //TD      event->accept(Q3TextDrag::canDecode(event));
       }
@@ -452,7 +465,7 @@ void DrumCanvas::dragLeaveEvent(QDragLeaveEvent*)
 //   dropEvent
 //---------------------------------------------------------
 
-void DrumCanvas::viewDropEvent(QDropEvent* event)
+void DrumCanvas::viewDropEvent(QDropEvent* /*event*/)
       {
 #if 0 //TD
       QString text;
diff --git a/muse/muse/midiedit/dcanvas.h b/muse/muse/midiedit/dcanvas.h
index 9eb7b626..4390aa2f 100644
--- a/muse/muse/midiedit/dcanvas.h
+++ b/muse/muse/midiedit/dcanvas.h
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: dcanvas.h,v 1.30 2006/01/27 21:12:10 wschweer Exp $
-//  (C) Copyright 1999-2006 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __DCANVAS_H__
 #define __DCANVAS_H__
diff --git a/muse/muse/midiedit/drumedit.cpp b/muse/muse/midiedit/drumedit.cpp
index d371fcbc..1f5de7aa 100644
--- a/muse/muse/midiedit/drumedit.cpp
+++ b/muse/muse/midiedit/drumedit.cpp
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: drumedit.cpp,v 1.82 2006/02/10 16:40:59 wschweer Exp $
-//  (C) Copyright 1999-2006 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "drumedit.h"
 #include "icons.h"
diff --git a/muse/muse/midiedit/drumedit.h b/muse/muse/midiedit/drumedit.h
index b5abef4e..1e6d0bb1 100644
--- a/muse/muse/midiedit/drumedit.h
+++ b/muse/muse/midiedit/drumedit.h
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: drumedit.h,v 1.40 2006/02/08 17:33:41 wschweer Exp $
-//  (C) Copyright 1999-2006 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __DRUM_EDIT_H__
 #define __DRUM_EDIT_H__
diff --git a/muse/muse/midiedit/drummap.cpp b/muse/muse/midiedit/drummap.cpp
index b4f589e9..e8f10806 100644
--- a/muse/muse/midiedit/drummap.cpp
+++ b/muse/muse/midiedit/drummap.cpp
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: drummap.cpp,v 1.11 2006/01/27 10:35:26 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 1999/2000 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "drummap.h"
 #include "al/xml.h"
diff --git a/muse/muse/midiedit/drummap.h b/muse/muse/midiedit/drummap.h
index 5fa41662..66843a0c 100644
--- a/muse/muse/midiedit/drummap.h
+++ b/muse/muse/midiedit/drummap.h
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: drummap.h,v 1.10 2006/01/27 21:12:10 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 1999-2006 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __DRUMMAP_H__
 #define __DRUMMAP_H__
diff --git a/muse/muse/midiedit/ecanvas.cpp b/muse/muse/midiedit/ecanvas.cpp
index ff3c1753..4c15e308 100644
--- a/muse/muse/midiedit/ecanvas.cpp
+++ b/muse/muse/midiedit/ecanvas.cpp
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: ecanvas.cpp,v 1.65 2006/03/24 21:41:16 a-lin Exp $
-//  (C) Copyright 2001-2005 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "midieditor.h"
 #include "ecanvas.h"
@@ -943,11 +956,10 @@ void EventCanvas::addController(int id, int h)
       {
       ctrlHeight += h;
       int n = ctrlEditList.size();
+
       CtrlEdit* ce = new CtrlEdit(widget(), this, track());
       ce->setHeight(h);
-      Ctrl* ctrl = track()->getController(id);
-      if (ctrl)
-	      ce->setCtrl(ctrl);
+      ce->setCtrl(id);
       ctrlEditList.push_back(ce);
 
       ce->minus->defaultAction()->setData(n);
@@ -1219,7 +1231,7 @@ void EventCanvas::mouseMove(QPoint pos)
             int y = 0;
             if (curSplitter > 0) {
                   int k = 0;
-                  CtrlEdit* c;
+                  CtrlEdit* c = 0;
                   for (; i != ctrlEditList.end(); ++i, ++k) {
                         c = *i;
                         y += c->height();
diff --git a/muse/muse/midiedit/ecanvas.h b/muse/muse/midiedit/ecanvas.h
index ce402a03..ab328785 100644
--- a/muse/muse/midiedit/ecanvas.h
+++ b/muse/muse/midiedit/ecanvas.h
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: ecanvas.h,v 1.42 2006/02/08 17:33:41 wschweer Exp $
-//  (C) Copyright 2001-2006 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __ECANVAS_H__
 #define __ECANVAS_H__
diff --git a/muse/muse/midiedit/midieditor.cpp b/muse/muse/midiedit/midieditor.cpp
index 8b5688e9..680fb25a 100644
--- a/muse/muse/midiedit/midieditor.cpp
+++ b/muse/muse/midiedit/midieditor.cpp
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: midieditor.cpp,v 1.14 2006/02/08 17:33:41 wschweer Exp $
-//  (C) Copyright 1999-2006 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "midieditor.h"
 #include "part.h"
@@ -428,11 +441,15 @@ void MidiEditor::write(Xml& xml) const
 
 void MidiEditor::initFromPart()
       {
-      Part* part = canvas()->part();
+      Part* part         = canvas()->part();
 	CtrlCanvasList* cl = part->getCtrlCanvasList();
       if (!cl->empty()) {
-	      for (iCtrlCanvas i = cl->begin(); i != cl->end(); ++i)
+#if 0
+	      for (iCtrlCanvas i = cl->begin(); i != cl->end(); ++i) {
+printf("MidiEditor::initFromPart(): add controller %d %d\n", i->ctrlId, i->height);
 			canvas()->addController(i->ctrlId, i->height);
+                  }
+#endif
 	      canvas()->layout1();
             }
       }
diff --git a/muse/muse/midiedit/midieditor.h b/muse/muse/midiedit/midieditor.h
index 8845047f..cf66ddbc 100644
--- a/muse/muse/midiedit/midieditor.h
+++ b/muse/muse/midiedit/midieditor.h
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: midieditor.h,v 1.12 2006/02/08 17:33:41 wschweer Exp $
-//  (C) Copyright 1999-2006 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __MIDIEDITOR_H__
 #define __MIDIEDITOR_H__
diff --git a/muse/muse/midiedit/pianoroll.cpp b/muse/muse/midiedit/pianoroll.cpp
index 0222e901..06d4c64f 100644
--- a/muse/muse/midiedit/pianoroll.cpp
+++ b/muse/muse/midiedit/pianoroll.cpp
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: pianoroll.cpp,v 1.81 2006/02/10 16:40:59 wschweer Exp $
-//  (C) Copyright 1999-2006 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "pianoroll.h"
 #include "song.h"
@@ -222,9 +235,9 @@ PianoRoll::PianoRoll(PartList* pl, bool init)
       canvas()->setTimeRange(s1, e);
 
       // connect to toolbar
-      connect(canvas(),   SIGNAL(pitchChanged(int)), toolbar, SLOT(setPitch(int)));
-      connect(canvas(),   SIGNAL(yChanged(int)), toolbar, SLOT(setInt(int)));
-      connect(canvas(),   SIGNAL(cursorPos(const AL::Pos&,bool)),  toolbar, SLOT(setTime(const AL::Pos&,bool)));
+      connect(canvas(), SIGNAL(pitchChanged(int)), toolbar, SLOT(setPitch(int)));
+      connect(canvas(), SIGNAL(yChanged(int)), toolbar, SLOT(setInt(int)));
+      connect(canvas(), SIGNAL(cursorPos(const AL::Pos&,bool)),  toolbar, SLOT(setTime(const AL::Pos&,bool)));
       connect(toolbar,  SIGNAL(quantChanged(int)), SLOT(setQuant(int)));
       connect(toolbar,  SIGNAL(rasterChanged(int)),SLOT(setRaster(int)));
       connect(toolbar,  SIGNAL(toChanged(int)),    SLOT(setApplyTo(int)));
@@ -265,7 +278,6 @@ PianoRoll::PianoRoll(PartList* pl, bool init)
             initFromPart();
       else {
 	      resize(initWidth, initHeight);
-printf("resize %d %d\n", initWidth, initHeight);
             }
       }
 
diff --git a/muse/muse/midiedit/pianoroll.h b/muse/muse/midiedit/pianoroll.h
index a5952964..67f452b0 100644
--- a/muse/muse/midiedit/pianoroll.h
+++ b/muse/muse/midiedit/pianoroll.h
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: pianoroll.h,v 1.39 2006/02/08 17:33:41 wschweer Exp $
-//  (C) Copyright 1999-2006 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __PIANOROLL_H__
 #define __PIANOROLL_H__
diff --git a/muse/muse/midiedit/prcanvas.cpp b/muse/muse/midiedit/prcanvas.cpp
index 68ce66e9..2b5b12f0 100644
--- a/muse/muse/midiedit/prcanvas.cpp
+++ b/muse/muse/midiedit/prcanvas.cpp
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: prcanvas.cpp,v 1.71 2006/02/08 17:33:41 wschweer Exp $
-//  (C) Copyright 1999-2006 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "midieditor.h"
 #include "prcanvas.h"
diff --git a/muse/muse/midiedit/prcanvas.h b/muse/muse/midiedit/prcanvas.h
index 147b0bee..63cb689c 100644
--- a/muse/muse/midiedit/prcanvas.h
+++ b/muse/muse/midiedit/prcanvas.h
@@ -1,9 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//    $Id: prcanvas.h,v 1.36 2006/02/08 17:33:41 wschweer Exp $
-//  (C) Copyright 1999-2006 Werner Schweer (ws@seh.de)
-//=========================================================
+//  $Id:$
+//
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __PRCANVAS_H__
 #define __PRCANVAS_H__
diff --git a/muse/muse/midiedit/quantconfig.cpp b/muse/muse/midiedit/quantconfig.cpp
index 7767f13f..229b8875 100644
--- a/muse/muse/midiedit/quantconfig.cpp
+++ b/muse/muse/midiedit/quantconfig.cpp
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: quantconfig.cpp,v 1.7 2006/01/25 16:24:33 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2006 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #include "quantconfig.h"
 
diff --git a/muse/muse/midiedit/quantconfig.h b/muse/muse/midiedit/quantconfig.h
index 5e00683b..08e75cb2 100644
--- a/muse/muse/midiedit/quantconfig.h
+++ b/muse/muse/midiedit/quantconfig.h
@@ -1,10 +1,22 @@
-//=========================================================
+//=============================================================================
 //  MusE
 //  Linux Music Editor
-//  $Id: quantconfig.h,v 1.3 2006/01/25 16:24:33 wschweer Exp $
+//  $Id:$
 //
-//  (C) Copyright 2006 Werner Schweer (ws@seh.de)
-//=========================================================
+//  Copyright (C) 2002-2006 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  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; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
 
 #ifndef __QCONFIG_H__
 #define __QCONFIG_H__