- Changed IO's vector<Port*>'s to PortList

- Added new Port classes, code to drive them
- Added PortList, which is a filthy mess ATM (nevermind that, it's the interface that's important at this stage)
- Added ChanCount, though it isn't very thoroughly used yet.  That's the next step....
- Fixed a few bugs relating to loading sessions saved with trunk
- Fixed a few random other bugs

Slowly working towards type agnosticism while keeping all the former code/logic intact is the name of the game here

Warning:  Removing ports is currently (intentionally) broken due solely to laziness.


git-svn-id: svn://localhost/ardour2/branches/midi@786 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2006-08-11 03:24:57 +00:00
parent ab6f1ed9ba
commit 30c08ba655
99 changed files with 4074 additions and 2444 deletions

View file

@ -90,44 +90,26 @@ MidiSource::set_state (const XMLNode& node)
}
jack_nframes_t
MidiSource::read (unsigned char *dst, jack_nframes_t start, jack_nframes_t cnt, char * workbuf) const
MidiSource::read (RawMidi* dst, jack_nframes_t start, jack_nframes_t cnt) const
{
//Glib::Mutex::Lock lm (_lock);
//return read_unlocked (dst, start, cnt, workbuf);
return 0;
Glib::Mutex::Lock lm (_lock);
return read_unlocked (dst, start, cnt);
}
jack_nframes_t
MidiSource::write (unsigned char *dst, jack_nframes_t cnt, char * workbuf)
MidiSource::write (RawMidi* dst, jack_nframes_t cnt)
{
//Glib::Mutex::Lock lm (_lock);
//return write_unlocked (dst, cnt, workbuf);
return 0;
Glib::Mutex::Lock lm (_lock);
return write_unlocked (dst, cnt);
}
bool
MidiSource::file_changed (string path)
{
struct stat stat_file;
//struct stat stat_peak;
int e1 = stat (path.c_str(), &stat_file);
//int e2 = stat (peak_path(path).c_str(), &stat_peak);
if (!e1){//&& !e2 && stat_file.st_mtime > stat_peak.st_mtime){
return true;
} else {
return false;
}
}
void
MidiSource::update_length (jack_nframes_t pos, jack_nframes_t cnt)
{
if (pos + cnt > _length) {
_length = pos+cnt;
}
return ( !e1 );
}