diff options
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/audioengine.h | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/playlist.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/port_insert.h | 12 | ||||
| -rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 2 |
4 files changed, 16 insertions, 3 deletions
diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index 6baa724cf2..e3fcb58fa1 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -247,7 +247,6 @@ _ the regular process() call to session->process() is not made. nframes_t _processed_frames; bool _freewheeling; bool _freewheel_pending; - bool _freewheel_thread_registered; boost::function<int(nframes_t)> freewheel_action; bool reconnect_on_halt; int _usecs_per_cycle; diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index b6e8719ccd..5a6adda140 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -116,6 +116,7 @@ class Playlist : public SessionObject bool used () const { return _refcnt != 0; } bool set_name (const std::string& str); + int sort_id() { return _sort_id; } const DataType& data_type() const { return _type; } @@ -240,6 +241,7 @@ class Playlist : public SessionObject std::set<boost::shared_ptr<Region> > all_regions; /* all regions ever added to this playlist */ PBD::ScopedConnectionList region_state_changed_connections; DataType _type; + int _sort_id; mutable gint block_notifications; mutable gint ignore_state_changes; mutable Glib::RecMutex region_lock; @@ -289,6 +291,8 @@ class Playlist : public SessionObject virtual void flush_notifications (); void clear_pending (); + void _set_sort_id (); + void notify_region_removed (boost::shared_ptr<Region>); void notify_region_added (boost::shared_ptr<Region>); void notify_length_changed (); diff --git a/libs/ardour/ardour/port_insert.h b/libs/ardour/ardour/port_insert.h index 5e50b4775e..2f39d8688e 100644 --- a/libs/ardour/ardour/port_insert.h +++ b/libs/ardour/ardour/port_insert.h @@ -29,6 +29,7 @@ #include "ardour/types.h" class XMLNode; +class MTDM; namespace ARDOUR { @@ -64,6 +65,12 @@ class PortInsert : public IOProcessor uint32_t bit_slot() const { return bitslot; } + void start_latency_detection (); + void stop_latency_detection (); + + MTDM* mtdm () const { return _mtdm; } + void set_measured_latency (nframes_t); + private: /* disallow copy construction */ PortInsert (const PortInsert&); @@ -71,7 +78,10 @@ class PortInsert : public IOProcessor boost::shared_ptr<Delivery> _out; uint32_t bitslot; -}; + MTDM* _mtdm; + bool _latency_detect; + nframes_t _latency_flush_frames; + nframes_t _measured_latency;}; } // namespace ARDOUR diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index 98f4e2d1b7..823fb4e7f2 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -136,7 +136,7 @@ CONFIG_VARIABLE (bool, periodic_safety_backups, "periodic-safety-backups", true) CONFIG_VARIABLE (uint32_t, periodic_safety_backup_interval, "periodic-safety-backup-interval", 120) CONFIG_VARIABLE (float, automation_interval, "automation-interval", 50) CONFIG_VARIABLE (bool, sync_all_route_ordering, "sync-all-route-ordering", true) -CONFIG_VARIABLE (bool, only_copy_imported_files, "only-copy-imported-files", true) +CONFIG_VARIABLE (bool, only_copy_imported_files, "only-copy-imported-files", false) CONFIG_VARIABLE (bool, new_plugins_active, "new-plugins-active", true) CONFIG_VARIABLE (std::string, keyboard_layout, "keyboard-layout", "ansi") CONFIG_VARIABLE (std::string, default_bindings, "default-bindings", "ardour") |