[Lmuse-cvs-traffic] muse/muse/mixer midirack.cpp,1.1,1.2 midirack.h,1.1,1.2

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

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

Modified Files:
	midirack.cpp midirack.h 
Log Message:
updates for midi plugin


Index: midirack.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/mixer/midirack.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** midirack.h	8 May 2005 09:15:16 -0000	1.1
--- midirack.h	11 May 2005 14:18:44 -0000	1.2
***************
*** 10,14 ****
  #define __MIDIRACK_H__
  
! class Track;
  
  //---------------------------------------------------------
--- 10,14 ----
  #define __MIDIRACK_H__
  
! class MidiTrackBase;
  
  //---------------------------------------------------------
***************
*** 17,21 ****
  
  class MidiRack : public QListBox {
!       Track* track;
        Q_OBJECT
  
--- 17,21 ----
  
  class MidiRack : public QListBox {
!       MidiTrackBase* track;
        Q_OBJECT
  
***************
*** 28,32 ****
  
     public:
!       MidiRack(QWidget*, Track* t);
        ~MidiRack();
        };
--- 28,32 ----
  
     public:
!       MidiRack(QWidget*, MidiTrackBase* t);
        ~MidiRack();
        };

Index: midirack.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/mixer/midirack.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** midirack.cpp	8 May 2005 09:15:16 -0000	1.1
--- midirack.cpp	11 May 2005 14:18:44 -0000	1.2
***************
*** 12,15 ****
--- 12,17 ----
  #include "track.h"
  #include "song.h"
+ #include "midiplugin.h"
+ #include "audio.h"
  
  //---------------------------------------------------------
***************
*** 19,23 ****
  class MidiRackSlot : public QListBoxItem {
        int idx;
!       Track* node;
  
        virtual void paint(QPainter*);
--- 21,25 ----
  class MidiRackSlot : public QListBoxItem {
        int idx;
!       MidiTrackBase* node;
  
        virtual void paint(QPainter*);
***************
*** 25,29 ****
  
     public:
!       MidiRackSlot(QListBox* lb, Track* t, int);
        ~MidiRackSlot();
        };
--- 27,31 ----
  
     public:
!       MidiRackSlot(QListBox* lb, MidiTrackBase* t, int);
        ~MidiRackSlot();
        };
***************
*** 38,42 ****
  //---------------------------------------------------------
  
! MidiRackSlot::MidiRackSlot(QListBox* b, Track* t, int i)
     : QListBoxItem(b)
        {
--- 40,44 ----
  //---------------------------------------------------------
  
! MidiRackSlot::MidiRackSlot(QListBox* b, MidiTrackBase* t, int i)
     : QListBoxItem(b)
        {
***************
*** 60,64 ****
              }
        QFontMetrics fm = painter->fontMetrics();
!       QString s("empty");
        painter->drawText(3, fm.ascent() + fm.leading()/2, s);
        painter->restore();
--- 62,66 ----
              }
        QFontMetrics fm = painter->fontMetrics();
!       QString s(node->pipeline()->name(idx));
        painter->drawText(3, fm.ascent() + fm.leading()/2, s);
        painter->restore();
***************
*** 69,73 ****
  //---------------------------------------------------------
  
