From: werner s. <wsc...@us...> - 2004-07-28 10:17:31
|
Update of /cvsroot/lmuse/muse/muse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15310/muse Modified Files: Makefile.am audio.cpp audio.h audiotrack.cpp ctrl.h midiport.cpp midiseq.cpp midiseq.h seqmsg.cpp song.cpp song.h synth.h ticksynth.cpp track.h undo.cpp Log Message: mix update Index: undo.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/undo.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** undo.cpp 28 Jun 2004 21:13:16 -0000 1.12 --- undo.cpp 28 Jul 2004 10:17:17 -0000 1.13 *************** *** 112,116 **** { Track* track = i->nTrack->clone(); ! *(i->nTrack) = *(i->oTrack); delete i->oTrack; i->oTrack = track; --- 112,116 ---- { Track* track = i->nTrack->clone(); ! //TODO *(i->nTrack) = *(i->oTrack); delete i->oTrack; i->oTrack = track; *************** *** 194,198 **** { Track* track = i->nTrack->clone(); ! *(i->nTrack) = *(i->oTrack); delete i->oTrack; i->oTrack = track; --- 194,198 ---- { Track* track = i->nTrack->clone(); ! //TODO *(i->nTrack) = *(i->oTrack); delete i->oTrack; i->oTrack = track; Index: audio.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/audio.h,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** audio.h 22 Jul 2004 13:53:55 -0000 1.26 --- audio.h 28 Jul 2004 10:17:17 -0000 1.27 *************** *** 50,63 **** SEQM_PLAY_MIDI_EVENT, SEQM_SCAN_ALSA_MIDI_PORTS, - SEQM_SET_AUX, // AUDIO_RECORD, AUDIO_ROUTEADD, AUDIO_ROUTEREMOVE, - AUDIO_VOL, AUDIO_PAN, AUDIO_ADDPLUGIN, AUDIO_SET_SEG_SIZE, AUDIO_SET_PREFADER, AUDIO_SET_CHANNELS, ! MS_PROCESS, MS_STOP, MS_SET_RTC, MS_UPDATE_POLL_FD, SEQM_IDLE, SEQM_SEEK, }; --- 50,62 ---- SEQM_PLAY_MIDI_EVENT, SEQM_SCAN_ALSA_MIDI_PORTS, // AUDIO_RECORD, AUDIO_ROUTEADD, AUDIO_ROUTEREMOVE, AUDIO_ADDPLUGIN, AUDIO_SET_SEG_SIZE, AUDIO_SET_PREFADER, AUDIO_SET_CHANNELS, ! MS_PROCESS, MS_STOP, MS_SET_RTC, ! // MS_UPDATE_POLL_FD, SEQM_IDLE, SEQM_SEEK, }; *************** *** 192,196 **** void msgAddTempo(int tick, int tempo, bool doUndoFlag = true); void msgSetTempo(int tick, int tempo, bool doUndoFlag = true); - void msgSetAux(AudioTrack*, int, double); void msgSetGlobalTempo(int val); void msgDeleteTempo(int tick, int tempo, bool doUndoFlag = true); --- 191,194 ---- *************** *** 205,210 **** void msgAddPlugin(AudioTrack*, int idx, PluginI* plugin); void msgSetMute(AudioTrack*, bool val); - void msgSetVolume(AudioTrack*, double val); - void msgSetPan(AudioTrack*, double val); void msgAddSynthI(SynthI* synth); void msgRemoveSynthI(SynthI* synth); --- 203,206 ---- Index: song.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/song.h,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** song.h 27 Jul 2004 20:52:26 -0000 1.36 --- song.h 28 Jul 2004 10:17:17 -0000 1.37 *************** *** 56,60 **** #define SC_MASTER 0x800 // master flag changed #define SC_SELECTION 0x1000 - #define SC_MIDI_CONTROLLER 0x2000 // must update midi mixer #define SC_MUTE 0x4000 #define SC_SOLO 0x8000 --- 56,59 ---- *************** *** 64,71 **** #define SC_CONFIG 0x80000 // midiPort-midiDevice #define SC_DRUMMAP 0x100000 // must update drumeditor - #define SC_MIXER_VOLUME 0x200000 - #define SC_MIXER_PAN 0x400000 #define SC_AUTOMATION 0x800000 - #define SC_AUX 0x1000000 // mixer aux changed #define SC_RACK 0x1000000 // mixer rack changed --- 63,67 ---- Index: synth.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/synth.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** synth.h 21 Jul 2004 18:26:19 -0000 1.23 --- synth.h 28 Jul 2004 10:17:17 -0000 1.24 *************** *** 94,97 **** --- 94,98 ---- virtual void setParameter(int idx, float value) = 0; virtual int getControllerInfo(int id, const char** name, int* ctrl, int* min, int* max) = 0; + virtual bool hasAuxSend() const { return true; } }; *************** *** 160,164 **** void deactivate3(); bool isActivated() const { return synthesizer && sif; } ! virtual bool hasAuxSend() const { return true; } }; --- 161,165 ---- void deactivate3(); bool isActivated() const { return synthesizer && sif; } ! virtual bool hasAuxSend() const { return sif->hasAuxSend(); } }; Index: audiotrack.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/audiotrack.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** audiotrack.cpp 14 Jul 2004 15:27:26 -0000 1.14 --- audiotrack.cpp 28 Jul 2004 10:17:17 -0000 1.15 *************** *** 147,151 **** //--------------------------------------------------------- ! double AudioTrack::volume() const { ciCtrlList cl = _controller.find(AC_VOLUME); --- 147,151 ---- //--------------------------------------------------------- ! float AudioTrack::volume() const { ciCtrlList cl = _controller.find(AC_VOLUME); *************** *** 163,167 **** //--------------------------------------------------------- ! void AudioTrack::setVolume(double val) { iCtrlList cl = _controller.find(AC_VOLUME); --- 163,167 ---- //--------------------------------------------------------- ! void AudioTrack::setVolume(float val) { iCtrlList cl = _controller.find(AC_VOLUME); *************** *** 172,175 **** --- 172,176 ---- } cl->second->setCurVal(val); + emit volumeChanged(val); } *************** *** 178,182 **** //--------------------------------------------------------- ! double AudioTrack::pan() const { ciCtrlList cl = _controller.find(AC_PAN); --- 179,183 ---- //--------------------------------------------------------- ! float AudioTrack::pan() const { ciCtrlList cl = _controller.find(AC_PAN); *************** *** 190,194 **** //--------------------------------------------------------- ! void AudioTrack::setPan(double val) { iCtrlList cl = _controller.find(AC_PAN); --- 191,195 ---- //--------------------------------------------------------- ! void AudioTrack::setPan(float val) { iCtrlList cl = _controller.find(AC_PAN); *************** *** 198,201 **** --- 199,203 ---- } cl->second->setCurVal(val); + emit panChanged(val); } *************** *** 265,269 **** { unsigned idx = 0; ! double val; for (;;) { Xml::Token token = xml.parse(); --- 267,271 ---- { unsigned idx = 0; ! float val; for (;;) { Xml::Token token = xml.parse(); *************** *** 699,703 **** } } ! double AudioTrack::auxSend(int idx) const { if (unsigned(idx) >= _auxSend.size()) { --- 701,705 ---- } } ! float AudioTrack::auxSend(int idx) const { if (unsigned(idx) >= _auxSend.size()) { *************** *** 709,713 **** } ! void AudioTrack::setAuxSend(int idx, double v) { if (unsigned(idx) >= _auxSend.size()) { --- 711,715 ---- } ! void AudioTrack::setAuxSend(int idx, float v) { if (unsigned(idx) >= _auxSend.size()) { *************** *** 717,720 **** --- 719,723 ---- } _auxSend[idx] = v; + emit auxChanged(v, idx); } Index: midiseq.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiseq.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** midiseq.cpp 22 Jul 2004 13:53:55 -0000 1.31 --- midiseq.cpp 28 Jul 2004 10:17:17 -0000 1.32 *************** *** 68,74 **** undoSetuid(); break; ! case MS_UPDATE_POLL_FD: ! updatePollFd(); ! break; case SEQM_ADD_TRACK: song->insertTrack2(msg->track, msg->ival); --- 68,75 ---- undoSetuid(); break; ! // case MS_UPDATE_POLL_FD: ! // updatePollFd(); ! // break; ! case SEQM_ADD_TRACK: song->insertTrack2(msg->track, msg->ival); *************** *** 522,525 **** void MidiSeq::msgStop() { msgMsg(MS_STOP); } void MidiSeq::msgSetRtc() { msgMsg(MS_SET_RTC); } ! void MidiSeq::msgUpdatePollFd() { msgMsg(MS_UPDATE_POLL_FD); } --- 523,526 ---- void MidiSeq::msgStop() { msgMsg(MS_STOP); } void MidiSeq::msgSetRtc() { msgMsg(MS_SET_RTC); } ! // void MidiSeq::msgUpdatePollFd() { msgMsg(MS_UPDATE_POLL_FD); } Index: midiport.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiport.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** midiport.cpp 18 Jun 2004 08:36:43 -0000 1.21 --- midiport.cpp 28 Jul 2004 10:17:17 -0000 1.22 *************** *** 340,343 **** --- 340,344 ---- { if (ev.type() == ME_CONTROLLER) { + // printf("sendEvent %d %d\n", ev.dataA(), ev.dataB()); // // optimize controller settings Index: song.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/song.cpp,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** song.cpp 27 Jul 2004 20:52:26 -0000 1.61 --- song.cpp 28 Jul 2004 10:17:17 -0000 1.62 *************** *** 244,248 **** return false; } - updateFlags |= SC_MIDI_CONTROLLER; } part->events()->add(event); --- 244,247 ---- Index: ticksynth.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/ticksynth.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ticksynth.cpp 21 Jul 2004 18:26:19 -0000 1.1 --- ticksynth.cpp 28 Jul 2004 10:17:17 -0000 1.2 *************** *** 70,73 **** --- 70,74 ---- virtual void setParameter(int, float) {} virtual int getControllerInfo(int, const char**, int*, int*, int*) { return 0; } + virtual bool hasAuxSend() const { return false; } }; Index: track.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/track.h,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** track.h 22 Jul 2004 13:53:55 -0000 1.40 --- track.h 28 Jul 2004 10:17:17 -0000 1.41 *************** *** 10,13 **** --- 10,14 ---- #define __TRACK_H__ + #include <qobject.h> #include <qstring.h> #include <vector> *************** *** 32,36 **** //--------------------------------------------------------- ! class Track { public: enum TrackType { --- 33,39 ---- //--------------------------------------------------------- ! class Track : public QObject { ! Q_OBJECT ! public: enum TrackType { *************** *** 143,146 **** --- 146,151 ---- class MidiTrack : public Track { + Q_OBJECT + static bool _soloMode; int _outPort; *************** *** 152,155 **** --- 157,163 ---- MPEventList* _mpevents; // tmp Events druring recording + signals: + void controllerChanged(int,int); + public: MidiTrack(); *************** *** 161,164 **** --- 169,173 ---- virtual void setAutomationType(AutomationType); + void controllerUpdated(int num, int val) { emit controllerChanged(num, val); } // play parameter int transposition; *************** *** 204,207 **** --- 213,218 ---- class AudioTrack : public Track { + Q_OBJECT + static bool _soloMode; CtrlListList _controller; *************** *** 209,213 **** bool _prefader; // prefader metering ! std::vector<double> _auxSend; Pipeline* _efxPipe; --- 220,224 ---- bool _prefader; // prefader metering ! std::vector<float> _auxSend; Pipeline* _efxPipe; *************** *** 227,230 **** --- 238,246 ---- Fifo fifo; // fifo -> _recFile + signals: + void volumeChanged(float); + void panChanged(float); + void auxChanged(float, int); + public: AudioTrack(TrackType t); *************** *** 262,273 **** virtual void setOff(bool val); ! double volume() const; ! void setVolume(double val); ! double pan() const; ! void setPan(double val); bool prefader() const { return _prefader; } ! double auxSend(int idx) const; ! void setAuxSend(int idx, double v); void addAuxSend(int n); --- 278,289 ---- virtual void setOff(bool val); ! float volume() const; ! void setVolume(float val); ! float pan() const; ! void setPan(float val); bool prefader() const { return _prefader; } ! float auxSend(int idx) const; ! void setAuxSend(int idx, float v); void addAuxSend(int n); Index: audio.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/audio.cpp,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** audio.cpp 22 Jul 2004 13:53:54 -0000 1.60 --- audio.cpp 28 Jul 2004 10:17:17 -0000 1.61 *************** *** 50,61 **** "SEQM_PLAY_MIDI_EVENT", "SEQM_SCAN_ALSA_MIDI_PORTS", - "SEQM_SET_AUX", "AUDIO_RECORD", "AUDIO_ROUTEADD", "AUDIO_ROUTEREMOVE", - "AUDIO_VOL", "AUDIO_PAN", "AUDIO_ADDPLUGIN", "AUDIO_SET_SEG_SIZE", "AUDIO_SET_PREFADER", "AUDIO_SET_CHANNELS", ! "MS_PROCESS", "MS_STOP", "MS_SET_RTC", "MS_UPDATE_POLL_FD", "SEQM_IDLE", "SEQM_SEEK" }; --- 50,60 ---- "SEQM_PLAY_MIDI_EVENT", "SEQM_SCAN_ALSA_MIDI_PORTS", "AUDIO_RECORD", "AUDIO_ROUTEADD", "AUDIO_ROUTEREMOVE", "AUDIO_ADDPLUGIN", "AUDIO_SET_SEG_SIZE", "AUDIO_SET_PREFADER", "AUDIO_SET_CHANNELS", ! "MS_PROCESS", "MS_STOP", "MS_SET_RTC", ! // "MS_UPDATE_POLL_FD", "SEQM_IDLE", "SEQM_SEEK" }; *************** *** 388,400 **** removeRoute(msg->sroute, msg->droute); break; - case AUDIO_VOL: - msg->snode->setVolume(msg->dval); - break; - case AUDIO_PAN: - msg->snode->setPan(msg->dval); - break; - case SEQM_SET_AUX: - msg->snode->setAuxSend(msg->ival, msg->dval); - break; case AUDIO_SET_PREFADER: msg->snode->setPrefader(msg->ival); --- 387,390 ---- Index: midiseq.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiseq.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** midiseq.h 11 Jul 2004 16:26:46 -0000 1.6 --- midiseq.h 28 Jul 2004 10:17:17 -0000 1.7 *************** *** 60,64 **** void msgStop(); void msgSetRtc(); ! void msgUpdatePollFd(); void msgAddSynthI(SynthI* synth); void msgRemoveSynthI(SynthI* synth); --- 60,64 ---- void msgStop(); void msgSetRtc(); ! // void msgUpdatePollFd(); void msgAddSynthI(SynthI* synth); void msgRemoveSynthI(SynthI* synth); Index: ctrl.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/ctrl.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ctrl.h 11 Feb 2004 22:05:39 -0000 1.4 --- ctrl.h 28 Jul 2004 10:17:17 -0000 1.5 *************** *** 18,21 **** --- 18,22 ---- const int AC_PAN = 1; const int AC_MUTE = 2; + const int AC_AUX = 3; inline int genACnum(int plugin, int ctrl) { return plugin * 0x10000 + ctrl; } *************** *** 93,101 **** QString name() const { return _name; } void setName(const QString& s) { _name = s; } ! void setRange(double min, double max) { _min = min; _max = max; } ! void range(double* min, double* max) const { *min = _min; *max = _max; --- 94,102 ---- QString name() const { return _name; } void setName(const QString& s) { _name = s; } ! void setRange(float min, float max) { _min = min; _max = max; } ! void range(float* min, float* max) const { *min = _min; *max = _max; Index: Makefile.am =================================================================== RCS file: /cvsroot/lmuse/muse/muse/Makefile.am,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Makefile.am 27 Jul 2004 20:52:26 -0000 1.20 --- Makefile.am 28 Jul 2004 10:17:17 -0000 1.21 *************** *** 98,102 **** moc_transpose.cpp \ moc_miditransform.cpp \ ! moc_appearance.cpp muse_LDADD = \ --- 98,103 ---- moc_transpose.cpp \ moc_miditransform.cpp \ ! moc_appearance.cpp \ ! moc_track.cpp muse_LDADD = \ *************** *** 114,117 **** --- 115,119 ---- instruments/libinstruments.a \ widgets/libwidgets.a \ + ../awl/libawl.la \ ../synti/libsynti/libsynti.la Index: seqmsg.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/seqmsg.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** seqmsg.cpp 22 Jul 2004 13:53:55 -0000 1.33 --- seqmsg.cpp 28 Jul 2004 10:17:17 -0000 1.34 *************** *** 152,181 **** //--------------------------------------------------------- - // msgSetVolume - //--------------------------------------------------------- - - void Audio::msgSetVolume(AudioTrack* src, double val) - { - AudioMsg msg; - msg.id = AUDIO_VOL; - msg.snode = src; - msg.dval = val; - sendMsg(&msg); - } - - //--------------------------------------------------------- - // msgSetPan - //--------------------------------------------------------- - - void Audio::msgSetPan(AudioTrack* node, double val) - { - AudioMsg msg; - msg.id = AUDIO_PAN; - msg.snode = node; - msg.dval = val; - sendMsg(&msg); - } - - //--------------------------------------------------------- // msgSetPrefader //--------------------------------------------------------- --- 152,155 ---- *************** *** 631,648 **** //--------------------------------------------------------- - // msgSetAux - //--------------------------------------------------------- - - void Audio::msgSetAux(AudioTrack* track, int idx, double val) - { - AudioMsg msg; - msg.id = SEQM_SET_AUX; - msg.snode = track; - msg.ival = idx; - msg.dval = val; - sendMessage(&msg, false); - } - - //--------------------------------------------------------- // msgPlayMidiEvent //--------------------------------------------------------- --- 605,608 ---- |