updates

15 files changed, 31 insertions, 31 deletions

diff --git a/muse/ChangeLog b/muse/ChangeLog
index a42e800c..87392ed4 100644
--- a/muse/ChangeLog
+++ b/muse/ChangeLog
@@ -1,3 +1,5 @@
+18.04 (ws)
+      - fix ctrl dialog for plugin provided controller
 17.04 (ws)
       - replace some heartBeat signal/slot connections with
         direct calls for better performance
diff --git a/muse/awl/tcanvas.cpp b/muse/awl/tcanvas.cpp
index 157c0187..e08c349a 100644
--- a/muse/awl/tcanvas.cpp
+++ b/muse/awl/tcanvas.cpp
@@ -56,6 +56,8 @@ enum DragType {
 TimeCanvas::TimeCanvas(TimeCanvasType t)
    : QFrame()
       {
+      setAttribute(Qt::WA_NoSystemBackground, true);
+
       _yFit      = false;
       _tool      = PointerTool;
       type       = t;
@@ -800,7 +802,6 @@ void TimeCanvas::canvasPaintEvent(const QRect& r, QPainter& p)
 
       QRect par = r & rPanelA;
       if (!(par.isEmpty() || rPanelA.isEmpty())) {
-//            p.setClipRect(par);
             if (type == TIME_CANVAS_DRUMEDIT) {
                   paintDrumList(p, par);
                   }
@@ -835,7 +836,7 @@ void TimeCanvas::canvasPaintEvent(const QRect& r, QPainter& p)
                         QRect rr(car);
                         // paint inactive area different
                         // (darker)
-                        QColor c = canvasBackgroundColor.dark();
+                        QColor c = canvasBackgroundColor.darker(150);
                         int x1 = pos2pix(partPos1) + rCanvasA.x();
                         if (rr.x() < x1) {
                               QRect r(rr.x(), rr.y(), x1-rr.x(), rr.height());
diff --git a/muse/muse/arranger/arranger.cpp b/muse/muse/arranger/arranger.cpp
index 56ecc2c4..f7fea707 100644
--- a/muse/muse/arranger/arranger.cpp
+++ b/muse/muse/arranger/arranger.cpp
@@ -297,26 +297,26 @@ Arranger::Arranger(QMainWindow* parent)
 
       infoDock = new QDockWidget(tr("TrackInfo"));
       infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
-      infoDock->setMinimumWidth(infoWidth);
       infoDockAction = infoDock->toggleViewAction();
 
-      mixerDock = new QDockWidget(tr("Mix"));
+      mixerDock = new QDockWidget(tr(""));
       mixerDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
       mixerDockAction = mixerDock->toggleViewAction();
 
       parent->setDockNestingEnabled(true);
 
       parent->addDockWidget(Qt::LeftDockWidgetArea, infoDock, Qt::Horizontal);
-      parent->splitDockWidget(infoDock, mixerDock, Qt::Horizontal);
+      parent->addDockWidget(Qt::LeftDockWidgetArea, mixerDock, Qt::Horizontal);
 
       infoView = new QScrollArea;
+      infoView->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+
       infoDock->setWidget(infoView);
       infoView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
       trackInfo = new InfoStack();
       infoView->setWidget(trackInfo);
       infoView->setWidgetResizable(true);
-      trackInfo->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Expanding);
 
       trackInfoVisible  = false;
       mixerStripVisible = false;
@@ -886,6 +886,8 @@ void Arranger::toggleMixerStrip(bool val)
                               break;
                         }
                   strip->setFixedWidth(STRIP_WIDTH);
+//                  strip->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+//                  strip->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding);
                   mixerDock->setWidget(strip);
                   }
             }
diff --git a/muse/muse/audiotrack.cpp b/muse/muse/audiotrack.cpp
index 3f933c8a..ec866ac0 100644
--- a/muse/muse/audiotrack.cpp
+++ b/muse/muse/audiotrack.cpp
@@ -62,7 +62,7 @@ AudioTrack::AudioTrack()
       addController(c);
 
       for (int i = 0; i < MAX_CHANNELS; ++i)
-            posix_memalign((void**)&buffer[i], 16, sizeof(float) * segmentSize);
+            posix_memalign((void**)(buffer + i), 16, sizeof(float) * segmentSize);
       }
 
 //---------------------------------------------------------
@@ -557,8 +557,10 @@ void AudioTrack::collectInputData()
                   ch  = r.src.plugin->channel();
                   ptr = r.src.plugin->buffer();
                   }
