allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Merged with trunk R992.

Browse Source 
Completely untested other than it compiles, runs, and records somewhat (need to merge again).


git-svn-id: svn://localhost/ardour2/branches/midi@999 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard
2006-10-21 19:01:50 +00:00
parent 7bd41538d9
commit fedf3d34f3
297 changed files with 6156 additions and 5481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libs/surfaces/control_protocol/basic_ui.cc
View File

@@ -29,6 +29,7 @@
#include "i18n.h"
using namespace ARDOUR;
using ARDOUR::nframes_t;
BasicUI::BasicUI (Session& s)
: session (&s)
@@ -54,10 +55,10 @@ BasicUI::register_thread (std::string name)
void
BasicUI::loop_toggle ()
{
if (session->get_auto_loop()) {
session->request_auto_loop (false);
if (Config->get_auto_loop()) {
session->request_play_loop (false);
} else {
session->request_auto_loop (true);
session->request_play_loop (true);
if (!session->transport_rolling()) {
session->request_transport_speed (1.0);
}
@@ -79,7 +80,7 @@ BasicUI::goto_end ()
void
BasicUI::add_marker ()
{
jack_nframes_t when = session->audible_frame();
nframes_t when = session->audible_frame();
session->locations()->add (new Location (when, when, _("unnamed"), Location::IsMark));
}
@@ -106,8 +107,8 @@ BasicUI::transport_play (bool from_last_start)
{
bool rolling = session->transport_rolling ();
if (session->get_auto_loop()) {
session->request_auto_loop (false);
if (Config->get_auto_loop()) {
session->request_play_loop (false);
}
if (session->get_play_range ()) {
@@ -208,13 +209,13 @@ BasicUI::toggle_all_rec_enables ()
void
BasicUI::toggle_punch_in ()
{
session->set_punch_in (!session->get_punch_in());
Config->set_punch_in (!Config->get_punch_in());
}
void
BasicUI::toggle_punch_out ()
{
session->set_punch_out (!session->get_punch_out());
Config->set_punch_out (!Config->get_punch_out());
}
bool
@@ -233,14 +234,14 @@ BasicUI::set_record_enable (bool yn)
}
}
jack_nframes_t
nframes_t
BasicUI::transport_frame ()
{
return session->transport_frame();
}
void
BasicUI::locate (jack_nframes_t where, bool roll_after_locate)
BasicUI::locate (nframes_t where, bool roll_after_locate)
{
session->request_locate (where, roll_after_locate);
}
@@ -257,26 +258,26 @@ BasicUI::locked ()
return session->transport_locked ();
}
jack_nframes_t
nframes_t
BasicUI::smpte_frames_per_hour ()
{
return session->smpte_frames_per_hour ();
}
void
BasicUI::smpte_time (jack_nframes_t where, SMPTE::Time& smpte)
BasicUI::smpte_time (nframes_t where, SMPTE::Time& smpte)
{
session->smpte_time (where, *((SMPTE::Time *) &smpte));
}
void
BasicUI::smpte_to_sample (SMPTE::Time& smpte, jack_nframes_t& sample, bool use_offset, bool use_subframes) const
BasicUI::smpte_to_sample (SMPTE::Time& smpte, 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::Time& smpte, bool use_offset, bool use_subframes) const
BasicUI::sample_to_smpte (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);
}