diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2018-10-05 12:35:10 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2018-10-05 14:15:02 -0400 |
| commit | 4c7e5dbc74981dfe1c1d277a633cb2cce0d6036b (patch) | |
| tree | 2acece91467a6dcdaa95e159993a181b359914ae /libs/ardour/ardour | |
| parent | 1b71e4db2c71dac551b0b88e98a6fc2f533723a7 (diff) | |
move away from "sync source" concepts
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/transport_master.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/utils.h | 3 |
4 files changed, 3 insertions, 6 deletions
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index d806844547..452a0822cc 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -74,8 +74,6 @@ CONFIG_VARIABLE (int, mtc_qf_speed_tolerance, "mtc-qf-speed-tolerance", 5) CONFIG_VARIABLE (bool, timecode_sync_frame_rate, "timecode-sync-frame-rate", true) #ifdef USE_TRACKS_CODE_FEATURES CONFIG_VARIABLE (SyncSource, sync_source, "sync-source", MTC) -#else -CONFIG_VARIABLE (SyncSource, sync_source, "sync-source", Engine) #endif CONFIG_VARIABLE (bool, send_ltc, "send-ltc", false) CONFIG_VARIABLE (bool, ltc_send_continuously, "ltc-send-continuously", true) diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 6e7ec93dec..455a1d6337 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -718,7 +718,7 @@ public: static PBD::Signal1<void, samplepos_t> EndTimeChanged; void request_sync_source (boost::shared_ptr<TransportMaster>); - bool synced_to_engine() const { return config.get_external_sync() && Config->get_sync_source() == Engine; } + bool synced_to_engine() const; double engine_speed() const { return _engine_speed; } double actual_speed() const { diff --git a/libs/ardour/ardour/transport_master.h b/libs/ardour/ardour/transport_master.h index 721b8e7a4a..c70757647b 100644 --- a/libs/ardour/ardour/transport_master.h +++ b/libs/ardour/ardour/transport_master.h @@ -344,6 +344,8 @@ class LIBARDOUR_API TransportMaster : public PBD::Stateful { bool removeable () const { return _removeable; } void set_removeable (bool yn) { _removeable = yn; } + std::string display_name (bool sh/*ort*/ = true) const; + protected: SyncSource _type; PBD::Property<std::string> _name; diff --git a/libs/ardour/ardour/utils.h b/libs/ardour/ardour/utils.h index 3e5ff1b1a1..5f11328d7f 100644 --- a/libs/ardour/ardour/utils.h +++ b/libs/ardour/ardour/utils.h @@ -75,9 +75,6 @@ LIBARDOUR_API bool path_is_paired (std::string path, std::string& pair_base); LIBARDOUR_API void compute_equal_power_fades (ARDOUR::samplecnt_t nframes, float* in, float* out); -LIBARDOUR_API const char* sync_source_to_string (ARDOUR::SyncSource src, bool sh = false); -LIBARDOUR_API ARDOUR::SyncSource string_to_sync_source (std::string str); - LIBARDOUR_API const char* edit_mode_to_string (ARDOUR::EditMode); LIBARDOUR_API ARDOUR::EditMode string_to_edit_mode (std::string); |