diff options
| author | David Robillard <d@drobilla.net> | 2010-12-14 18:13:37 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2010-12-14 18:13:37 +0000 |
| commit | 4b861e603972148a29638cade51cee27ebc997a2 (patch) | |
| tree | 1ff879960fa5abfece3c560a0562b92189d8adf9 /libs/surfaces | |
| parent | 341c409fa1d77cf1259f044a3045dc3250b7c030 (diff) | |
Rename libmusictime libtimecode (consistent with already used namespace "Timecode").
Move BBT_Time to libtimecode.
git-svn-id: svn://localhost/ardour2/branches/3.0@8271 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/control_protocol/control_protocol/basic_ui.h | 2 | ||||
| -rw-r--r-- | libs/surfaces/control_protocol/wscript | 2 | ||||
| -rw-r--r-- | libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc | 2 | ||||
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 2 | ||||
| -rw-r--r-- | libs/surfaces/tranzport/show.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h index f555ed326a..3bd5ea1c0a 100644 --- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h +++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h @@ -30,7 +30,7 @@ #include <jack/types.h> -#include "musictime/time.h" +#include "timecode/time.h" namespace ARDOUR { class Session; diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript index 00c9613c77..94e5ef1359 100644 --- a/libs/surfaces/control_protocol/wscript +++ b/libs/surfaces/control_protocol/wscript @@ -30,7 +30,7 @@ def build(bld): obj.includes = ['.', './control_protocol'] obj.name = 'libardour_cp' obj.target = 'ardourcp' - obj.uselib_local = 'libardour libmusictime' + obj.uselib_local = 'libardour libtimecode' obj.vnum = LIBARDOUR_CP_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') diff --git a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc index f6a8f4d4b7..7bda9a3e5d 100644 --- a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc +++ b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc @@ -559,7 +559,7 @@ TranzportControlProtocol::show_bbt (framepos_t where) { if ((where != last_where) || lcd_isdamaged(1,9,8)) { char buf[16]; - BBT_Time bbt; + Timecode::BBT_Time bbt; session->tempo_map().bbt_time (where, bbt); sprintf (buf, "%03" PRIu32 "|%02" PRIu32 "|%04" PRIu32, bbt.bars,bbt.beats,bbt.ticks); last_bars = bbt.bars; diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index 25b5679c45..17b013713d 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -1050,7 +1050,7 @@ MackieControlProtocol::update_automation (RouteSignal & rs) string MackieControlProtocol::format_bbt_timecode (framepos_t now_frame) { - BBT_Time bbt_time; + Timecode::BBT_Time bbt_time; session->bbt_time (now_frame, bbt_time); // According to the Logic docs diff --git a/libs/surfaces/tranzport/show.cc b/libs/surfaces/tranzport/show.cc index c7eb11216a..46047f30c5 100644 --- a/libs/surfaces/tranzport/show.cc +++ b/libs/surfaces/tranzport/show.cc @@ -288,7 +288,7 @@ TranzportControlProtocol::show_bbt (framepos_t where) { if (where != last_where) { char buf[16]; - BBT_Time bbt; + Timecode::BBT_Time bbt; // When recording or playing back < 1.0 speed do 1 or 2 // FIXME - clean up state machine & break up logic |