-            else
+            else {
                   printf("AudioTrack::collectInputRoutes(): bad route type\n");
+                  return;
+                  }
             if (copyFlag) {
                   copy(ch, ptr);
                   copyFlag = false;
diff --git a/muse/muse/ctrl/ctrldialog.cpp b/muse/muse/ctrl/ctrldialog.cpp
index a96c0808..fd8a073c 100644
--- a/muse/muse/ctrl/ctrldialog.cpp
+++ b/muse/muse/ctrl/ctrldialog.cpp
@@ -82,9 +82,6 @@ void CtrlDialog::updateController()
                   }
             }
       else if (!t->isMidiTrack()) {
-            //
-            // aux send streams
-            //
 
             //
             // present plugin parameter
@@ -97,7 +94,7 @@ void CtrlDialog::updateController()
                   int ncontroller = plugin->plugin()->parameter();
                   for (int i = 0; i < ncontroller; ++i) {
                         QString name(plugin->getParameterName(i));
-                        int id = (idx + 1) * 0x1000 + i;
+                        int id = genACnum(idx, i, true);
                         QTreeWidgetItem* cci = new QTreeWidgetItem(ci, id);
                         cci->setText(0, name);
                         Ctrl* ctrl = t->getController(id);
@@ -110,7 +107,7 @@ void CtrlDialog::updateController()
                                     }
                               }
                         else
-                              printf("updateController: controller %x not found\n");
+                              printf("updateController: controller %x not found\n", id);
                         }
                   }
             pl = ((AudioTrack*)t)->postPipe();
