From efc7169b5f31ca13f970ae19e3d41c361acace41 Mon Sep 17 00:00:00 2001 From: "Tim E. Real" Date: Fri, 9 Sep 2011 21:29:24 +0000 Subject: More massive cleanups, update ChangeLog. --- muse2/ChangeLog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'muse2/ChangeLog') diff --git a/muse2/ChangeLog b/muse2/ChangeLog index b0bc5121..65f0dd45 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -8,9 +8,10 @@ and ::addStuckNote, because ALSA midi is processed in a thread other than audio. (Tim) TODO: processMidi could do stuck notes better by bypassing their insertion in the play event list, also applies to seek/stop handler block, but I'm not sure about the time comparisons. + - Removed MidiSeq::msgSeek and ::msgStop, and removed calls from Audio::seek and ::stopRolling. (Tim) - Some more separation of ALSA and Jack Midi, one step closer to configurable choice of either/or. (Tim) - - Massive cleanup of audio, midi, mididev, alsamidi, jackmidi modules. Moved some stuff from Audio::processMidi - into MidiDevice. (Tim) + - Massive cleanup of audio, midi, mididev, alsamidi, jackmidi, dssi modules. Moved some stuff from + Audio::processMidi into MidiDevice. (Tim) - Test OK here so far, with stress files and complete pre-existing songs, ALSA, Jack, and Synth midi. (Tim) TODO: Restoration of sustain upon play seems broken for a while - try putEvent instead of addScheduledEvent in Audio::startRolling(). -- cgit v1.2.3 From a1ad56982605c5f48d52c046786412b0dfde8f38 Mon Sep 17 00:00:00 2001 From: "Tim E. Real" Date: Fri, 9 Sep 2011 23:36:08 +0000 Subject: Removed Audio::msgShowInstrumentGui and msgShowInstrumentNativeGui. --- muse2/ChangeLog | 1 + muse2/muse/arranger/tlist.cpp | 12 ++++++++---- muse2/muse/audio.cpp | 16 ++++++++-------- muse2/muse/audio.h | 8 ++++---- muse2/muse/seqmsg.cpp | 24 ++++++++++++++---------- 5 files changed, 35 insertions(+), 26 deletions(-) (limited to 'muse2/ChangeLog') diff --git a/muse2/ChangeLog b/muse2/ChangeLog index 65f0dd45..76a0d19a 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -9,6 +9,7 @@ TODO: processMidi could do stuck notes better by bypassing their insertion in the play event list, also applies to seek/stop handler block, but I'm not sure about the time comparisons. - Removed MidiSeq::msgSeek and ::msgStop, and removed calls from Audio::seek and ::stopRolling. (Tim) + Removed Audio::msgShowInstrumentGui and ::msgShowInstrumentNativeGui. - Some more separation of ALSA and Jack Midi, one step closer to configurable choice of either/or. (Tim) - Massive cleanup of audio, midi, mididev, alsamidi, jackmidi, dssi modules. Moved some stuff from Audio::processMidi into MidiDevice. (Tim) diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp index db83ad71..80deb2df 100644 --- a/muse2/muse/arranger/tlist.cpp +++ b/muse2/muse/arranger/tlist.cpp @@ -707,11 +707,13 @@ void TList::oportPropertyPopupMenu(Track* t, int x, int y) //if (ract == act) { if (ract == gact) { bool show = !synth->guiVisible(); - audio->msgShowInstrumentGui(synth, show); + //audio->msgShowInstrumentGui(synth, show); + synth->showGui(show); } else if (ract == nact) { bool show = !synth->nativeGuiVisible(); - audio->msgShowInstrumentNativeGui(synth, show); + //audio->msgShowInstrumentNativeGui(synth, show); + synth->showNativeGui(show); } delete p; return; @@ -758,11 +760,13 @@ void TList::oportPropertyPopupMenu(Track* t, int x, int y) //if (ract == act) { if (ract == gact) { bool show = !port->guiVisible(); - audio->msgShowInstrumentGui(port->instrument(), show); + //audio->msgShowInstrumentGui(port->instrument(), show); + port->instrument()->showGui(show); } else if (ract == nact) { bool show = !port->nativeGuiVisible(); - audio->msgShowInstrumentNativeGui(port->instrument(), show); + //audio->msgShowInstrumentNativeGui(port->instrument(), show); + port->instrument()->showNativeGui(show); } delete p; diff --git a/muse2/muse/audio.cpp b/muse2/muse/audio.cpp index 60eb5c73..f50d7d75 100644 --- a/muse2/muse/audio.cpp +++ b/muse2/muse/audio.cpp @@ -80,8 +80,8 @@ const char* seqMsgList[] = { "SEQM_SCAN_ALSA_MIDI_PORTS", "SEQM_SET_AUX", "SEQM_UPDATE_SOLO_STATES", - "MIDI_SHOW_INSTR_GUI", - "MIDI_SHOW_INSTR_NATIVE_GUI", + //"MIDI_SHOW_INSTR_GUI", + //"MIDI_SHOW_INSTR_NATIVE_GUI", "AUDIO_RECORD", "AUDIO_ROUTEADD", "AUDIO_ROUTEREMOVE", "AUDIO_REMOVEROUTES", //"AUDIO_VOL", "AUDIO_PAN", @@ -686,12 +686,12 @@ void Audio::processMsg(AudioMsg* msg) case SEQM_SCAN_ALSA_MIDI_PORTS: alsaScanMidiPorts(); break; - case MIDI_SHOW_INSTR_GUI: - midiSeq->msgUpdatePollFd(); - break; - case MIDI_SHOW_INSTR_NATIVE_GUI: - midiSeq->msgUpdatePollFd(); - break; + //case MIDI_SHOW_INSTR_GUI: + // midiSeq->msgUpdatePollFd(); + // break; + //case MIDI_SHOW_INSTR_NATIVE_GUI: + // midiSeq->msgUpdatePollFd(); + // break; case SEQM_ADD_TEMPO: case SEQM_REMOVE_TEMPO: case SEQM_SET_GLOBAL_TEMPO: diff --git a/muse2/muse/audio.h b/muse2/muse/audio.h index 03e48e23..90acae13 100644 --- a/muse2/muse/audio.h +++ b/muse2/muse/audio.h @@ -74,8 +74,8 @@ enum { SEQM_SCAN_ALSA_MIDI_PORTS, SEQM_SET_AUX, SEQM_UPDATE_SOLO_STATES, - MIDI_SHOW_INSTR_GUI, - MIDI_SHOW_INSTR_NATIVE_GUI, + //MIDI_SHOW_INSTR_GUI, + //MIDI_SHOW_INSTR_NATIVE_GUI, AUDIO_RECORD, AUDIO_ROUTEADD, AUDIO_ROUTEREMOVE, AUDIO_REMOVEROUTES, //AUDIO_VOL, AUDIO_PAN, @@ -233,8 +233,8 @@ class Audio { void msgRemoveSig(int tick, int z, int n, bool doUndoFlag = true); void msgAddKey(int tick, int key, bool doUndoFlag = true); void msgRemoveKey(int tick, int key, bool doUndoFlag = true); - void msgShowInstrumentGui(MidiInstrument*, bool); - void msgShowInstrumentNativeGui(MidiInstrument*, bool); + //void msgShowInstrumentGui(MidiInstrument*, bool); + //void msgShowInstrumentNativeGui(MidiInstrument*, bool); void msgPanic(); void sendMsg(AudioMsg*); bool sendMessage(AudioMsg* m, bool doUndo); diff --git a/muse2/muse/seqmsg.cpp b/muse2/muse/seqmsg.cpp index 6c3fc5ab..3ef2464b 100644 --- a/muse2/muse/seqmsg.cpp +++ b/muse2/muse/seqmsg.cpp @@ -757,6 +757,7 @@ void Audio::msgPlay(bool val) } } +/* //--------------------------------------------------------- // msgShowInstrumentGui //--------------------------------------------------------- @@ -764,11 +765,13 @@ void Audio::msgPlay(bool val) void Audio::msgShowInstrumentGui(MidiInstrument* instr, bool val) { instr->showGui(val); - AudioMsg msg; - msg.id = MIDI_SHOW_INSTR_GUI; - msg.p1 = instr; - msg.a = val; - sendMessage(&msg, false); + // No need for this - it called msgUpdatePollFd which has nothing + // to do with showing a gui. + //AudioMsg msg; + //msg.id = MIDI_SHOW_INSTR_GUI; + //msg.p1 = instr; + //msg.a = val; + //sendMessage(&msg, false); } //--------------------------------------------------------- @@ -778,12 +781,13 @@ void Audio::msgShowInstrumentGui(MidiInstrument* instr, bool val) void Audio::msgShowInstrumentNativeGui(MidiInstrument* instr, bool val) { instr->showNativeGui(val); - AudioMsg msg; - msg.id = MIDI_SHOW_INSTR_NATIVE_GUI; - msg.p1 = instr; - msg.a = val; - sendMessage(&msg, false); + //AudioMsg msg; + //msg.id = MIDI_SHOW_INSTR_NATIVE_GUI; + //msg.p1 = instr; + //msg.a = val; + //sendMessage(&msg, false); } +*/ //--------------------------------------------------------- // msgAddTrack -- cgit v1.2.3 From 2d847714ede4042f8a02bb0ed79bf2dc1f069709 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Sat, 10 Sep 2011 00:47:56 +0000 Subject: namespace fixes and cleanups --- muse2/ChangeLog | 2 ++ muse2/muse/app.cpp | 4 ++-- muse2/muse/arranger/arranger.cpp | 2 +- muse2/muse/arranger/tlist.cpp | 2 +- muse2/muse/confmport.cpp | 4 ++-- muse2/muse/midiedit/drumedit.cpp | 2 +- muse2/muse/mixer/astrip.cpp | 2 +- muse2/muse/mixer/panknob.cpp | 6 +++--- muse2/muse/plugin.cpp | 2 +- muse2/muse/widgets/noteinfo.h | 2 +- 10 files changed, 15 insertions(+), 13 deletions(-) (limited to 'muse2/ChangeLog') diff --git a/muse2/ChangeLog b/muse2/ChangeLog index 76a0d19a..ceb70e70 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -16,6 +16,8 @@ - Test OK here so far, with stress files and complete pre-existing songs, ALSA, Jack, and Synth midi. (Tim) TODO: Restoration of sustain upon play seems broken for a while - try putEvent instead of addScheduledEvent in Audio::startRolling(). + - Cleaned some namespace change artifacts. Fixed signal/slot mechanism related to bigtime, pianoroll, + drumedit (Orcan) 08.09.2011: - Finished namespace MusEWidget. Added namespaces MusEUtil, MusEDialog. (Orcan) 07.09.2011: diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp index e3741071..5eaaca72 100644 --- a/muse2/muse/app.cpp +++ b/muse2/muse/app.cpp @@ -962,7 +962,7 @@ MusE::MusE(int argc, char** argv) : QMainWindow() //-------- View connections connect(viewTransportAction, SIGNAL(toggled(bool)), SLOT(toggleTransport(bool))); - connect(viewBigtimeAction, SIGNAL(toggled(bool)), SLOT(toggleMusEWidget::BigTime(bool))); + connect(viewBigtimeAction, SIGNAL(toggled(bool)), SLOT(toggleBigTime(bool))); connect(viewMixerAAction, SIGNAL(toggled(bool)),SLOT(toggleMixer1(bool))); connect(viewMixerBAction, SIGNAL(toggled(bool)), SLOT(toggleMixer2(bool))); connect(viewCliplistAction, SIGNAL(toggled(bool)), SLOT(startClipList(bool))); @@ -3478,7 +3478,7 @@ void MusE::showBigtime(bool on) } //--------------------------------------------------------- -// toggleMusEWidget::BigTime +// toggleBigTime //--------------------------------------------------------- void MusE::toggleBigTime(bool checked) diff --git a/muse2/muse/arranger/arranger.cpp b/muse2/muse/arranger/arranger.cpp index 6f5ba175..3052d7d4 100644 --- a/muse2/muse/arranger/arranger.cpp +++ b/muse2/muse/arranger/arranger.cpp @@ -1013,7 +1013,7 @@ void Arranger::genTrackInfo(QWidget* parent) trackInfo->addWidget(midiTrackInfo, 1); trackInfo->addWidget(0, 2); -/// genMusEWidget::MidiTrackInfo(); +/// genMidiTrackInfo(); } //--------------------------------------------------------- diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp index 80deb2df..87f5acde 100644 --- a/muse2/muse/arranger/tlist.cpp +++ b/muse2/muse/arranger/tlist.cpp @@ -570,7 +570,7 @@ void TList::portsPopupMenu(Track* t, int x, int y) { MidiTrack* track = (MidiTrack*)t; - //QMusEWidget::PopupMenu* p = midiPortsPopup(0); + //QPopupMenu* p = midiPortsPopup(0); MidiDevice* md = 0; int port = -1; if(t->type() == Track::AUDIO_SOFTSYNTH) diff --git a/muse2/muse/confmport.cpp b/muse2/muse/confmport.cpp index 42fb5276..ce59b673 100644 --- a/muse2/muse/confmport.cpp +++ b/muse2/muse/confmport.cpp @@ -647,7 +647,7 @@ void MPConfig::rbClicked(QTableWidgetItem* item) act->setEnabled(!song->midis()->empty()); // && midiPorts[no].device()); connect(defpup, SIGNAL(triggered(QAction*)), SLOT(changeDefInputRoutes(QAction*))); - //connect(defpup, SIGNAL(aboutToHide()), MusEGlobal::muse, SLOT(routingMusEWidget::PopupMenuAboutToHide())); + //connect(defpup, SIGNAL(aboutToHide()), MusEGlobal::muse, SLOT(routingPopupMenuAboutToHide())); //defpup->popup(QCursor::pos()); defpup->exec(QCursor::pos()); delete defpup; @@ -690,7 +690,7 @@ void MPConfig::rbClicked(QTableWidgetItem* item) act->setEnabled(!song->midis()->empty()); // && midiPorts[no].device()); connect(defpup, SIGNAL(triggered(QAction*)), SLOT(changeDefOutputRoutes(QAction*))); - //connect(defpup, SIGNAL(aboutToHide()), MusEGlobal::muse, SLOT(routingMusEWidget::PopupMenuAboutToHide())); + //connect(defpup, SIGNAL(aboutToHide()), MusEGlobal::muse, SLOT(routingPopupMenuAboutToHide())); //defpup->popup(QCursor::pos()); defpup->exec(QCursor::pos()); delete defpup; diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp index e8997367..592df7fb 100644 --- a/muse2/muse/midiedit/drumedit.cpp +++ b/muse2/muse/midiedit/drumedit.cpp @@ -412,7 +412,7 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini split2->setSizes(mops); // By T356. Not much choice but to disable this for now, to stop runaway resize bug. // Can't seem to get the splitter to readjust when manually setting sizes. - //split2->setResizeMode(split1w1, QMusEWidget::Splitter::KeepSize); + //split2->setResizeMode(split1w1, QSplitter::KeepSize); gridS2->setRowStretch(1, 100); gridS2->setColumnStretch(0, 100); diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp index 4084a7d4..1aa9ae2b 100644 --- a/muse2/muse/mixer/astrip.cpp +++ b/muse2/muse/mixer/astrip.cpp @@ -624,7 +624,7 @@ void AudioStrip::updateChannels() } //--------------------------------------------------------- -// addMusEWidget::Knob +// addKnob // type = 0 - panorama // 1 - aux send //--------------------------------------------------------- diff --git a/muse2/muse/mixer/panknob.cpp b/muse2/muse/mixer/panknob.cpp index 077b39e1..f645ddf7 100644 --- a/muse2/muse/mixer/panknob.cpp +++ b/muse2/muse/mixer/panknob.cpp @@ -27,10 +27,10 @@ #include "track.h" //--------------------------------------------------------- -// PanMusEWidget::Knob +// PanKnob //--------------------------------------------------------- -PanMusEWidget::Knob::PanMusEWidget::Knob(QWidget* parent, AudioTrack* s) +PanKnob::PanKnob(QWidget* parent, AudioTrack* s) : MusEWidget::Knob(parent, "pan") { src = s; @@ -41,7 +41,7 @@ PanMusEWidget::Knob::PanMusEWidget::Knob(QWidget* parent, AudioTrack* s) // panChanged //--------------------------------------------------------- -void PanMusEWidget::Knob::valueChanged(double val) +void PanKnob::valueChanged(double val) { //audio->msgSetPan(src, val); // p4.0.21 audio->msgXXX waits. Do we really need to? diff --git a/muse2/muse/plugin.cpp b/muse2/muse/plugin.cpp index 99d89640..75d1ae45 100644 --- a/muse2/muse/plugin.cpp +++ b/muse2/muse/plugin.cpp @@ -3672,7 +3672,7 @@ PluginGui::PluginGui(PluginIBase* p) m->setRange(dlower, dupper); m->setVal(dval); paramsOut[i].actuator = m; -// paramsOut[i].label->setMusEWidget::Slider((MusEWidget::Slider*)params[i].actuator); +// paramsOut[i].label->setSlider((MusEWidget::Slider*)params[i].actuator); //paramsOut[i].actuator->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed)); label->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed)); paramsOut[i].label->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed)); diff --git a/muse2/muse/widgets/noteinfo.h b/muse2/muse/widgets/noteinfo.h index 6ca34a42..9d33db6b 100644 --- a/muse2/muse/widgets/noteinfo.h +++ b/muse2/muse/widgets/noteinfo.h @@ -73,7 +73,7 @@ class NoteInfo : public QToolBar { void setValue(ValType, int); signals: - void valueChanged(NoteInfo::ValType, int); + void valueChanged(MusEWidget::NoteInfo::ValType, int); }; } // namespace MusEWidget -- cgit v1.2.3 From 85ede352104d0dd1ec39996741faa4aea0b072b5 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Sat, 10 Sep 2011 02:35:15 +0000 Subject: colorful sliders for the plugins --- muse2/ChangeLog | 1 + muse2/muse/plugin.cpp | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'muse2/ChangeLog') diff --git a/muse2/ChangeLog b/muse2/ChangeLog index ceb70e70..50242b94 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -18,6 +18,7 @@ in Audio::startRolling(). - Cleaned some namespace change artifacts. Fixed signal/slot mechanism related to bigtime, pianoroll, drumedit (Orcan) + - Made plugin slider colors fancy, experimental. (Orcan) 08.09.2011: - Finished namespace MusEWidget. Added namespaces MusEUtil, MusEDialog. (Orcan) 07.09.2011: diff --git a/muse2/muse/plugin.cpp b/muse2/muse/plugin.cpp index 75d1ae45..f0dfdaf0 100644 --- a/muse2/muse/plugin.cpp +++ b/muse2/muse/plugin.cpp @@ -3596,8 +3596,12 @@ PluginGui::PluginGui(PluginIBase* p) params[i].label->setPrecision(2); params[i].label->setId(i); + // Let sliders all have different but unique colors + uint hast = qHash(plugin->paramName(i)); + QColor color((uint) (hast * hast) % 16777216); + MusEWidget::Slider* s = new MusEWidget::Slider(0, "param", Qt::Horizontal, - MusEWidget::Slider::None); //, style); + MusEWidget::Slider::None, color); s->setCursorHoming(true); s->setId(i); -- cgit v1.2.3 From 2eb289165d87efd3dd3b78ed6b0876cd4c17b4c6 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Sat, 10 Sep 2011 03:01:59 +0000 Subject: more namespace change fixes --- muse2/ChangeLog | 2 +- muse2/muse/conf.cpp | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'muse2/ChangeLog') diff --git a/muse2/ChangeLog b/muse2/ChangeLog index 50242b94..a49709a5 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -17,7 +17,7 @@ TODO: Restoration of sustain upon play seems broken for a while - try putEvent instead of addScheduledEvent in Audio::startRolling(). - Cleaned some namespace change artifacts. Fixed signal/slot mechanism related to bigtime, pianoroll, - drumedit (Orcan) + drumedit. Fixed config file corruption. (Orcan) - Made plugin slider colors fancy, experimental. (Orcan) 08.09.2011: - Finished namespace MusEWidget. Added namespaces MusEUtil, MusEDialog. (Orcan) diff --git a/muse2/muse/conf.cpp b/muse2/muse/conf.cpp index 25f74448..dc43855b 100644 --- a/muse2/muse/conf.cpp +++ b/muse2/muse/conf.cpp @@ -455,7 +455,7 @@ static void loadConfigMetronom(Xml& xml) MusEGlobal::midiClickFlag = xml.parseInt(); else if (tag == "audioClickEnable") MusEGlobal::audioClickFlag = xml.parseInt(); - else if (tag == "MusEGlobal::audioClickVolume") + else if (tag == "audioClickVolume") MusEGlobal::audioClickVolume = xml.parseFloat(); else xml.unknown("Metronome"); @@ -488,7 +488,7 @@ static void readSeqConfiguration(Xml& xml) readConfigMidiPort(xml); else if (tag == "rcStop") MusEGlobal::rcStopNote = xml.parseInt(); - else if (tag == "MusEGlobal::rcEnable") + else if (tag == "rcEnable") MusEGlobal::rcEnable = xml.parseInt(); else if (tag == "rcRecord") MusEGlobal::rcRecordNote = xml.parseInt(); @@ -740,19 +740,19 @@ void readConfiguration(Xml& xml, bool readOnlySequencer) MusEConfig::config.importMidiSplitParts = xml.parseInt(); else if (tag == "midiInputDevice") MusEGlobal::midiInputPorts = xml.parseInt(); - else if (tag == "MusEGlobal::midiInputChannel") + else if (tag == "midiInputChannel") MusEGlobal::midiInputChannel = xml.parseInt(); - else if (tag == "MusEGlobal::midiRecordType") + else if (tag == "midiRecordType") MusEGlobal::midiRecordType = xml.parseInt(); - else if (tag == "MusEGlobal::midiThruType") + else if (tag == "midiThruType") MusEGlobal::midiThruType = xml.parseInt(); - else if (tag == "MusEGlobal::midiFilterCtrl1") + else if (tag == "midiFilterCtrl1") MusEGlobal::midiFilterCtrl1 = xml.parseInt(); - else if (tag == "MusEGlobal::midiFilterCtrl2") + else if (tag == "midiFilterCtrl2") MusEGlobal::midiFilterCtrl2 = xml.parseInt(); - else if (tag == "MusEGlobal::midiFilterCtrl3") + else if (tag == "midiFilterCtrl3") MusEGlobal::midiFilterCtrl3 = xml.parseInt(); - else if (tag == "MusEGlobal::midiFilterCtrl4") + else if (tag == "midiFilterCtrl4") MusEGlobal::midiFilterCtrl4 = xml.parseInt(); else if (tag == "waveTracksVisible") WaveTrack::setVisible((bool)xml.parseInt()); @@ -1073,10 +1073,10 @@ static void writeSeqConfiguration(int level, Xml& xml, bool writePortInfo) xml.intTag(level, "preroll", MusEGlobal::precountPreroll); xml.intTag(level, "midiClickEnable", MusEGlobal::midiClickFlag); xml.intTag(level, "audioClickEnable", MusEGlobal::audioClickFlag); - xml.floatTag(level, "MusEGlobal::audioClickVolume", MusEGlobal::audioClickVolume); + xml.floatTag(level, "audioClickVolume", MusEGlobal::audioClickVolume); xml.tag(level--, "/metronom"); - xml.intTag(level, "MusEGlobal::rcEnable", MusEGlobal::rcEnable); + xml.intTag(level, "rcEnable", MusEGlobal::rcEnable); xml.intTag(level, "rcStop", MusEGlobal::rcStopNote); xml.intTag(level, "rcRecord", MusEGlobal::rcRecordNote); xml.intTag(level, "rcGotoLeft", MusEGlobal::rcGotoLeftMarkNote); @@ -1229,13 +1229,13 @@ void MusE::writeGlobalConfiguration(int level, Xml& xml) const xml.intTag(level, "projectStoreInFolder", MusEConfig::config.projectStoreInFolder); xml.intTag(level, "useProjectSaveDialog", MusEConfig::config.useProjectSaveDialog); xml.intTag(level, "midiInputDevice", MusEGlobal::midiInputPorts); - xml.intTag(level, "MusEGlobal::midiInputChannel", MusEGlobal::midiInputChannel); - xml.intTag(level, "MusEGlobal::midiRecordType", MusEGlobal::midiRecordType); - xml.intTag(level, "MusEGlobal::midiThruType", MusEGlobal::midiThruType); - xml.intTag(level, "MusEGlobal::midiFilterCtrl1", MusEGlobal::midiFilterCtrl1); - xml.intTag(level, "MusEGlobal::midiFilterCtrl2", MusEGlobal::midiFilterCtrl2); - xml.intTag(level, "MusEGlobal::midiFilterCtrl3", MusEGlobal::midiFilterCtrl3); - xml.intTag(level, "MusEGlobal::midiFilterCtrl4", MusEGlobal::midiFilterCtrl4); + xml.intTag(level, "midiInputChannel", MusEGlobal::midiInputChannel); + xml.intTag(level, "midiRecordType", MusEGlobal::midiRecordType); + xml.intTag(level, "midiThruType", MusEGlobal::midiThruType); + xml.intTag(level, "midiFilterCtrl1", MusEGlobal::midiFilterCtrl1); + xml.intTag(level, "midiFilterCtrl2", MusEGlobal::midiFilterCtrl2); + xml.intTag(level, "midiFilterCtrl3", MusEGlobal::midiFilterCtrl3); + xml.intTag(level, "midiFilterCtrl4", MusEGlobal::midiFilterCtrl4); //xml.intTag(level, "txDeviceId", txDeviceId); //xml.intTag(level, "rxDeviceId", rxDeviceId); -- cgit v1.2.3