1 files changed, 13 insertions, 8 deletions
diff --git a/muse2/muse/midiedit/dlist.h b/muse2/muse/midiedit/dlist.h
index 99e9460f..35a67023 100644
--- a/muse2/muse/midiedit/dlist.h
+++ b/muse2/muse/midiedit/dlist.h
@@ -35,6 +35,8 @@ class QHeaderView;
 class QLineEdit;
 class QMouseEvent;
 class QPainter;
+class Device;
+class QLineEdit;
 
 namespace MusECore {
 class DrumMap;
@@ -43,6 +45,7 @@ class DrumMap;
 namespace MusEGui {
 
 class ScrollScale;
+class DrumCanvas;
 
 //---------------------------------------------------------
 //   DLineEdit
@@ -89,9 +92,13 @@ class DPitchEdit: public Awl::PitchEdit
 
 class DList : public View {
       Q_OBJECT
-    
+      
+      MusEGui::DrumCanvas* dcanvas;
+      MusECore::DrumMap* ourDrumMap;
+      int ourDrumMapSize;
+      bool old_style_drummap_mode;
+      
       QHeaderView* header;
-      ScrollScale* scroll;
       QLineEdit* editor;
       DPitchEdit* pitch_editor;
       MusECore::DrumMap* editEntry;
@@ -101,7 +108,7 @@ class DList : public View {
       
       int startY;
       int curY;
-      int sPitch;
+      int sInstrument;
       enum { NORMAL, START_DRAG, DRAG } drag;
 
       virtual void draw(QPainter& p, const QRect&);
@@ -131,18 +138,16 @@ class DList : public View {
    public slots:
       void tracklistChanged();
       void songChanged(int);
+      void ourDrumMapChanged(bool);
+   
    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, MusEGui::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,
-         COL_ANOTE, COL_CHANNEL, COL_PORT,
-         COL_LV1, COL_LV2, COL_LV3, COL_LV4, COL_NONE=-1};
       };
 
 } // namespace MusEGui