diff options
| author | Carl Hetherington <carl@carlh.net> | 2012-04-14 22:04:51 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2012-04-14 22:04:51 +0000 |
| commit | cc7d4db5fe9132c38b919ab073b91d442abad9b6 (patch) | |
| tree | 0b00a508bf8a1d5e1a7fc441770a78b5d24a9c52 /libs/ardour/ardour/route.h | |
| parent | c8228ba9853b4f0ee452343b1f1e361c584236cf (diff) | |
Fix a few framecnt / framepos type confusions.
git-svn-id: svn://localhost/ardour2/branches/3.0@11975 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/route.h')
| -rw-r--r-- | libs/ardour/ardour/route.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index 42b74b50bc..89a0cac214 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -132,7 +132,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember, /* end of vfunc-based API */ - void shift (framepos_t, framepos_t); + void shift (framepos_t, framecnt_t); void set_gain (gain_t val, void *src); void inc_gain (gain_t delta, void *src); @@ -435,7 +435,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember, virtual void set_block_size (pframes_t nframes); protected: - virtual framecnt_t check_initial_delay (framecnt_t nframes, framecnt_t&) { return nframes; } + virtual framecnt_t check_initial_delay (framecnt_t nframes, framepos_t&) { return nframes; } void passthru (framepos_t start_frame, framepos_t end_frame, pframes_t nframes, int declick); |