Merged with trunk revision 610

git-svn-id: svn://localhost/ardour2/branches/midi@611 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2006-06-15 22:31:13 +00:00
parent b5db1f624d
commit e13e84677a
31 changed files with 545 additions and 1980 deletions

View file

@ -24,7 +24,8 @@
#include <ardour/session.h>
#include <ardour/location.h>
#include "basic_ui.h"
#include <control_protocol/basic_ui.h>
#include "i18n.h"
using namespace ARDOUR;
@ -263,19 +264,19 @@ BasicUI::smpte_frames_per_hour ()
}
void
BasicUI::smpte_time (jack_nframes_t where, SMPTE_t& smpte)
BasicUI::smpte_time (jack_nframes_t where, SMPTE::Time& smpte)
{
session->smpte_time (where, *((SMPTE::Time *) &smpte));
}
void
BasicUI::smpte_to_sample (SMPTE_t& smpte, jack_nframes_t& sample, bool use_offset, bool use_subframes) const
BasicUI::smpte_to_sample (SMPTE::Time& smpte, jack_nframes_t& sample, bool use_offset, bool use_subframes) const
{
session->smpte_to_sample (*((SMPTE::Time*)&smpte), sample, use_offset, use_subframes);
}
void
BasicUI::sample_to_smpte (jack_nframes_t sample, SMPTE_t& smpte, bool use_offset, bool use_subframes) const
BasicUI::sample_to_smpte (jack_nframes_t sample, SMPTE::Time& smpte, bool use_offset, bool use_subframes) const
{
session->sample_to_smpte (sample, *((SMPTE::Time*)&smpte), use_offset, use_subframes);
}