summaryrefslogtreecommitdiff
path: root/muse2/muse/mixer
diff options
context:
space:
mode:
Diffstat (limited to 'muse2/muse/mixer')
-rw-r--r--muse2/muse/mixer/amixer.cpp19
-rw-r--r--muse2/muse/mixer/astrip.cpp41
-rw-r--r--muse2/muse/mixer/astrip.h2
-rw-r--r--muse2/muse/mixer/mstrip.cpp33
-rw-r--r--muse2/muse/mixer/rack.cpp9
-rw-r--r--muse2/muse/mixer/rack.h1
-rw-r--r--muse2/muse/mixer/strip.cpp13
7 files changed, 71 insertions, 47 deletions
diff --git a/muse2/muse/mixer/amixer.cpp b/muse2/muse/mixer/amixer.cpp
index 2f5363ac..140dca3b 100644
--- a/muse2/muse/mixer/amixer.cpp
+++ b/muse2/muse/mixer/amixer.cpp
@@ -48,6 +48,7 @@ AudioMixerApp::AudioMixerApp(QWidget* parent, MixerConfig* c)
cfg = c;
oldAuxsSize = 0;
routingDialog = 0;
+ setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Expanding)); // TESTING Tim
setWindowTitle(cfg->name);
setWindowIcon(*museIcon);
@@ -209,10 +210,10 @@ void AudioMixerApp::updateMixer(UpdateAction action)
delete *ssi;
stripList.erase(ssi);
}
- setMaximumWidth(STRIP_WIDTH * stripList.size() + __WIDTH_COMPENSATION);
+ ///setMaximumWidth((STRIP_WIDTH + 10) * stripList.size() + __WIDTH_COMPENSATION); // 10 REMOVE Tim
// Added by Tim. p3.3.7
- if (stripList.size() < 8)
- view->setMinimumWidth(stripList.size() * STRIP_WIDTH + __WIDTH_COMPENSATION);
+ ///if (stripList.size() < 8)
+ /// view->setMinimumWidth(stripList.size() * (STRIP_WIDTH + 10) + __WIDTH_COMPENSATION); // 10 REMOVE Tim
return;
}
@@ -256,9 +257,9 @@ void AudioMixerApp::updateMixer(UpdateAction action)
addStrip(*i, idx++);
}
- setMaximumWidth(STRIP_WIDTH * stripList.size() + __WIDTH_COMPENSATION);
- if (stripList.size() < 8)
- view->setMinimumWidth(stripList.size() * STRIP_WIDTH + __WIDTH_COMPENSATION);
+ ///setMaximumWidth((STRIP_WIDTH + 10) * stripList.size() + __WIDTH_COMPENSATION); // 10 REMOVE Tim
+ ///if (stripList.size() < 8)
+ /// view->setMinimumWidth(stripList.size() * (STRIP_WIDTH + 10) + __WIDTH_COMPENSATION); // 10 REMOVE Tim
return;
}
@@ -341,9 +342,9 @@ void AudioMixerApp::updateMixer(UpdateAction action)
addStrip(*i, idx++);
}
- setMaximumWidth(STRIP_WIDTH * idx + __WIDTH_COMPENSATION);
- if (idx < 8)
- view->setMinimumWidth(idx * STRIP_WIDTH + __WIDTH_COMPENSATION);
+ ///setMaximumWidth((STRIP_WIDTH + 10) * idx + __WIDTH_COMPENSATION); // 10 REMOVE Tim
+ ///if (idx < 8)
+ /// view->setMinimumWidth(idx * (STRIP_WIDTH + 10) + __WIDTH_COMPENSATION); // 10 REMOVE Tim
}
//---------------------------------------------------------
diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp
index 7ede1a2e..2b1b53cf 100644
--- a/muse2/muse/mixer/astrip.cpp
+++ b/muse2/muse/mixer/astrip.cpp
@@ -71,7 +71,7 @@ QWidget* MenuTitleItem::createWidget(QWidget *parent)
return l;
}
-//---------------------------------------------------------
+/*//---------------------------------------------------------
// minimumSizeHint
//---------------------------------------------------------
@@ -81,6 +81,7 @@ QSize AudioStrip::minimumSizeHint () const
//return QWidget::minimumSizeHint();
return QSize(66,QWidget::minimumSizeHint().height());
}
+*/
//---------------------------------------------------------
// heartBeat
@@ -166,7 +167,7 @@ void AudioStrip::songChanged(int val)
if (mute && (val & SC_MUTE)) { // mute && off
mute->blockSignals(true);
- mute->setOn(src->mute());
+ mute->setChecked(src->mute());
mute->blockSignals(false);
updateOffState();
}
@@ -188,7 +189,7 @@ void AudioStrip::songChanged(int val)
}
solo->blockSignals(true);
- solo->setOn(track->solo());
+ solo->setChecked(track->solo());
solo->blockSignals(false);
}
if (val & SC_RECFLAG)
@@ -205,7 +206,7 @@ void AudioStrip::songChanged(int val)
if (val & SC_ROUTE) {
if (pre) {
pre->blockSignals(true);
- pre->setOn(src->prefader());
+ pre->setChecked(src->prefader());
pre->blockSignals(false);
}
}
@@ -324,7 +325,7 @@ void AudioStrip::updateOffState()
oR->setEnabled(val);
if (off) {
off->blockSignals(true);
- off->setOn(track->off());
+ off->setChecked(track->off());
off->blockSignals(false);
}
}
@@ -566,7 +567,7 @@ void AudioStrip::updateChannels()
}
channel = c;
stereo->blockSignals(true);
- stereo->setOn(channel == 2);
+ stereo->setChecked(channel == 2);
stereo->blockSignals(false);
}
@@ -591,7 +592,6 @@ Knob* AudioStrip::addKnob(int type, int id, DoubleLabel** dlabel)
else
knob->setToolTip(tr("aux send level"));
-
DoubleLabel* pl;
if (type == 0)
pl = new DoubleLabel(0, -1.0, +1.0, this);
@@ -608,10 +608,9 @@ Knob* AudioStrip::addKnob(int type, int id, DoubleLabel** dlabel)
pl->setPrecision(2);
else {
pl->setPrecision(0);
- pl->setPrecision(0);
}
pl->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
-
+
QString label;
if (type == 0)
label = tr("Pan");
@@ -623,12 +622,13 @@ Knob* AudioStrip::addKnob(int type, int id, DoubleLabel** dlabel)
plb->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
plb->setAlignment(Qt::AlignCenter);
- QGridLayout* pangrid = new QGridLayout();
- pangrid->setMargin(0);
- pangrid->addWidget(plb, 0, 0);
- pangrid->addWidget(pl, 1, 0);
- pangrid->addWidget(knob, 0, 1, 2, 1);
- grid->addLayout(pangrid, _curGridRow++, 0, 1, 2);
+ grid->addWidget(plb, _curGridRow, 0);
+ grid->addWidget(pl, _curGridRow+1, 0);
+ grid->addWidget(knob, _curGridRow, 1, 2, 1);
+ //grid->addWidget(plb, _curGridRow, 0, Qt::AlignCenter);
+ //grid->addWidget(pl, _curGridRow+1, 0, Qt::AlignCenter);
+ //grid->addWidget(knob, _curGridRow, 1, 2, 1, Qt::AlignCenter);
+ _curGridRow += 2;
connect(knob, SIGNAL(valueChanged(double,int)), pl, SLOT(setValue(double)));
//connect(pl, SIGNAL(valueChanged(double, int)), SLOT(panChanged(double)));
@@ -677,8 +677,8 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
AudioTrack* t = (AudioTrack*)track;
channel = at->channels();
- setMinimumWidth(STRIP_WIDTH);
-
+ ///setMinimumWidth(STRIP_WIDTH);
+
int ch = 0;
for (; ch < channel; ++ch)
meter[ch] = new Meter(this);
@@ -721,7 +721,7 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
pre->setText(tr("Pre"));
pre->setToolTip(tr("pre fader - post fader"));
pre->setChecked(t->prefader());
- stereo->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
+ pre->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
connect(pre, SIGNAL(clicked(bool)), SLOT(preToggled(bool)));
grid->addWidget(stereo, _curGridRow, 0);
@@ -784,7 +784,7 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
sl->setSuffix(tr("dB"));
sl->setFrame(true);
sl->setPrecision(0);
- sl->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
+ sl->setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Minimum));
sl->setValue(fast_log10(t->volume()) * 20.0);
connect(sl, SIGNAL(valueChanged(double,int)), SLOT(volLabelChanged(double)));
@@ -794,7 +794,7 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
connect(slider, SIGNAL(sliderPressed(int)), SLOT(volumePressed()));
connect(slider, SIGNAL(sliderReleased(int)), SLOT(volumeReleased()));
connect(slider, SIGNAL(sliderRightClicked(const QPoint &, int)), SLOT(volumeRightClicked(const QPoint &)));
- grid->addWidget(sl, _curGridRow++, 0, 1, 2);
+ grid->addWidget(sl, _curGridRow++, 0, 1, 2, Qt::AlignCenter);
//---------------------------------------------------
// pan, balance
@@ -916,6 +916,7 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
autoType = new ComboBox(this);
autoType->setFont(config.fonts[1]);
autoType->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
+ autoType->setAlignment(Qt::AlignCenter);
autoType->insertItem(tr("Off"), AUTO_OFF);
autoType->insertItem(tr("Read"), AUTO_READ);
diff --git a/muse2/muse/mixer/astrip.h b/muse2/muse/mixer/astrip.h
index b5a8612f..a60b4dd8 100644
--- a/muse2/muse/mixer/astrip.h
+++ b/muse2/muse/mixer/astrip.h
@@ -91,7 +91,7 @@ class AudioStrip : public Strip {
public:
AudioStrip(QWidget* parent, AudioTrack*);
~AudioStrip();
- virtual QSize minimumSizeHint () const;
+ ///virtual QSize minimumSizeHint () const;
};
#endif
diff --git a/muse2/muse/mixer/mstrip.cpp b/muse2/muse/mixer/mstrip.cpp
index de3e6d7f..abf37a28 100644
--- a/muse2/muse/mixer/mstrip.cpp
+++ b/muse2/muse/mixer/mstrip.cpp
@@ -139,13 +139,11 @@ void MidiStrip::addKnob(int idx, const QString& tt, const QString& label,
lb->setAlignment(Qt::AlignCenter);
lb->setEnabled(enabled);
- QGridLayout* gr = new QGridLayout();
- gr->setMargin(0);
- gr->addWidget(lb, 0, 0);
- gr->addWidget(dl, 1, 0);
- gr->addWidget(knob, 0, 1, 2, 1);
- grid->addLayout(gr, _curGridRow++, 0, 1, 2);
-
+ grid->addWidget(lb, _curGridRow, 0);
+ grid->addWidget(dl, _curGridRow+1, 0);
+ grid->addWidget(knob, _curGridRow, 1, 2, 1);
+ _curGridRow += 2;
+
connect(knob, SIGNAL(sliderMoved(double,int)), slot);
connect(knob, SIGNAL(sliderRightClicked(const QPoint &, int)), SLOT(controlRightClicked(const QPoint &, int)));
connect(dl, SIGNAL(valueChanged(double, int)), slot);
@@ -174,7 +172,7 @@ MidiStrip::MidiStrip(QWidget* parent, MidiTrack* t)
addKnob(KNOB_VAR_SEND, tr("VariationSend"), tr("Var"), SLOT(setVariSend(double)), false);
addKnob(KNOB_REV_SEND, tr("ReverbSend"), tr("Rev"), SLOT(setReverbSend(double)), false);
addKnob(KNOB_CHO_SEND, tr("ChorusSend"), tr("Cho"), SLOT(setChorusSend(double)), false);
- int auxsSize = song->auxs()->size();
+ ///int auxsSize = song->auxs()->size();
///if (auxsSize)
//layout->addSpacing((STRIP_WIDTH/2 + 1) * auxsSize);
///grid->addSpacing((STRIP_WIDTH/2 + 1) * auxsSize); // ??
@@ -216,7 +214,7 @@ MidiStrip::MidiStrip(QWidget* parent, MidiTrack* t)
sl->setToolTip(tr("double click on/off"));
sl->setFrame(true);
sl->setPrecision(0);
- sl->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
+ sl->setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Minimum));
// Set the label's slider 'buddy'.
sl->setSlider(slider);
@@ -260,7 +258,7 @@ MidiStrip::MidiStrip(QWidget* parent, MidiTrack* t)
connect(sl, SIGNAL(valueChanged(double, int)), SLOT(volLabelChanged(double)));
connect(sl, SIGNAL(doubleClicked(int)), SLOT(labelDoubleClicked(int)));
- grid->addWidget(sl, _curGridRow++, 0, 1, 2);
+ grid->addWidget(sl, _curGridRow++, 0, 1, 2, Qt::AlignCenter);
//---------------------------------------------------
// pan, balance
@@ -408,6 +406,7 @@ MidiStrip::MidiStrip(QWidget* parent, MidiTrack* t)
autoType = new ComboBox(this);
autoType->setFont(config.fonts[1]);
autoType->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
+ autoType->setAlignment(Qt::AlignCenter);
autoType->setEnabled(false);
// Removed by T356.
@@ -440,7 +439,8 @@ void MidiStrip::updateOffState()
bool val = !track->off();
slider->setEnabled(val);
sl->setEnabled(val);
- //pan->setEnabled(val);
+ controller[KNOB_PAN].knob->setEnabled(val);
+ controller[KNOB_PAN].dl->setEnabled(val);
label->setEnabled(val);
if (record)
@@ -453,11 +453,12 @@ void MidiStrip::updateOffState()
autoType->setEnabled(val);
if (iR)
iR->setEnabled(val);
- if (oR)
- oR->setEnabled(val);
+ // TODO: Disabled for now.
+ //if (oR)
+ // oR->setEnabled(val);
if (off) {
off->blockSignals(true);
- off->setOn(track->off());
+ off->setChecked(track->off());
off->blockSignals(false);
}
}
@@ -470,7 +471,7 @@ void MidiStrip::songChanged(int val)
{
if (mute && (val & SC_MUTE)) { // mute && off
mute->blockSignals(true);
- mute->setOn(track->isMute());
+ mute->setChecked(track->isMute());
updateOffState();
mute->blockSignals(false);
}
@@ -492,7 +493,7 @@ void MidiStrip::songChanged(int val)
useSoloIconSet2 = false;
}
solo->blockSignals(true);
- solo->setOn(track->solo());
+ solo->setChecked(track->solo());
solo->blockSignals(false);
}
diff --git a/muse2/muse/mixer/rack.cpp b/muse2/muse/mixer/rack.cpp
index 1fbef665..b59b9439 100644
--- a/muse2/muse/mixer/rack.cpp
+++ b/muse2/muse/mixer/rack.cpp
@@ -138,6 +138,15 @@ QSize EffectRack::minimumSizeHint() const
}
//---------------------------------------------------------
+// SizeHint
+//---------------------------------------------------------
+
+QSize EffectRack::sizeHint() const
+ {
+ return minimumSizeHint();
+ }
+
+//---------------------------------------------------------
// menuRequested
//---------------------------------------------------------
diff --git a/muse2/muse/mixer/rack.h b/muse2/muse/mixer/rack.h
index edacfa29..438bbdb6 100644
--- a/muse2/muse/mixer/rack.h
+++ b/muse2/muse/mixer/rack.h
@@ -27,6 +27,7 @@ class EffectRack : public Q3ListBox {
Q_OBJECT
virtual QSize minimumSizeHint() const;
+ virtual QSize sizeHint() const;
void startDrag(int idx);
void initPlugin(Xml xml, int idx);
diff --git a/muse2/muse/mixer/strip.cpp b/muse2/muse/mixer/strip.cpp
index 394e6b73..cef793d0 100644
--- a/muse2/muse/mixer/strip.cpp
+++ b/muse2/muse/mixer/strip.cpp
@@ -165,12 +165,23 @@ Strip::Strip(QWidget* parent, Track* t)
setBackgroundRole(QPalette::Mid);
setFrameStyle(Panel | Raised);
setLineWidth(2);
+
+ // NOTE: Workaround for freakin' improper disabled button text colour (at least with Oxygen colours).
+ // Just set the parent palette.
+ QPalette pal(palette());
+ pal.setColor(QPalette::Disabled, QPalette::ButtonText,
+ pal.color(QPalette::Disabled, QPalette::WindowText));
+ setPalette(pal);
+
useSoloIconSet2 = false;
track = t;
meter[0] = 0;
meter[1] = 0;
- setFixedWidth(STRIP_WIDTH);
+ //setFixedWidth(STRIP_WIDTH);
+ //setMinimumWidth(STRIP_WIDTH); // TESTING Tim.
+ //setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Expanding)); // TESTING Tim.
+ setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Expanding)); // TESTING Tim.
grid = new QGridLayout();
grid->setMargin(0);
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 00:53:24 +0000