! MidiRack::MidiRack(QWidget* parent, Track* t)
     : QListBox(parent, "MidiRack", Qt::WDestructiveClose)
        {
--- 71,75 ----
  //---------------------------------------------------------
  
! MidiRack::MidiRack(QWidget* parent, MidiTrackBase* t)
     : QListBox(parent, "MidiRack", Qt::WDestructiveClose)
        {
***************
*** 102,110 ****
  void MidiRack::songChanged(int typ)
        {
! /*      if (typ & (SC_ROUTE | SC_RACK)) {
!             for (int i = 0; i < PipelineDepth; ++i)
                    updateItem(i);
!             }
!       */
        }
  
--- 104,111 ----
  void MidiRack::songChanged(int typ)
        {
! //      if (typ & (SC_ROUTE | SC_RACK)) {
!             for (int i = 0; i < MidiPipelineDepth; ++i)
                    updateItem(i);
! //            }
        }
  
***************
*** 130,135 ****
        QString name;
        bool mute;
! #if 0
!       Pipeline* pipe = track->efxPipe();
        name  = pipe->name(idx);
        mute  = pipe->isOn(idx);
--- 131,136 ----
        QString name;
        bool mute;
! 
!       MidiPipeline* pipe = track->pipeline();
        name  = pipe->name(idx);
        mute  = pipe->isOn(idx);
***************
*** 145,149 ****
        menu->setItemChecked(BYPASS, !pipe->isOn(idx));
        menu->setItemChecked(SHOW, pipe->guiVisible(idx));
!       menu->setItemChecked(SHOW_CUSTOM, pipe->nativeGuiVisible(idx));
  
        if (pipe->empty(idx)) {
--- 146,150 ----
        menu->setItemChecked(BYPASS, !pipe->isOn(idx));
        menu->setItemChecked(SHOW, pipe->guiVisible(idx));
! //      menu->setItemChecked(SHOW_CUSTOM, pipe->nativeGuiVisible(idx));
  
        if (pipe->empty(idx)) {
***************
*** 159,165 ****
              if (idx == 0)
                    menu->setItemEnabled(UP, false);
!             if (idx == (PipelineDepth-1))
                    menu->setItemEnabled(DOWN, false);
!             menu->setItemEnabled(SHOW_CUSTOM, pipe->hasNativeGui(idx));
              }
  
--- 160,166 ----
              if (idx == 0)
                    menu->setItemEnabled(UP, false);
!             if (idx == (MidiPipelineDepth-1))
                    menu->setItemEnabled(DOWN, false);
! //            menu->setItemEnabled(SHOW_CUSTOM, pipe->hasNativeGui(idx));
              }
  
***************
*** 172,179 ****
              case NEW:
                    {
!                   Plugin* plugin = PluginDialog::getPlugin(this);
                    if (plugin) {
!                         PluginI* plugi = new PluginI(track);
!                         if (plugi->initPluginInstance(plugin, track->channels())) {
                                printf("cannot instantiate plugin <%s>\n",
                                   plugin->name().latin1());
--- 173,181 ----
              case NEW:
                    {
!                   MidiPlugin* plugin = MidiPluginDialog::getPlugin(this);
! printf("getPlugin %p\n", plugin);
                    if (plugin) {
!                         MidiPluginI* plugi = plugin->instantiate(track);
!                         if (plugi == 0) {
                                printf("cannot instantiate plugin <%s>\n",
                                   plugin->name().latin1());
***************
*** 181,190 ****
                                break;
                                }
!                         audio->msgAddPlugin(track, idx, plugi);
                          }
                    break;
                    }
              case REMOVE:
!                   audio->msgAddPlugin(track, idx, 0);
                    break;
              case BYPASS:
--- 183,192 ----
                                break;
                                }
!                         audio->msgAddMidiPlugin(track, idx, plugi);
                          }
                    break;
                    }
              case REMOVE:
!                   audio->msgAddMidiPlugin(track, idx, 0);
                    break;
              case BYPASS:
***************
*** 207,211 ****
                    break;
              case DOWN:
!                   if (idx < (PipelineDepth-1)) {
                          setCurrentItem(idx+1);
                          pipe->move(idx, false);
--- 209,213 ----
                    break;
              case DOWN:
!                   if (idx < (MidiPipelineDepth-1)) {
                          setCurrentItem(idx+1);
                          pipe->move(idx, false);
***************
*** 213,217 ****
                    break;
              }
! #endif
        song->update(SC_RACK);
        }
--- 215,219 ----
                    break;
              }
! 
        song->update(SC_RACK);
        }
***************
*** 226,233 ****
        if (it == 0 || track == 0)
              return;
! #if 0
!       RackSlot* item = (RackSlot*)it;
        int idx        = index(item);
!       Pipeline* pipe = track->efxPipe();
  
        if (!pipe->empty(idx)) {
--- 228,235 ----
        if (it == 0 || track == 0)
              return;
! 
!       MidiRackSlot* item = (MidiRackSlot*)it;
        int idx        = index(item);
!       MidiPipeline* pipe = track->pipeline();
  
        if (!pipe->empty(idx)) {
***************
*** 236,243 ****
              }
        else {
!             Plugin* plugin = PluginDialog::getPlugin(this);
              if (plugin) {
!                   PluginI* plugi = new PluginI(track);
!                   if (plugi->initPluginInstance(plugin, track->channels())) {
                          printf("cannot instantiate plugin <%s>\n",
                             plugin->name().latin1());
--- 238,245 ----
              }
        else {
!             MidiPlugin* plugin = MidiPluginDialog::getPlugin(this);
              if (plugin) {
!                   MidiPluginI* plugi = plugin->instantiate(track);
!                   if (plugi == 0) {
                          printf("cannot instantiate plugin <%s>\n",
                             plugin->name().latin1());
***************
*** 245,253 ****
                          }
                    else {
!                         audio->msgAddPlugin(track, idx, plugi);
                          }
                    }
              }
- #endif
        }
  
--- 247,254 ----
                          }
                    else {
!                         audio->msgAddMidiPlugin(track, idx, plugi);
                          }
                    }
              }
        }