X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_source.cc;h=2b0efd78e165d7a02f40433722a72e241e3c813c;hb=8f59346592b8232e910ce0bbdc247cf8cecde4dd;hp=81bea1f64de5bb538ed7fd031daa1d745bd7c016;hpb=e033ac94f08c2963b0dac13020ea6b6a6b99db01;p=ardour.git

diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc
index 81bea1f64d..2b0efd78e1 100644
--- a/libs/ardour/midi_source.cc
+++ b/libs/ardour/midi_source.cc
@@ -49,7 +49,7 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-sigc::signal<void,MidiSource *> MidiSource::MidiSourceCreated;
+PBD::Signal1<void,MidiSource*> MidiSource::MidiSourceCreated;
 
 MidiSource::MidiSource (Session& s, string name, Source::Flag flags)
 	: Source(s, DataType::MIDI, name, flags)
@@ -144,7 +144,7 @@ MidiSource::midi_read (Evoral::EventSink<nframes_t>& dst, sframes_t source_start
 
 		// If the cached iterator is invalid, search for the first event past start
 		if (_last_read_end == 0 || start != _last_read_end || !_model_iter_valid) {
-			DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("****!!!!**** search for relevant iterator for %1 / %2\n", source_start, start));
+			DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("*** %1 search for relevant iterator for %1 / %2\n", _name, source_start, start));
 			for (i = _model->begin(); i != _model->end(); ++i) {
 				if (converter.to(i->time()) >= start) {
 					break;
@@ -152,7 +152,7 @@ MidiSource::midi_read (Evoral::EventSink<nframes_t>& dst, sframes_t source_start
 			}
 			_model_iter_valid = true;
 		} else {
-			DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("============ use cached iterator for %1 / %2\n", source_start, start));
+			DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("*** %1 use cached iterator for %1 / %2\n", _name, source_start, start));
 		}
 
 		_last_read_end = start + cnt;
@@ -166,10 +166,10 @@ MidiSource::midi_read (Evoral::EventSink<nframes_t>& dst, sframes_t source_start
 				if (tracker) {
 					Evoral::MIDIEvent<Evoral::MusicalTime>& ev (*(Evoral::MIDIEvent<Evoral::MusicalTime>*) (&(*i)));
 					if (ev.is_note_on()) {
-						DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("\t%1 Added note on %2 @ %3\n", _name, ev.note(), time_frames));
+						DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("\t%1 add note on %2 @ %3\n", _name, ev.note(), time_frames));
 						tracker->add (ev.note(), ev.channel());
 					} else if (ev.is_note_off()) {
-						DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("\t%1 Added note OFF %2 @ %3\n", _name, ev.note(), time_frames));
+						DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("\t%1 add note off %2 @ %3\n", _name, ev.note(), time_frames));
 						tracker->remove (ev.note(), ev.channel());
 					}
 				}
@@ -230,7 +230,7 @@ MidiSource::session_saved()
 
 	if (_model && _model->edited()) {
 		string newname;
-		const string basename = PBD::basename_nosuffix(_name);
+		const string basename = PBD::basename_nosuffix(_name.val());
 		string::size_type last_dash = basename.find_last_of("-");
 		if (last_dash == string::npos || last_dash == basename.find_first_of("-")) {
 			newname = basename + "-1";
@@ -249,7 +249,7 @@ MidiSource::session_saved()
 
 		boost::shared_ptr<MidiSource> newsrc = boost::dynamic_pointer_cast<MidiSource>(
 				SourceFactory::createWritable(DataType::MIDI, _session,
-						newpath, true, false, _session.frame_rate()));
+						newpath, false, _session.frame_rate()));
 
 		newsrc->set_timeline_position(_timeline_position);
 		_model->write_to(newsrc);
@@ -260,7 +260,7 @@ MidiSource::session_saved()
 
 		newsrc->flush_midi();
 
-		Switched.emit(newsrc);
+		Switched (newsrc); /* EMIT SIGNAL */
 	}
 }