@@ -121,7 +118,7 @@ void CtrlDialog::updateController()
                   int ncontroller = plugin->plugin()->parameter();
                   for (int i = 0; i < ncontroller; ++i) {
                         QString name(plugin->getParameterName(i));
-                        int id = (idx + 1) * 0x1000 + i;
+                        int id = genACnum(idx, i, false);
                         QTreeWidgetItem* cci = new QTreeWidgetItem(ci, id);
                         cci->setText(0, name);
                         Ctrl* ctrl = t->getController(id);
diff --git a/muse/muse/ctrl/ctrldialog.ui b/muse/muse/ctrl/ctrldialog.ui
index a3d36304..178cf1d3 100644
--- a/muse/muse/ctrl/ctrldialog.ui
+++ b/muse/muse/ctrl/ctrldialog.ui
@@ -28,7 +28,7 @@
       <bool>true</bool>
      </property>
      <property name="columnCount" >
-      <number>2</number>
+      <number>3</number>
      </property>
      <column>
       <property name="text" >
diff --git a/muse/muse/ctrl/ctrleditor.cpp b/muse/muse/ctrl/ctrleditor.cpp
index 8d30e445..0d7c1a72 100644
--- a/muse/muse/ctrl/ctrleditor.cpp
+++ b/muse/muse/ctrl/ctrleditor.cpp
@@ -135,7 +135,7 @@ void CtrlEditor::paint(QPainter& p, const QRect& r)
             else {
                   int x1, y1, x2, y2;
                   int hx = -1;
-                  int hy;
+                  int hy = 0;
 
                   Pos pos1 = tc()->pix2pos(from);
                   ciCtrlVal i = ctrl()->lowerBound(pos1.time(tt));
@@ -380,8 +380,8 @@ void CtrlEditor::mouseRelease()
             song->endUndo(SC_EVENT_MODIFIED);
       else {
             if (dragy != -1 && dragy != startY) {
-                  int wh = cheight() - HANDLE1 + splitWidth;
-                  CVal val = ctrl()->pixel2val(dragy+HANDLE2, wh);
+                  int wh = cheight() + splitWidth - HANDLE1;
+                  CVal val = ctrl()->pixel2val(dragy - HANDLE2, wh);
                   // modify controller:
                   song->cmdAddControllerVal(track(), ctrl(), selected, val);
                   }
diff --git a/muse/muse/gui.h b/muse/muse/gui.h
index 87f8c47d..30264347 100644
--- a/muse/muse/gui.h
+++ b/muse/muse/gui.h
@@ -40,7 +40,7 @@ static const int trackSeparator = 1;
 static const int yTrackOffset   = -2; // -4;
 
 //  mixer:
-static const int STRIP_WIDTH  = 66+4;
+static const int STRIP_WIDTH  = 66+4+4;
 static const int LABEL_HEIGHT = 20;
 
 static const int ICON_WIDTH = 18;
diff --git a/muse/muse/mixer/midirack.cpp b/muse/muse/mixer/midirack.cpp
index 1b65b31c..778122fc 100644
--- a/muse/muse/mixer/midirack.cpp
+++ b/muse/muse/mixer/midirack.cpp
@@ -26,6 +26,7 @@
 #include "midiplugin.h"
 #include "audio.h"
 #include "muse.h"
+#include "gui.h"
 
 //---------------------------------------------------------
 //   MidiRack
@@ -59,7 +60,7 @@ QSize MidiRack::sizeHint() const
       {
 	QFontMetrics fm(font());
 	int h = fm.lineSpacing() * MidiPipelineDepth + 1;
-	return QSize(100, h);
+	return QSize(STRIP_WIDTH, h);
       }
 
 //---------------------------------------------------------
diff --git a/muse/muse/mixer/mstrip.cpp b/muse/muse/mixer/mstrip.cpp
index e7efbc77..30ce4558 100644
--- a/muse/muse/mixer/mstrip.cpp
+++ b/muse/muse/mixer/mstrip.cpp
@@ -171,7 +171,7 @@ void MidiStrip::addKnob(int ctrl, int idx, const QString& tt, const QString& lab
             knob = new Awl::Knob(this);
             knob->setRange(0.0, 127.0);
             }
-      knob->setFixedSize(buttonSize.width(), entrySize.height() * 2);
+//      knob->setFixedSize(buttonSize.width(), entrySize.height() * 2);
       knob->setId(ctrl);
       dl->setId(ctrl);
       dl->setFrame(true);
@@ -542,7 +542,7 @@ MidiOutPortStrip::MidiOutPortStrip(Mixer* m, MidiOutPort* t, bool align)
       //---------------------------------------------------
 
       MidiRack* rack = new MidiRack(this, t);
-      rack->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+//      rack->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
       rack->setFixedHeight(rack->sizeHint().height()+2);
       layout->addWidget(rack);
 
@@ -848,7 +848,7 @@ MidiInPortStrip::MidiInPortStrip(Mixer* m, MidiInPort* t, bool align)
       //---------------------------------------------------
 
       MidiRack* rack = new MidiRack(this, t);
-      rack->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+//      rack->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
       rack->setFixedHeight(rack->sizeHint().height()+2);
       layout->addWidget(rack);
 
diff --git a/muse/muse/mixer/rack.cpp b/muse/muse/mixer/rack.cpp
index ba028e5d..2074df6c 100644
--- a/muse/muse/mixer/rack.cpp
+++ b/muse/muse/mixer/rack.cpp
@@ -28,6 +28,7 @@
 #include "plugingui.h"
 #include "widgets/filedialog.h"
 #include "muse.h"
+#include "gui.h"
 
 static const int PipelineDepth = 4;
 
@@ -66,7 +67,7 @@ QSize EffectRack::sizeHint() const
       {
 	QFontMetrics fm(font());
 	int h = fm.lineSpacing() * PipelineDepth + 1;
-	return QSize(100, h);
+	return QSize(STRIP_WIDTH, h);
       }
 
 //---------------------------------------------------------
diff --git a/muse/muse/mixer/strip.cpp b/muse/muse/mixer/strip.cpp
index a4b66181..6123e8cc 100644
--- a/muse/muse/mixer/strip.cpp
+++ b/muse/muse/mixer/strip.cpp
@@ -68,7 +68,6 @@ Strip::Strip(Mixer* m, Track* t, bool align)
       layout->setMargin(0);
       layout->setSpacing(0);
       setLayout(layout);
-//      setFixedWidth(STRIP_WIDTH);
 
       //---------------------------------------------
       //    label
diff --git a/muse/muse/mixer/strip.h b/muse/muse/mixer/strip.h
index 71f243c5..259202b7 100644
--- a/muse/muse/mixer/strip.h
+++ b/muse/muse/mixer/strip.h
@@ -64,6 +64,7 @@ class Strip : public QFrame {
       ~Strip();
       Track* getTrack() const { return track; }
       virtual void heartBeat() = 0;
+      virtual QSize sizeHint() const { return QSize(STRIP_WIDTH, 80); }
       };
 
 #endif
diff --git a/muse/plugins/freeverb/allpass.h b/muse/plugins/freeverb/allpass.h
index 4eb1c1a0..2f27691e 100644
--- a/muse/plugins/freeverb/allpass.h
+++ b/muse/plugins/freeverb/allpass.h
@@ -44,7 +44,4 @@ class allpass
       };
 
 
-// Big to inline - but crucial for speed
-
-
 #endif//_allpass
diff --git a/muse/plugins/freeverb/comb.h b/muse/plugins/freeverb/comb.h
index d2e0f871..22f5591b 100644
--- a/muse/plugins/freeverb/comb.h
+++ b/muse/plugins/freeverb/comb.h
@@ -58,9 +58,6 @@ public:
       };
 
 
-// Big to inline - but crucial for speed
-
-
 #endif //_comb_
 
 //ends