[Lmuse-cvs-traffic] muse/muse app.cpp,1.139,1.140 app.h,1.42,1.43 cobject.h,1.6,1.7 midiport.cpp,1.38,1.39 midiport.h,1.16,1.17

[werner s. <wsc...@us...>]

Update of /cvsroot/lmuse/muse/muse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30361/muse

Modified Files:
	app.cpp app.h cobject.h midiport.cpp midiport.h 
Log Message:
list editor changes (part1)


Index: cobject.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/cobject.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** cobject.h	15 Sep 2004 18:25:32 -0000	1.6
--- cobject.h	5 Jan 2005 19:22:14 -0000	1.7
***************
*** 22,25 ****
--- 22,33 ----
        Q_OBJECT
  
+       virtual void closeEvent(QCloseEvent* e) {
+             emit deleted((int)this);
+             e->accept();
+             }
+ 
+    signals:
+       void deleted(int);
+ 
     public:
        virtual void readStatus(QDomNode);
***************
*** 37,43 ****
        enum ToplevelType { PIANO_ROLL, LISTE, DRUM, MASTER, WAVE,
           LMASTER, CLIPLIST
- #ifdef PATCHBAY
-          , M_PATCHBAY
- #endif /* PATCHBAY */
           };
        Toplevel(ToplevelType t, int obj, TopWin* cobj) {
--- 45,48 ----

Index: app.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/app.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** app.h	1 Oct 2004 08:46:42 -0000	1.42
--- app.h	5 Jan 2005 19:22:14 -0000	1.43
***************
*** 46,49 ****
--- 46,50 ----
  class Appearance;
  class WaveTrack;
+ class ListEdit;
  
  extern void configMidiController();
***************
*** 116,119 ****
--- 117,121 ----
        ToplevelList toplevels;
        ClipListEdit* clipListEdit;
+ 
        MarkerView* markerView;
        MidiTransformerDialog* midiTransformerDialog;

Index: midiport.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiport.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** midiport.cpp	12 Dec 2004 10:06:57 -0000	1.38
--- midiport.cpp	5 Jan 2005 19:22:14 -0000	1.39
***************
*** 527,528 ****
--- 527,542 ----
        }
  
+ //---------------------------------------------------------
+ //   controllerNames
+ //---------------------------------------------------------
+ 
+ ControllerNameList* MidiPort::controllerNames(int ch) const
+       {
+       ControllerNameList* l = new ControllerNameList;
+ 
+       const CtrlList* cl = controller(ch);
+       for (ciCtrl i = cl->begin(); i != cl->end(); ++i)
+             l->push_back(ControllerName(i->second->name(), i->second->id()));
+       return l;
+       }
+ 

Index: midiport.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiport.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** midiport.h	4 Oct 2004 19:48:33 -0000	1.16
--- midiport.h	5 Jan 2005 19:22:14 -0000	1.17
***************
*** 44,47 ****
--- 44,48 ----
  
        MidiController* midiController(int num) const;
+       ControllerNameList* controllerNames(int ch) const;
  
        int getCtrl(int ch, int tick, int ctrl) const;

Index: app.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/app.cpp,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -d -r1.139 -r1.140
*** app.cpp	18 Dec 2004 15:17:24 -0000	1.139
--- app.cpp	5 Jan 2005 19:22:13 -0000	1.140
***************
*** 1007,1014 ****
                          break;
                    case Toplevel::PIANO_ROLL:
-                   case Toplevel::LISTE:
                    case Toplevel::DRUM:
                    case Toplevel::MASTER:
                    case Toplevel::WAVE:
                    case Toplevel::LMASTER:
                          ((QWidget*)(obj))->close(true);
--- 1007,1014 ----
                          break;
                    case Toplevel::PIANO_ROLL:
                    case Toplevel::DRUM:
                    case Toplevel::MASTER:
                    case Toplevel::WAVE:
+                   case Toplevel::LISTE:
                    case Toplevel::LMASTER:
                          ((QWidget*)(obj))->close(true);
***************
*** 1493,1497 ****
  
  //---------------------------------------------------------
! //   startListenEditor
  //---------------------------------------------------------
  
--- 1493,1497 ----
  
  //---------------------------------------------------------
! //   startListEditor
  //---------------------------------------------------------
  
***************
*** 1504,1514 ****
        }
  
! void MusE::startListEditor(PartList* pl)
        {
!       ListEdit* listEditor = new ListEdit(pl);
        listEditor->show();
        toplevels.push_back(Toplevel(Toplevel::LISTE, int(listEditor), listEditor));
        connect(listEditor, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int)));
-       connect(muse,SIGNAL(configChanged()), listEditor, SLOT(configChanged()));
        }
  
--- 1504,1513 ----
        }
  
! void MusE::startListEditor(PartList*)
        {
!       ListEdit* listEditor = new ListEdit(0);
        listEditor->show();
        toplevels.push_back(Toplevel(Toplevel::LISTE, int(listEditor), listEditor));
        connect(listEditor, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int)));
        }
  
***************
*** 1655,1662 ****
                          // one instantiation:
                          case Toplevel::PIANO_ROLL:
-                         case Toplevel::LISTE:
                          case Toplevel::DRUM:
                          case Toplevel::MASTER:
                          case Toplevel::WAVE:
                          case Toplevel::LMASTER:
                                break;
--- 1654,1661 ----
                          // one instantiation:
                          case Toplevel::PIANO_ROLL:
                          case Toplevel::DRUM:
                          case Toplevel::MASTER:
                          case Toplevel::WAVE:
+                         case Toplevel::LISTE:
                          case Toplevel::LMASTER:
                                break;