[Lmuse-cvs-traffic] muse/muse app.cpp,1.119,1.120 app.h,1.34,1.35 cobject.h,1.3,1.4 songfile.cpp,1.27,1.28 vst.cpp,1.14,1.15

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

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

Modified Files:
	app.cpp app.h cobject.h songfile.cpp vst.cpp 
Log Message:
see ChangeLog


Index: cobject.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/cobject.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** cobject.h	25 Jan 2004 09:55:08 -0000	1.3
--- cobject.h	23 Aug 2004 17:54:24 -0000	1.4
***************
*** 38,43 ****
  class Toplevel {
     public:
!       enum ToplevelType { PIANO_ROLL, LISTE, DRUM, MASTER, WAVE, 
!          LMASTER, CLIPLIST, MARKER
  #ifdef PATCHBAY
           , M_PATCHBAY
--- 38,43 ----
  class Toplevel {
     public:
!       enum ToplevelType { PIANO_ROLL, LISTE, DRUM, MASTER, WAVE,
!          LMASTER, CLIPLIST
  #ifdef PATCHBAY
           , M_PATCHBAY

Index: app.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/app.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** app.h	1 Jun 2004 14:25:47 -0000	1.34
--- app.h	23 Aug 2004 17:54:24 -0000	1.35
***************
*** 87,91 ****
  
        int menu_ids[CMD_LAST];
!       QAction *fileSaveAction, *fileOpenAction, *pianoAction, *fileNewAction, * markerAction;
        QString appName;
  
--- 87,91 ----
  
        int menu_ids[CMD_LAST];
!       QAction *fileSaveAction, *fileOpenAction, *pianoAction, *fileNewAction;
        QString appName;
  
***************
*** 103,107 ****
  
        int aid1, aid2, aid3, autoId;
!       int tr_id, bt_id;
        QPopupMenu* follow;
        int fid0, fid1, fid2;
--- 103,107 ----
  
        int aid1, aid2, aid3, autoId;
!       int tr_id, bt_id, mk_id;
        QPopupMenu* follow;
        int fid0, fid1, fid2;
***************
*** 200,204 ****
        void startEditInstrument();
        void startClipList();
!       void startMarkerView();
  
        void openRecentMenu();
--- 200,204 ----
        void startEditInstrument();
        void startClipList();
!       void toggleMarkerView();
  
        void openRecentMenu();
***************
*** 239,242 ****
--- 239,243 ----
        void clearAutomation();
        void bigtimeClosed();
+       void markerClosed();
        void mixerClosed();
  
***************
*** 253,256 ****
--- 254,258 ----
        void showBigtime(bool);
        void showMixer(bool);
+       void showMarker(bool on);
        void importMidi(const QString &file);
        void setUsedTool(int);

Index: app.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/app.cpp,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -d -r1.119 -r1.120
*** app.cpp	18 Aug 2004 17:11:27 -0000	1.119
--- app.cpp	23 Aug 2004 17:54:24 -0000	1.120
***************
*** 446,453 ****
        connect(pianoAction, SIGNAL(activated()), SLOT(startPianoroll()));
  
-       markerAction = new QAction(tr("marker"), QIconSet(*view_markerIcon), tr("Marker"),
-         0, this, "marker");
-       connect(markerAction, SIGNAL(activated()), SLOT(startMarkerView()));
- 
        connect(fileNewAction,  SIGNAL(activated()), SLOT(loadTemplate()));
        connect(fileOpenAction, SIGNAL(activated()), SLOT(loadProject()));
--- 446,449 ----
***************
*** 617,621 ****
  //      aid2  = menuView->insertItem(
  //         QIconSet(*cliplistSIcon), tr("Cliplist"), this, SLOT(startClipList()), 0);
!       markerAction->addTo(menuView);
  
        //-------------------------------------------------------------
--- 613,623 ----
  //      aid2  = menuView->insertItem(
  //         QIconSet(*cliplistSIcon), tr("Cliplist"), this, SLOT(startClipList()), 0);
! 
! //      markerAction = new QAction(tr("marker"), QIconSet(*view_markerIcon), tr("Marker"),
! //        0, this, "marker");
! //      connect(markerAction, SIGNAL(activated()), SLOT(startMarkerView()));
! 
!       mk_id = menuView->insertItem(
!          QIconSet(*view_markerIcon), tr("Marker"),  this, SLOT(toggleMarkerView()), 0);
  
        //-------------------------------------------------------------
***************
*** 1438,1457 ****
  
  //---------------------------------------------------------
- //   startMarkerView
- //---------------------------------------------------------
- 
- void MusE::startMarkerView()
-       {
-       if (markerView == 0) {
-             markerView = new MarkerView(this);
- 
-             connect(arranger, SIGNAL(addMarker(int)), markerView, SLOT(addMarker(int)));
-             toplevels.push_back(Toplevel(Toplevel::MARKER, int(markerView), markerView));
- //            connect(markerView, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int)));
-             }
-       markerView->show();
-       }
- 
- //---------------------------------------------------------
  //   startClipList
  //---------------------------------------------------------
--- 1440,1443 ----
***************
*** 1512,1517 ****
              if (i->object() == tl) {
                    switch(i->type()) {
-                         case Toplevel::MARKER:
-                               break;
                          case Toplevel::CLIPLIST:
                                menu_audio->setItemChecked(aid2, false);
--- 1498,1501 ----
***************
*** 2603,2607 ****
              switch (tl.type()) {
                    case Toplevel::CLIPLIST:
-                   case Toplevel::MARKER:
                          break;
                    case Toplevel::PIANO_ROLL:
--- 2587,2590 ----
***************
*** 2707,2711 ****
        menuView->setAccel(shortcuts[SHRT_OPEN_MIXER].key, aid1);
  //      menuView->setAccel(shortcuts[SHRT_OPEN_CLIPS].key, aid2);
!       markerAction->setAccel(shortcuts[SHRT_OPEN_MARKER].key );
  
        menuSettings->setAccel(shortcuts[SHRT_GLOBAL_CONFIG].key, menu_ids[CMD_GLOBAL_CONFIG]);
--- 2690,2694 ----
        menuView->setAccel(shortcuts[SHRT_OPEN_MIXER].key, aid1);
  //      menuView->setAccel(shortcuts[SHRT_OPEN_CLIPS].key, aid2);
!       menuView->setAccel(shortcuts[SHRT_OPEN_MARKER].key, mk_id);
  
        menuSettings->setAccel(shortcuts[SHRT_GLOBAL_CONFIG].key, menu_ids[CMD_GLOBAL_CONFIG]);
***************
*** 2791,2794 ****
--- 2774,2811 ----
  
  //---------------------------------------------------------
+ //   toggleMarkerView
+ //---------------------------------------------------------
+ 
+ void MusE::toggleMarkerView()
+       {
+       showMarker(!menuView->isItemChecked(mk_id));
+       }
+ 
+ //---------------------------------------------------------
+ //   showMarker
+ //---------------------------------------------------------
+ 
+ void MusE::showMarker(bool on)
+       {
+       if (on && markerView == 0) {
+             markerView = new MarkerView(this);
+             connect(arranger, SIGNAL(addMarker(int)), markerView, SLOT(addMarker(int)));
+             connect(markerView, SIGNAL(closed()), SLOT(markerClosed()));
+             }
+       if (markerView)
+             markerView->setShown(on);
+       menuView->setItemChecked(mk_id, on);
+       }
+ 
+ //---------------------------------------------------------
+ //   markerClosed
+ //---------------------------------------------------------
+ 
+ void MusE::markerClosed()
+       {
+       menuView->setItemChecked(mk_id, false);
+       }
+ 
+ //---------------------------------------------------------
  //   bigtimeClosed
  //---------------------------------------------------------

Index: songfile.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/songfile.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** songfile.cpp	2 Aug 2004 18:39:18 -0000	1.27
--- songfile.cpp	23 Aug 2004 17:54:24 -0000	1.28
***************
*** 390,395 ****
                                }
                          else if (tag == "marker") {
!                               startMarkerView();
!                               toplevels.back().cobject()->readStatus(xml);
                                }
                          else if (tag == "waveedit") {
--- 390,395 ----
                                }
                          else if (tag == "marker") {
!                               showMarker(true);
!                               // toplevels.back().cobject()->readStatus(xml);
                                }
                          else if (tag == "waveedit") {

Index: vst.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/vst.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** vst.cpp	21 Aug 2004 17:07:59 -0000	1.14
--- vst.cpp	23 Aug 2004 17:54:24 -0000	1.15
***************
*** 509,514 ****
        //---------------------------------------------
  
- //      int len = 0;
- //      const unsigned char* p;
        AEffect* plugin = _fst->plugin;
        int params = plugin->numParams;
--- 509,512 ----
***************
*** 521,528 ****
  //---------------------------------------------------------
  //   getData
- //    TODO: ports < synti ports ?
  //---------------------------------------------------------
  
! iMPEvent VstSynthIF::getData(MidiPort* mp, MPEventList* el, iMPEvent i, unsigned /*pos*/, int /*ports*/, unsigned n, float** buffer)
        {
        AEffect* plugin = _fst->plugin;
--- 519,525 ----
  //---------------------------------------------------------
  //   getData
  //---------------------------------------------------------
  
! iMPEvent VstSynthIF::getData(MidiPort* mp, MPEventList* el, iMPEvent i, unsigned /*pos*/, int ports, unsigned n, float** buffer)
        {
        AEffect* plugin = _fst->plugin;
***************
*** 535,543 ****
                    }
              }
!       if (plugin->flags & effFlagsCanReplacing) {
!             plugin->processReplacing(plugin, 0, buffer, n);
              }
        else {
!             plugin->process(plugin, 0, buffer, n);
              }
        return el->end();
--- 532,555 ----
                    }
              }
!       int outputs = _fst->plugin->numOutputs;
!       if (ports < outputs) {
!             float* ob[outputs];
!             float fp[(n - ports) * outputs];   // dummy output buffer
!             for (int i = 0; i < outputs; ++i) {
!                   if (i < ports)
!                         ob[i] = buffer[i];
!                   else
!                         ob[i] = fp + (n-ports) * i;
!                   }
!             if (plugin->flags & effFlagsCanReplacing)
!                   plugin->processReplacing(plugin, 0, ob, n);
!             else
!                   plugin->process(plugin, 0, ob, n);
              }
        else {
!             if (plugin->flags & effFlagsCanReplacing)
!                   plugin->processReplacing(plugin, 0, buffer, n);
!             else
!                   plugin->process(plugin, 0, buffer, n);
              }
        return el->end();