mirror of
https://github.com/Ardour/ardour.git
synced 2026-01-04 12:45:45 +01:00
MIDI robustness.
- Separate SMF::open and SMF::create, more powerful interface for both. - Correctly handle note ons with velocity 0 as note offs in sequence. - Use SMF (i.e. libsmf) for MIDI import git-svn-id: svn://localhost/ardour2/branches/3.0@4558 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard
parent
b0091c899b
commit
80e54c6ea0
11 changed files with 185 additions and 92 deletions
|
|
@ -17,8 +17,10 @@
|
|||
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#define __STDC_LIMIT_MACROS 1
|
||||
#include <cassert>
|
||||
#include <iostream>
|
||||
#include <stdint.h>
|
||||
#include "evoral/Event.hpp"
|
||||
#include "evoral/SMF.hpp"
|
||||
#include "libsmf/smf.h"
|
||||
|
|
@ -37,53 +39,113 @@ SMF<Time>::~SMF()
|
|||
}
|
||||
}
|
||||
|
||||
/** Attempt to open the SMF file for reading and writing.
|
||||
*
|
||||
* Currently SMF is always read/write.
|
||||
*
|
||||
* \return 0 on success
|
||||
* -1 if the file can not be opened or created
|
||||
* -2 if the file exists but specified track does not
|
||||
template<typename Time>
|
||||
uint16_t
|
||||
SMF<Time>::num_tracks() const
|
||||
{
|
||||
return _smf->number_of_tracks;
|
||||
}
|
||||
|
||||
template<typename Time>
|
||||
uint16_t
|
||||
SMF<Time>::ppqn() const
|
||||
{
|
||||
assert(_smf->ppqn >= 0 && _smf->ppqn <= UINT16_MAX);
|
||||
return (uint16_t)_smf->ppqn;
|
||||
}
|
||||
|
||||
/** Seek to the specified track (1-based indexing)
|
||||
* \return 0 on success
|
||||
*/
|
||||
template<typename Time>
|
||||
int
|
||||
SMF<Time>::open(const std::string& path, bool create, int track) THROW_FILE_ERROR
|
||||
SMF<Time>::seek_to_track(int track)
|
||||
{
|
||||
_smf_track = smf_get_track_by_number(_smf, track);
|
||||
if (_smf_track != NULL) {
|
||||
_smf_track->next_event_number = (_smf_track->number_of_events == 0) ? -1 : 1;
|
||||
return 0;
|
||||
} else {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
/** Attempt to open the SMF file for reading and/or writing.
|
||||
*
|
||||
* \return 0 on success
|
||||
* -1 if the file can not be opened or created
|
||||
* -2 if the file exists but specified track does not exist
|
||||
*/
|
||||
template<typename Time>
|
||||
int
|
||||
SMF<Time>::open(const std::string& path, int track) THROW_FILE_ERROR
|
||||
{
|
||||
assert(track >= 1);
|
||||
if (_smf) {
|
||||
smf_delete(_smf);
|
||||
}
|
||||
|
||||
_path = path;
|
||||
|
||||
_smf = smf_load(_path.c_str());
|
||||
if (!_smf) {
|
||||
if (!create) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
_smf = smf_new();
|
||||
if (smf_set_ppqn(_smf, _ppqn) != 0) {
|
||||
throw FileError();
|
||||
}
|
||||
|
||||
if (_smf == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
for (int i = 0; i < track; ++i) {
|
||||
_smf_track = smf_track_new();
|
||||
assert(_smf_track);
|
||||
smf_add_track(_smf, _smf_track);
|
||||
}
|
||||
if (_smf == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
_smf_track = smf_get_track_by_number(_smf, track);
|
||||
if (!_smf_track)
|
||||
return -2;
|
||||
|
||||
cerr << "Track " << track << " # events: " << _smf_track->number_of_events << endl;
|
||||
if (_smf_track->number_of_events == 0) {
|
||||
_smf_track->next_event_number = -1;
|
||||
_empty = true;
|
||||
} else {
|
||||
_smf_track->next_event_number = 1;
|
||||
_empty = false;
|
||||
}
|
||||
|
||||
_empty = !(_smf_track->number_of_events > 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/** Attempt to create a new SMF file for reading and/or writing.
|
||||
*
|
||||
* \return 0 on success
|
||||
* -1 if the file can not be created
|
||||
* -2 if the track can not be created
|
||||
*/
|
||||
template<typename Time>
|
||||
int
|
||||
SMF<Time>::create(const std::string& path, int track, int ppqn) THROW_FILE_ERROR
|
||||
{
|
||||
assert(track >= 1);
|
||||
if (_smf) {
|
||||
smf_delete(_smf);
|
||||
}
|
||||
|
||||
_path = path;
|
||||
|
||||
_smf = smf_new();
|
||||
if (smf_set_ppqn(_smf, ppqn) != 0) {
|
||||
throw FileError();
|
||||
}
|
||||
|
||||
if (_smf == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
for (int i = 0; i < track; ++i) {
|
||||
_smf_track = smf_track_new();
|
||||
assert(_smf_track);
|
||||
smf_add_track(_smf, _smf_track);
|
||||
}
|
||||
|
||||
_smf_track = smf_get_track_by_number(_smf, track);
|
||||
if (!_smf_track)
|
||||
return -2;
|
||||
|
||||
_smf_track->next_event_number = -1;
|
||||
_empty = true;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -106,7 +168,7 @@ template<typename Time>
|
|||
void
|
||||
SMF<Time>::seek_to_start() const
|
||||
{
|
||||
smf_rewind(_smf);
|
||||
_smf_track->next_event_number = 1;
|
||||
}
|
||||
|
||||
/** Read an event from the current position in file.
|
||||
|
|
@ -116,24 +178,24 @@ SMF<Time>::seek_to_start() const
|
|||
* will have it's time field set to it's delta time, in SMF tempo-based ticks, using the
|
||||
* rate given by ppqn() (it is the caller's responsibility to calculate a real time).
|
||||
*
|
||||
* \a size should be the capacity of \a buf. If it is not large enough, \a buf will
|
||||
* be freed and a new buffer allocated in its place, the size of which will be placed
|
||||
* in size.
|
||||
* \a buf must be a pointer to a buffer allocated with malloc, or a pointer to NULL.
|
||||
* \a size must be the capacity of \a buf. If it is not large enough, \a buf will
|
||||
* be reallocated and *size will be set to the new size of buf.
|
||||
*
|
||||
* Returns event length (including status byte) on success, 0 if event was
|
||||
* skipped (eg a meta event), or -1 on EOF (or end of track).
|
||||
* \return event length (including status byte) on success, 0 if event was
|
||||
* skipped (e.g. a meta event), or -1 on EOF (or end of track).
|
||||
*/
|
||||
template<typename Time>
|
||||
int
|
||||
SMF<Time>::read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf) const
|
||||
{
|
||||
smf_event_t *event;
|
||||
smf_event_t* event;
|
||||
|
||||
assert(delta_t);
|
||||
assert(size);
|
||||
assert(buf);
|
||||
|
||||
if ((event = smf_get_next_event(_smf)) != NULL) {
|
||||
if ((event = smf_track_get_next_event(_smf_track)) != NULL) {
|
||||
if (smf_event_is_metadata(event)) {
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -148,6 +210,11 @@ SMF<Time>::read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf) const
|
|||
}
|
||||
memcpy(*buf, event->midi_buffer, size_t(event_size));
|
||||
*size = event_size;
|
||||
|
||||
/*printf("SMF::read_event:\n");
|
||||
for (size_t i=0; i < *size; ++i) {
|
||||
printf("%X ", (*buf)[i]);
|
||||
} printf("\n");*/
|
||||
|
||||
return event_size;
|
||||
} else {
|
||||
|
|
@ -161,7 +228,12 @@ SMF<Time>::append_event_delta(uint32_t delta_t, const Event<Time>& ev)
|
|||
{
|
||||
assert(ev.size() > 0);
|
||||
|
||||
smf_event_t *event;
|
||||
/*printf("SMF::append_event_delta:\n");
|
||||
for (size_t i=0; i < ev.size(); ++i) {
|
||||
printf("%X ", ev.buffer()[i]);
|
||||
} printf("\n");*/
|
||||
|
||||
smf_event_t* event;
|
||||
|
||||
event = smf_event_new_from_pointer((void *) ev.buffer(), int(ev.size()));
|
||||
assert(event != NULL);
|
||||
|
|
@ -169,7 +241,7 @@ SMF<Time>::append_event_delta(uint32_t delta_t, const Event<Time>& ev)
|
|||
memcpy(event->midi_buffer, ev.buffer(), ev.size());
|
||||
|
||||
assert(_smf_track);
|
||||
smf_track_add_event_delta_pulses (_smf_track, event, int(delta_t));
|
||||
smf_track_add_event_delta_pulses(_smf_track, event, int(delta_t));
|
||||
_last_ev_time = ev.time();
|
||||
|
||||
if (ev.size() > 0) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue