From e160c228beaee36519fb210891006f7b40a46b4a Mon Sep 17 00:00:00 2001 From: "Tim E. Real" Date: Sun, 9 Oct 2011 23:49:15 +0000 Subject: Fixed track list midi port popup menu - too many ports listed. Seperated empty ports into submenu. --- muse2/ChangeLog | 10 ++++++---- muse2/muse/arranger/tlist.cpp | 2 +- muse2/muse/midiport.cpp | 36 +++++++++++++++++++++++++++++------- 3 files changed, 36 insertions(+), 12 deletions(-) (limited to 'muse2') diff --git a/muse2/ChangeLog b/muse2/ChangeLog index 11ee89bc..d0aabb95 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -1,4 +1,6 @@ -06.09.2011: +09.10.2011: + - Fixed track list midi port popup menu - too many ports listed. Seperated empty ports into submenu. (Tim) +06.10.2011: - SigEdit, up/down arrow in denominator only moves between powers of two (decreased thick headedness), numerator is no longer validated (rj) - Hopefully last big namespace update. The only namespaces in use are @@ -7,11 +9,11 @@ o MusEGui: For gui classes One or two more namespaces will be added for the stuff outside the main tree (synti, al, etc) (Orcan) - Fixed python control add-on building. Left it off by default. (Orcan) -05.09.2011: +05.10.2011: - SigEdit, up/down arrow in denominator only moves between powers of two, 2,4,8...128 (rj) -04.09.2011: +04.10.2011: - More fixes to SigEdit, close on enter, navigate with arrows and / between values, fixed background color, focus (rj) -02.09.2011: +02.10.2011: - SigEdit reworked to use two spinboxes, plan on adding Enter/Return detection so the widget will close when Enter/Return is pressed (rj) - Fixed HUGE massive memory leaks in all things using CItemList, and SndFile, dssi, fluidsynth and other huge leaks. (Tim) diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp index 98c4a595..87179575 100644 --- a/muse2/muse/arranger/tlist.cpp +++ b/muse2/muse/arranger/tlist.cpp @@ -602,7 +602,7 @@ void TList::portsPopupMenu(MusECore::Track* t, int x, int y) else port = track->outPort(); - QMenu* p = MusECore::midiPortsPopup(0, port); + QMenu* p = MusECore::midiPortsPopup(this, port); // 0, port); QAction* act = p->exec(mapToGlobal(QPoint(x, y)), 0); if (act) { int n = act->data().toInt(); diff --git a/muse2/muse/midiport.cpp b/muse2/muse/midiport.cpp index a8a248cb..49934d7b 100644 --- a/muse2/muse/midiport.cpp +++ b/muse2/muse/midiport.cpp @@ -37,6 +37,7 @@ #include "synth.h" #include "app.h" #include "song.h" +#include "menutitleitem.h" //#ifdef DSSI_SUPPORT //#include "dssihost.h" @@ -316,20 +317,41 @@ int MidiPort::portno() const // midiPortsPopup //--------------------------------------------------------- -//QPopupMenu* midiPortsPopup(QWidget* parent) QMenu* midiPortsPopup(QWidget* parent, int checkPort) { QMenu* p = new QMenu(parent); + p->addAction(new MusEGui::MenuTitleItem("Port / Device", p)); + QMenu* subp = 0; + QAction *act = 0; + QString name; for (int i = 0; i < MIDI_PORTS; ++i) { MidiPort* port = &MusEGlobal::midiPorts[i]; - QString name; name.sprintf("%d:%s", port->portno()+1, port->portname().toLatin1().constData()); - QAction *act = p->addAction(name); - act->setData(i); - - if(i == checkPort) - act->setChecked(true); + if(port->device() || (i == checkPort)) + { + act = p->addAction(name); + act->setData(i); + act->setCheckable(true); + act->setChecked(i == checkPort); + } + + if(!port->device()) + { + if(!subp) // No submenu yet? Create it now. + { + subp = new QMenu(p); + subp->setTitle(subp->tr("Empty")); + subp->addAction(new MusEGui::MenuTitleItem("Empty Ports", subp)); + } + //act = subp->addAction(name); // No need for all those "" names. + act = subp->addAction(QString().setNum(i+1)); + act->setData(i); + act->setCheckable(true); + act->setChecked(i == checkPort); + } } + if(subp) + p->addMenu(subp); return p; } -- cgit v1.2.3 From b69df6fa9d648ce8897f19415d39deee0f1b18a3 Mon Sep 17 00:00:00 2001 From: "Tim E. Real" Date: Mon, 10 Oct 2011 07:09:29 +0000 Subject: Followup: Added handy 'open midi config' to tracklist midi outport popup. --- muse2/ChangeLog | 2 +- muse2/muse/arranger/tlist.cpp | 126 +++++++++++++++++++++----------------- muse2/muse/midiedit/dlist.cpp | 71 +++++++++++++-------- muse2/muse/midiedit/drumedit.cpp | 4 +- muse2/muse/midiport.cpp | 31 +++++++++- muse2/muse/widgets/routepopup.cpp | 4 +- 6 files changed, 147 insertions(+), 91 deletions(-) (limited to 'muse2') diff --git a/muse2/ChangeLog b/muse2/ChangeLog index d0aabb95..04e0c297 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -1,5 +1,5 @@ 09.10.2011: - - Fixed track list midi port popup menu - too many ports listed. Seperated empty ports into submenu. (Tim) + - Fixed track list midi port popup menu - too many ports listed. Separated empty ports into submenu. (Tim) 06.10.2011: - SigEdit, up/down arrow in denominator only moves between powers of two (decreased thick headedness), numerator is no longer validated (rj) diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp index 87179575..cca8a086 100644 --- a/muse2/muse/arranger/tlist.cpp +++ b/muse2/muse/arranger/tlist.cpp @@ -586,7 +586,7 @@ void TList::portsPopupMenu(MusECore::Track* t, int x, int y) case MusECore::Track::MIDI: case MusECore::Track::DRUM: case MusECore::Track::AUDIO_SOFTSYNTH: - { + { MusECore::MidiTrack* track = (MusECore::MidiTrack*)t; //QPopupMenu* p = MusECore::midiPortsPopup(0); @@ -604,70 +604,84 @@ void TList::portsPopupMenu(MusECore::Track* t, int x, int y) QMenu* p = MusECore::midiPortsPopup(this, port); // 0, port); QAction* act = p->exec(mapToGlobal(QPoint(x, y)), 0); - if (act) { - int n = act->data().toInt(); - // Changed by T356. - //track->setOutPort(n); - //MusEGlobal::audio->msgSetTrackOutPort(track, n); - - //MusEGlobal::song->update(); - if (t->type() == MusECore::Track::DRUM) { - bool change = QMessageBox::question(this, tr("Update drummap?"), - tr("Do you want to use same port for all instruments in the drummap?"), - tr("&Yes"), tr("&No"), QString::null, 0, 1); - MusEGlobal::audio->msgIdle(true); - if (!change) - { - // Delete all port controller events. - //MusEGlobal::audio->msgChangeAllPortDrumCtrlEvents(false); - MusEGlobal::song->changeAllPortDrumCtrlEvents(false); - track->setOutPort(n); + if(!act) + { + delete p; + break; + } + + int n = act->data().toInt(); + delete p; - for (int i=0; ioutPort(); - // Add all port controller events. - //MusEGlobal::audio->msgChangeAllPortDrumCtrlEvents(true); - MusEGlobal::song->changeAllPortDrumCtrlEvents(true); - } - else - { - //MusEGlobal::audio->msgSetTrackOutPort(track, n); - track->setOutPortAndUpdate(n); - } - MusEGlobal::audio->msgIdle(false); - MusEGlobal::audio->msgUpdateSoloStates(); // (p4.0.14) p4.0.17 - MusEGlobal::song->update(); - } - else - if (t->type() == MusECore::Track::AUDIO_SOFTSYNTH) + if(n < 0) // Invalid item. + break; + + if(n >= MIDI_PORTS) // Show port config dialog. + { + MusEGlobal::muse->configMidiPorts(); + break; + } + + // Changed by T356. + //track->setOutPort(n); + //MusEGlobal::audio->msgSetTrackOutPort(track, n); + + //MusEGlobal::song->update(); + if (t->type() == MusECore::Track::DRUM) { + bool change = QMessageBox::question(this, tr("Update drummap?"), + tr("Do you want to use same port for all instruments in the drummap?"), + tr("&Yes"), tr("&No"), QString::null, 0, 1); + MusEGlobal::audio->msgIdle(true); + if (!change) { - if(md != 0) - { - // Idling is already handled in msgSetMidiDevice. - //MusEGlobal::audio->msgIdle(true); - - // Compiler complains if simple cast from Track to MusECore::SynthI... - MusEGlobal::midiSeq->msgSetMidiDevice(&MusEGlobal::midiPorts[n], (MusEGlobal::midiPorts[n].device() == md) ? 0 : md); - MusEGlobal::muse->changeConfig(true); // save configuration file - - //MusEGlobal::audio->msgIdle(false); - MusEGlobal::song->update(); - } + // Delete all port controller events. + //MusEGlobal::audio->msgChangeAllPortDrumCtrlEvents(false); + MusEGlobal::song->changeAllPortDrumCtrlEvents(false); + track->setOutPort(n); + + for (int i=0; ioutPort(); + // Add all port controller events. + //MusEGlobal::audio->msgChangeAllPortDrumCtrlEvents(true); + MusEGlobal::song->changeAllPortDrumCtrlEvents(true); } else { - MusEGlobal::audio->msgIdle(true); //MusEGlobal::audio->msgSetTrackOutPort(track, n); track->setOutPortAndUpdate(n); - MusEGlobal::audio->msgIdle(false); - //MusEGlobal::song->update(); - MusEGlobal::audio->msgUpdateSoloStates(); // (p4.0.14) p4.0.17 - MusEGlobal::song->update(SC_MIDI_TRACK_PROP); // } - } - delete p; + MusEGlobal::audio->msgIdle(false); + MusEGlobal::audio->msgUpdateSoloStates(); // (p4.0.14) p4.0.17 + MusEGlobal::song->update(); } - break; + else + if (t->type() == MusECore::Track::AUDIO_SOFTSYNTH) + { + if(md != 0) + { + // Idling is already handled in msgSetMidiDevice. + //MusEGlobal::audio->msgIdle(true); + + // Compiler complains if simple cast from Track to MusECore::SynthI... + MusEGlobal::midiSeq->msgSetMidiDevice(&MusEGlobal::midiPorts[n], (MusEGlobal::midiPorts[n].device() == md) ? 0 : md); + MusEGlobal::muse->changeConfig(true); // save configuration file + + //MusEGlobal::audio->msgIdle(false); + MusEGlobal::song->update(); + } + } + else + { + MusEGlobal::audio->msgIdle(true); + //MusEGlobal::audio->msgSetTrackOutPort(track, n); + track->setOutPortAndUpdate(n); + MusEGlobal::audio->msgIdle(false); + //MusEGlobal::song->update(); + MusEGlobal::audio->msgUpdateSoloStates(); // (p4.0.14) p4.0.17 + MusEGlobal::song->update(SC_MIDI_TRACK_PROP); // + } + } + break; case MusECore::Track::WAVE: case MusECore::Track::AUDIO_OUTPUT: diff --git a/muse2/muse/midiedit/dlist.cpp b/muse2/muse/midiedit/dlist.cpp index c6cd9b2e..854fe552 100644 --- a/muse2/muse/midiedit/dlist.cpp +++ b/muse2/muse/midiedit/dlist.cpp @@ -29,6 +29,8 @@ #include +#include "globals.h" +#include "app.h" #include "audio.h" #include "pitchedit.h" #include "midiport.h" @@ -180,37 +182,52 @@ void DList::draw(QPainter& p, const QRect& rect) void DList::devicesPopupMenu(MusECore::DrumMap* t, int x, int y, bool changeAll) { - QMenu* p = MusECore::midiPortsPopup(); + QMenu* p = MusECore::midiPortsPopup(this, t->port); QAction* act = p->exec(mapToGlobal(QPoint(x, y)), 0); bool doemit = false; - if (act) { - int n = act->data().toInt(); - if (!changeAll) - { - if(n != t->port) - { - MusEGlobal::audio->msgIdle(true); - MusEGlobal::song->remapPortDrumCtrlEvents(getSelectedInstrument(), -1, -1, n); - MusEGlobal::audio->msgIdle(false); - t->port = n; - doemit = true; - } - } - else { - MusEGlobal::audio->msgIdle(true); - // Delete all port controller events. - MusEGlobal::song->changeAllPortDrumCtrlEvents(false); - - for (int i = 0; i < DRUM_MAPSIZE; i++) - MusEGlobal::drumMap[i].port = n; - // Add all port controller events. - MusEGlobal::song->changeAllPortDrumCtrlEvents(true); + if(!act) + { + delete p; + return; + } + + int n = act->data().toInt(); + delete p; + + if(n < 0) // Invalid item. + return; + + if(n >= MIDI_PORTS) // Show port config dialog. + { + MusEGlobal::muse->configMidiPorts(); + return; + } - MusEGlobal::audio->msgIdle(false); - doemit = true; - } + if (!changeAll) + { + if(n != t->port) + { + MusEGlobal::audio->msgIdle(true); + MusEGlobal::song->remapPortDrumCtrlEvents(getSelectedInstrument(), -1, -1, n); + MusEGlobal::audio->msgIdle(false); + t->port = n; + doemit = true; + } + } + else { + MusEGlobal::audio->msgIdle(true); + // Delete all port controller events. + MusEGlobal::song->changeAllPortDrumCtrlEvents(false); + + for (int i = 0; i < DRUM_MAPSIZE; i++) + MusEGlobal::drumMap[i].port = n; + // Add all port controller events. + MusEGlobal::song->changeAllPortDrumCtrlEvents(true); + + MusEGlobal::audio->msgIdle(false); + doemit = true; } - delete p; + if(doemit) { int instr = getSelectedInstrument(); diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp index 4a234481..03580142 100644 --- a/muse2/muse/midiedit/drumedit.cpp +++ b/muse2/muse/midiedit/drumedit.cpp @@ -118,7 +118,7 @@ void DrumEdit::setHeaderWhatsThis() header->setWhatsThis(COL_NOTELENGTH, tr("note length")); header->setWhatsThis(COL_NOTE, tr("this is the note which is played")); header->setWhatsThis(COL_OUTCHANNEL, tr("output channel (hold ctl to affect all rows)")); - header->setWhatsThis(COL_OUTPORT, tr("output port")); + header->setWhatsThis(COL_OUTPORT, tr("output port (hold ctl to affect all rows)")); header->setWhatsThis(COL_LEVEL1, tr("shift + control key: draw velocity level 1")); header->setWhatsThis(COL_LEVEL2, tr("control key: draw velocity level 2")); header->setWhatsThis(COL_LEVEL3, tr("shift key: draw velocity level 3")); @@ -139,7 +139,7 @@ void DrumEdit::setHeaderToolTips() header->setToolTip(COL_NOTELENGTH, tr("note length")); header->setToolTip(COL_NOTE, tr("this is the note which is played")); header->setToolTip(COL_OUTCHANNEL, tr("output channel (ctl: affect all rows)")); - header->setToolTip(COL_OUTPORT, tr("output port")); + header->setToolTip(COL_OUTPORT, tr("output port (ctl: affect all rows)")); header->setToolTip(COL_LEVEL1, tr("shift + control key: draw velocity level 1")); header->setToolTip(COL_LEVEL2, tr("control key: draw velocity level 2")); header->setToolTip(COL_LEVEL3, tr("shift key: draw velocity level 3")); diff --git a/muse2/muse/midiport.cpp b/muse2/muse/midiport.cpp index 49934d7b..71a90fe7 100644 --- a/muse2/muse/midiport.cpp +++ b/muse2/muse/midiport.cpp @@ -38,6 +38,7 @@ #include "app.h" #include "song.h" #include "menutitleitem.h" +#include "icons.h" //#ifdef DSSI_SUPPORT //#include "dssihost.h" @@ -320,10 +321,34 @@ int MidiPort::portno() const QMenu* midiPortsPopup(QWidget* parent, int checkPort) { QMenu* p = new QMenu(parent); - p->addAction(new MusEGui::MenuTitleItem("Port / Device", p)); QMenu* subp = 0; QAction *act = 0; QString name; + + // Warn if no devices available. Add an item to open midi config. + int pi = 0; + for( ; pi < MIDI_PORTS; ++pi) + { + MusECore::MidiDevice* md = MusEGlobal::midiPorts[pi].device(); + //if(md && !md->isSynti() && (md->rwFlags() & 1)) + //if(md && (md->rwFlags() & 1)) + if(md && (md->rwFlags() & 1 || md->isSynti()) ) + break; + } + if(pi == MIDI_PORTS) + { + act = p->addAction(p->tr("Warning: No output devices!")); + act->setCheckable(false); + act->setData(-1); + p->addSeparator(); + } + act = p->addAction(QIcon(*MusEGui::settings_midiport_softsynthsIcon), p->tr("Open midi config...")); + act->setCheckable(false); + act->setData(MIDI_PORTS); + p->addSeparator(); + + p->addAction(new MusEGui::MenuTitleItem("Output port/device", p)); + for (int i = 0; i < MIDI_PORTS; ++i) { MidiPort* port = &MusEGlobal::midiPorts[i]; name.sprintf("%d:%s", port->portno()+1, port->portname().toLatin1().constData()); @@ -340,8 +365,8 @@ QMenu* midiPortsPopup(QWidget* parent, int checkPort) if(!subp) // No submenu yet? Create it now. { subp = new QMenu(p); - subp->setTitle(subp->tr("Empty")); - subp->addAction(new MusEGui::MenuTitleItem("Empty Ports", subp)); + subp->setTitle(subp->tr("Empty ports")); + //subp->addAction(new MusEGui::MenuTitleItem("Empty Ports", subp)); } //act = subp->addAction(name); // No need for all those "" names. act = subp->addAction(QString().setNum(i+1)); diff --git a/muse2/muse/widgets/routepopup.cpp b/muse2/muse/widgets/routepopup.cpp index 799d9079..73d29c25 100644 --- a/muse2/muse/widgets/routepopup.cpp +++ b/muse2/muse/widgets/routepopup.cpp @@ -1069,7 +1069,7 @@ void RoutePopupMenu::prepare() } if(pi == MIDI_PORTS) { - act = _pup->addAction(tr("Warning: No midi input devices!")); + act = _pup->addAction(tr("Warning: No input devices!")); act->setCheckable(false); act->setData(-1); _pup->addSeparator(); @@ -1080,7 +1080,7 @@ void RoutePopupMenu::prepare() _pup->addSeparator(); ++gid; - _pup->addAction(new MenuTitleItem("Midi input ports", _pup)); + _pup->addAction(new MenuTitleItem("Input port/device", _pup)); for(int i = 0; i < MIDI_PORTS; ++i) { -- cgit v1.2.3 From 62cbe31ce1e2252787556f4a00c003214ed83777 Mon Sep 17 00:00:00 2001 From: Robert Jonsson Date: Mon, 10 Oct 2011 11:29:41 +0000 Subject: mention compile_muse.sh in readme --- muse2/README | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'muse2') diff --git a/muse2/README b/muse2/README index 7011ab32..1770950b 100644 --- a/muse2/README +++ b/muse2/README @@ -67,7 +67,16 @@ details. - To compile MusE, run the following commands from the top level directory where the source code was unpacked (the directory where THIS README FILE is): - + + ****************************************************** + * Notice: * + * a quicker way is to run the ./compile_muse.sh * + * script in the same dir, it should perform the same * + * steps for a basic setup without asking any * + * questions. If it fails you may be better of using * + * the instructions below. * + ****************************************************** + # Create build directory. Choose any name like 'build'. mkdir build # Enter build directory. -- cgit v1.2.3 From 12a05293d545375bfc68665f047bb5838ac212ef Mon Sep 17 00:00:00 2001 From: Florian Jung Date: Tue, 11 Oct 2011 11:11:08 +0000 Subject: moved GlobalConfigValues and MixerConfig from MusEGui into MusEGlobal namespace --- muse2/muse/appearance.cpp | 2 +- muse2/muse/appearance.h | 6 ++++-- muse2/muse/conf.cpp | 6 +++++- muse2/muse/gconfig.cpp | 2 +- muse2/muse/gconfig.h | 8 ++++---- muse2/muse/mixer/amixer.cpp | 2 +- muse2/muse/mixer/amixer.h | 9 ++++++--- muse2/muse/widgets/musewidgetsplug.cpp | 2 +- 8 files changed, 23 insertions(+), 14 deletions(-) (limited to 'muse2') diff --git a/muse2/muse/appearance.cpp b/muse2/muse/appearance.cpp index 178c6bd8..e9ebf222 100644 --- a/muse2/muse/appearance.cpp +++ b/muse2/muse/appearance.cpp @@ -124,7 +124,7 @@ Appearance::Appearance(Arranger* a, QWidget* parent) setupUi(this); arr = a; color = 0; - config = new GlobalConfigValues; + config = new MusEGlobal::GlobalConfigValues; lastSelectedColorItem = 0; lastSelectedBgItem = 0; diff --git a/muse2/muse/appearance.h b/muse2/muse/appearance.h index d8ec3dc5..ecefeae0 100644 --- a/muse2/muse/appearance.h +++ b/muse2/muse/appearance.h @@ -28,10 +28,12 @@ class QColor; class QDialog; +namespace MusEGlobal { + class GlobalConfigValues; +} namespace MusEGui { class Arranger; -class GlobalConfigValues; class MusE; //--------------------------------------------------------- @@ -45,7 +47,7 @@ class Appearance : public QDialog, public Ui::AppearanceDialogBase { private: Arranger* arr; QColor* color; - GlobalConfigValues* config; + MusEGlobal::GlobalConfigValues* config; QButtonGroup* aPalette; QTreeWidgetItem* user_bg; QTreeWidgetItem* global_bg; diff --git a/muse2/muse/conf.cpp b/muse2/muse/conf.cpp index c4df1f36..c11adf7b 100644 --- a/muse2/muse/conf.cpp +++ b/muse2/muse/conf.cpp @@ -1637,6 +1637,10 @@ void MidiFileConfig::cancelClicked() close(); } +} // namespace MusEGui + + +namespace MusEGlobal { //--------------------------------------------------------- // write @@ -1722,5 +1726,5 @@ void MixerConfig::read(MusECore::Xml& xml) } -} // namespace MusEGui +} // namespace MusEGlobal diff --git a/muse2/muse/gconfig.cpp b/muse2/muse/gconfig.cpp index 337d7862..bb9f42f4 100644 --- a/muse2/muse/gconfig.cpp +++ b/muse2/muse/gconfig.cpp @@ -25,7 +25,7 @@ namespace MusEGlobal { -MusEGui::GlobalConfigValues config = { +GlobalConfigValues config = { 190, // globalAlphaBlend { QColor(0xff, 0xff, 0xff), // palette diff --git a/muse2/muse/gconfig.h b/muse2/muse/gconfig.h index df6739cf..d9038ea1 100644 --- a/muse2/muse/gconfig.h +++ b/muse2/muse/gconfig.h @@ -36,7 +36,7 @@ namespace MusECore { class Xml; } -namespace MusEGui { +namespace MusEGlobal { //--------------------------------------------------------- // MixerConfig @@ -166,10 +166,10 @@ struct GlobalConfigValues { bool rangeMarkerWithoutMMB; }; -} // namespace MusEGui -namespace MusEGlobal { -extern MusEGui::GlobalConfigValues config; + + +extern GlobalConfigValues config; } // namespace MusEGlobal #endif diff --git a/muse2/muse/mixer/amixer.cpp b/muse2/muse/mixer/amixer.cpp index 3a947945..731af9a4 100644 --- a/muse2/muse/mixer/amixer.cpp +++ b/muse2/muse/mixer/amixer.cpp @@ -158,7 +158,7 @@ bool ScrollArea::viewportEvent(QEvent* event) // inputs | synthis | tracks | groups | master //--------------------------------------------------------- -AudioMixerApp::AudioMixerApp(QWidget* parent, MixerConfig* c) +AudioMixerApp::AudioMixerApp(QWidget* parent, MusEGlobal::MixerConfig* c) : QMainWindow(parent) { cfg = c; diff --git a/muse2/muse/mixer/amixer.h b/muse2/muse/mixer/amixer.h index cf856f22..a52e4264 100644 --- a/muse2/muse/mixer/amixer.h +++ b/muse2/muse/mixer/amixer.h @@ -46,6 +46,10 @@ class Meter; class Track; } +namespace MusEGlobal { + struct MixerConfig; +} + namespace MusEGui { class ComboBox; class DoubleLabel; @@ -53,7 +57,6 @@ class Knob; class RouteDialog; class Slider; class Strip; -struct MixerConfig; typedef std::list StripList; //--------------------------------------------------------- @@ -82,7 +85,7 @@ class AudioMixerApp : public QMainWindow { Q_OBJECT //QString name; - MixerConfig* cfg; + MusEGlobal::MixerConfig* cfg; StripList stripList; QScrollArea* view; QWidget* central; @@ -141,7 +144,7 @@ class AudioMixerApp : public QMainWindow { public: //AudioMixerApp(QWidget* parent); - AudioMixerApp(QWidget* parent, MixerConfig* c); + AudioMixerApp(QWidget* parent, MusEGlobal::MixerConfig* c); //void write(Xml&, const char* name); //void write(int level, Xml& xml, const char* name); void write(int level, MusECore::Xml& xml); diff --git a/muse2/muse/widgets/musewidgetsplug.cpp b/muse2/muse/widgets/musewidgetsplug.cpp index 8520a731..4068da57 100644 --- a/muse2/muse/widgets/musewidgetsplug.cpp +++ b/muse2/muse/widgets/musewidgetsplug.cpp @@ -53,7 +53,7 @@ static const char* valu[] = { "C","C#","D","D#","E","F","F#","G","G#","A","A#","H" }; -GlobalConfigValues config = { +MusEGlobal::GlobalConfigValues config = { 190, // globalAlphaBlend { QColor(0xff, 0xff, 0xff), // palette -- cgit v1.2.3