summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/pi_controller.h4
-rw-r--r--libs/ardour/ardour/session_object.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/ardour/pi_controller.h b/libs/ardour/ardour/pi_controller.h
index c5b7c154ac..250c943de9 100644
--- a/libs/ardour/ardour/pi_controller.h
+++ b/libs/ardour/ardour/pi_controller.h
@@ -33,7 +33,7 @@ class PIController {
out_of_bounds ();
}
- double get_ratio (int fill_level);
+ double get_ratio (int fill_level, int period_size);
void out_of_bounds();
public:
@@ -60,7 +60,7 @@ class PIChaser {
PIChaser();
~PIChaser();
- double get_ratio( nframes64_t chasetime_measured, nframes64_t chasetime, nframes64_t slavetime_measured, nframes64_t slavetime, bool in_control );
+ double get_ratio( nframes64_t chasetime_measured, nframes64_t chasetime, nframes64_t slavetime_measured, nframes64_t slavetime, bool in_control, int period_size );
void reset();
nframes64_t want_locate() { return want_locate_val; }
diff --git a/libs/ardour/ardour/session_object.h b/libs/ardour/ardour/session_object.h
index cf9ccbb3a7..069badcb6a 100644
--- a/libs/ardour/ardour/session_object.h
+++ b/libs/ardour/ardour/session_object.h
@@ -41,7 +41,7 @@ class SessionObject : public SessionHandleRef, public PBD::StatefulDestructible
public:
SessionObject (Session& session, const std::string& name)
: SessionHandleRef (session)
- , _name (X_("name"), PBD::Change (0), "")
+ , _name (X_("name"), PBD::Change (0), name)
{
add_state (_name);
}