1 files changed, 11 insertions, 7 deletions
diff --git a/muse2/muse/midiedit/dlist.h b/muse2/muse/midiedit/dlist.h
index 0fb1fd0b..1d87f3dc 100644
--- a/muse2/muse/midiedit/dlist.h
+++ b/muse2/muse/midiedit/dlist.h
@@ -35,11 +35,10 @@ class QHeaderView;
 class QMouseEvent;
 class QPainter;
 
-class ScrollScale;
 class Device;
 class QLineEdit;
 class DrumMap;
-
+class DrumCanvas;
 
 //---------------------------------------------------------
 //   DLineEdit
@@ -86,9 +85,13 @@ class DPitchEdit: public Awl::PitchEdit
 
 class DList : public MusEWidget::View {
       Q_OBJECT
-    
+      
+      DrumCanvas* dcanvas;
+      DrumMap* ourDrumMap;
+      int ourDrumMapSize;
+      bool old_style_drummap_mode;
+      
       QHeaderView* header;
-      ScrollScale* scroll;
       QLineEdit* editor;
       DPitchEdit* pitch_editor;
       DrumMap* editEntry;
@@ -98,7 +101,7 @@ class DList : public MusEWidget::View {
       
       int startY;
       int curY;
-      int sPitch;
+      int sInstrument;
       enum { NORMAL, START_DRAG, DRAG } drag;
 
       virtual void draw(QPainter& p, const QRect&);
@@ -128,13 +131,14 @@ class DList : public MusEWidget::View {
    public slots:
       void tracklistChanged();
       void songChanged(int);
+      void ourDrumMapChanged();
+   
    public:
       void lineEdit(int line, int section);
       void pitchEdit(int line, int section);
       void setCurDrumInstrument(int n);
-      DList(QHeaderView*, QWidget* parent, int ymag);
+      DList(QHeaderView*, QWidget* parent, int ymag, DrumCanvas* dcanvas, bool oldstyle);
       ~DList();
-      void setScroll(ScrollScale* s) { scroll = s; }
       int getSelectedInstrument();
 
 enum DCols { COL_MUTE=0, COL_NAME, COL_VOL, COL_QNT, COL_ENOTE, COL_LEN,