misc updates

9 files changed, 31 insertions, 27 deletions

diff --git a/muse/ChangeLog b/muse/ChangeLog
index fafab130..33ce2ec7 100644
--- a/muse/ChangeLog
+++ b/muse/ChangeLog
@@ -1,4 +1,7 @@
-27.01 (ng)
+27.01
+      (ws)
+      - changed DSSI initialization making whysynth work
+      (ng)
       - added operator== for EventBase, MidiEventBase and PosLen
       - modified Event::operator== to match on the content instead of the pointer
       - added insert note event and delete note and sysex event in List Editor
@@ -15,7 +18,7 @@
 ***********************
 * Happy new year 2007 *
 ***********************
-	
+
 29.12 (ng)
       - fixed sync LFO Deicsonze
       - update II miditracker (not working yet)
diff --git a/muse/muse/arranger/partdrag.cpp b/muse/muse/arranger/partdrag.cpp
index 9c77d6bc..c47d3c11 100644
--- a/muse/muse/arranger/partdrag.cpp
+++ b/muse/muse/arranger/partdrag.cpp
@@ -28,9 +28,6 @@ const char WavUriDrag::type[] = "text/uri-list";
 
 //---------------------------------------------------------
 //   MidiPartDrag
-//    does only transfer reference to part, this does
-//    not allow for transfers between different apps
-//    TODO: transfer content (xml representation)
 //---------------------------------------------------------
 
 MidiPartDrag::MidiPartDrag(Part* part, QWidget* src)
diff --git a/muse/muse/driver/jack.cpp b/muse/muse/driver/jack.cpp
index 4a8a6548..a72c49c4 100644
--- a/muse/muse/driver/jack.cpp
+++ b/muse/muse/driver/jack.cpp
@@ -493,10 +493,12 @@ Port JackAudio::registerOutPort(const QString& name, bool midi)
       const char* type = midi ? JACK_DEFAULT_MIDI_TYPE : JACK_DEFAULT_AUDIO_TYPE;
       Port p(jack_port_register(_client, name.toLatin1().data(), type, JackPortIsOutput, 0));
 // printf("JACK: registerOutPort<%s>: <%s> %p\n", type, name.toLatin1().data(), p.jackPort());
+#if 0
       if (midi) {
             jack_nframes_t nframes = jack_get_buffer_size(_client);
             jack_midi_reset_new_port(jack_port_get_buffer(p.jackPort(), nframes), nframes);
             }
+#endif
       if (!p.jackPort())
             p.setZero();
       return p;
diff --git a/muse/muse/dssihost.cpp b/muse/muse/dssihost.cpp
index b5456e3c..fa91230b 100644
--- a/muse/muse/dssihost.cpp
+++ b/muse/muse/dssihost.cpp
@@ -346,9 +346,10 @@ bool DssiSynthIF::init(DssiSynth* s)
       const DSSI_Descriptor* dssi = synth->dssi;
       const LADSPA_Descriptor* ld = dssi->LADSPA_Plugin;
       handle = ld->instantiate(ld, AL::sampleRate);
+#if 0
       if (ld->activate)
             ld->activate(handle);
-
+#endif
       queryPrograms();
       int controlPorts = synth->_controller;
       controls = new LadspaPort[controlPorts];
@@ -358,6 +359,10 @@ bool DssiSynthIF::init(DssiSynth* s)
 		controls[k].val = ladspaDefaultValue(ld, i);
 		ld->connect_port(handle, i, &controls[k].val);
             }
+#if 1
+      if (ld->activate)
+            ld->activate(handle);
+#endif
       if (dssi->configure) {
             char *rv = dssi->configure(handle, DSSI_PROJECT_DIRECTORY_KEY,
                song->projectPath().toAscii().data());
@@ -371,8 +376,8 @@ bool DssiSynthIF::init(DssiSynth* s)
 //   DssiSynthIF
 //---------------------------------------------------------
 
-DssiSynthIF::DssiSynthIF(SynthI* s) 
-   : SynthIF(s) 
+DssiSynthIF::DssiSynthIF(SynthI* s)
+   : SynthIF(s)
       {
       _guiVisible = false;
       uiTarget = 0;
@@ -441,7 +446,7 @@ void DssiSynthIF::getData(MidiEventList* el, unsigned pos, int ch, unsigned samp
             if (i->time() >= endPos)
                   break;
             MidiEvent e = *i;
-            
+
             int chn = e.channel();
             int a   = e.dataA();
             int b   = e.dataB();
@@ -451,7 +456,7 @@ void DssiSynthIF::getData(MidiEventList* el, unsigned pos, int ch, unsigned samp
 	    ba.push_front(0xF0);
 	    ba.push_back(0xF7);
 	    int len = e.len() + 2;
-	    
+
 
             snd_seq_event_t* event = &events[nevents];
             event->queue = SND_SEQ_QUEUE_DIRECT;
diff --git a/muse/muse/midiedit/ecanvas.cpp b/muse/muse/midiedit/ecanvas.cpp
index b79e7271..ccfc5540 100644
--- a/muse/muse/midiedit/ecanvas.cpp
+++ b/muse/muse/midiedit/ecanvas.cpp
@@ -842,7 +842,6 @@ void EventCanvas::moveItems(const QPoint& pos, int dir)
 
             if (item->moving != p || dpitch != deltaPitch) {
                   item->moving = p;
-// printf("move %d-%d\n", item->event.pitch(),item->event.pitch()+dpitch);
                   if (dir != 1)
 		            item->my = pitch2y(item->event.pitch() + dpitch)
 		               + (int)(wpos.y() / _ymag);
diff --git a/muse/muse/muse.cpp b/muse/muse/muse.cpp
index aa575e86..b7a7f36e 100644
--- a/muse/muse/muse.cpp
+++ b/muse/muse/muse.cpp
@@ -2005,7 +2005,7 @@ void MusE::cmd(QAction* a)
 
 void MusE::clipboardChanged()
       {
-      QString subtype("partlist");
+//      QString subtype("partlist");
       const QMimeData* ms = QApplication::clipboard()->mimeData();
       if (ms == 0)
             return;
@@ -2836,9 +2836,6 @@ int main(int argc, char* argv[])
             loadVST     = false;
             }
 
-
-
-
       museUser = QString(getenv("MUSEHOME"));
       if (museUser.isEmpty())
             museUser = QDir::homePath();
diff --git a/muse/muse/part.cpp b/muse/muse/part.cpp
index 419c72bb..61ba561d 100644
--- a/muse/muse/part.cpp
+++ b/muse/muse/part.cpp
@@ -71,7 +71,7 @@ Part::Part(Track* t)
 //   clone
 //---------------------------------------------------------
 
-void Part::clone(EventList* e)  
+void Part::clone(EventList* e)
       {
       _events = e;
       ref();
@@ -335,8 +335,8 @@ void Part::read(QDomNode node, bool isMidiPart)
 //---------------------------------------------------------
 
 bool Part::isClone() const
-      { 
-      return _events->cloneCount > 1; 
+      {
+      return _events->cloneCount > 1;
       }
 
 //---------------------------------------------------------
diff --git a/muse/muse/wavetrack.cpp b/muse/muse/wavetrack.cpp
index f4551f5a..4dede840 100644
--- a/muse/muse/wavetrack.cpp
+++ b/muse/muse/wavetrack.cpp
@@ -232,6 +232,7 @@ void WaveTrack::startRecording()
             // create new part for recording
             //
             recordPart    = new Part(this);
+            recordPart->ref();
             recordPart->setType(AL::FRAMES);
             Pos spos(start.downSnaped(muse->raster()));
             Pos epos(start.upSnaped(muse->raster()));
diff --git a/muse/synti/mus/mus.cpp b/muse/synti/mus/mus.cpp
index 825ba8d5..794c3c51 100644
--- a/muse/synti/mus/mus.cpp
+++ b/muse/synti/mus/mus.cpp
@@ -54,9 +54,9 @@ static int processAudio(jack_nframes_t nFrames, void*)
             }
       while(mess->eventsPending())
             mess->processEvent(mess->receiveEvent());
-            
+
       void* midi = jack_port_get_buffer(inPort, nFrames);
-      int n = jack_midi_port_get_info(midi, nFrames)->event_count;
+      int n = jack_midi_get_event_count(midi, nFrames);
       unsigned offset = 0;
 
       for (int i = 0; i < n; ++i) {
@@ -112,7 +112,7 @@ static void usage(const char* programName)
              "    options:   -v   print version\n"
              "               -d   debug mode on\n",
             programName
-            );      
+            );
       }
 
 //---------------------------------------------------------
@@ -146,7 +146,7 @@ int main(int argc, char* argv[])
       //
       QDir pluginDir(INSTPREFIX "/lib/" INSTALL_NAME "/synthi");
       if (!pluginDir.exists()) {
-            fprintf(stderr, "plugin directory <%s> not found\n", 
+            fprintf(stderr, "plugin directory <%s> not found\n",
                pluginDir.path().toLocal8Bit().data());
             return -2;
             }
@@ -154,8 +154,8 @@ int main(int argc, char* argv[])
       if (!pluginName.endsWith(".so", Qt::CaseInsensitive))
             pluginName += ".so";
       if (!pluginDir.exists(pluginName)) {
-            fprintf(stderr, "plugin <%s> in directory <%s> not found\n", 
-               pluginName.toLocal8Bit().data(), 
+            fprintf(stderr, "plugin <%s> in directory <%s> not found\n",
+               pluginName.toLocal8Bit().data(),
                pluginDir.path().toLocal8Bit().data());
             return -3;
             }
@@ -177,7 +177,7 @@ int main(int argc, char* argv[])
             }
       const MESS* descr = msynth();
       if (descr == 0) {
-            fprintf(stderr, "%s: instantiate: no MESS descr found\n", 
+            fprintf(stderr, "%s: instantiate: no MESS descr found\n",
                argv[0]);
             return 6;
             }
@@ -246,10 +246,10 @@ int main(int argc, char* argv[])
       for (int i = 0; i < channels; ++i) {
             char portName[64];
             snprintf(portName, 64, "audioOut-%d", i);
-            outPorts[i] = jack_port_register(client, portName, 
+            outPorts[i] = jack_port_register(client, portName,
                JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
             }
-      inPort = jack_port_register(client, "midiIn", 
+      inPort = jack_port_register(client, "midiIn",
          JACK_DEFAULT_MIDI_TYPE, JackPortIsInput, 0);
       if (mess->hasGui())
             mess->showGui(true);