X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fregion.h;h=593832343f26580959ef945353f8db62720b3dac;hb=e466ce40ad1ba591543020cb7c0aa15dbebef81e;hp=eaa23cc8f6c014d792dcc48770b8c1c91a0adcc6;hpb=0c3e840700a915fc1476cef73c591048f688f81e;p=ardour.git

diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h
index eaa23cc8f6..593832343f 100644
--- a/libs/ardour/ardour/region.h
+++ b/libs/ardour/ardour/region.h
@@ -45,9 +45,7 @@ namespace Properties {
 	extern PBD::PropertyDescriptor<bool>              muted;
 	extern PBD::PropertyDescriptor<bool>              opaque;
 	extern PBD::PropertyDescriptor<bool>              locked;
-#ifdef WITH_VIDEOTIMELINE
 	extern PBD::PropertyDescriptor<bool>              video_locked;
-#endif
 	extern PBD::PropertyDescriptor<bool>              automatic;
 	extern PBD::PropertyDescriptor<bool>              whole_file;
 	extern PBD::PropertyDescriptor<bool>              import;
@@ -166,9 +164,7 @@ class Region
 	bool opaque ()           const { return _opaque; }
 	bool locked ()           const { return _locked; }
 	bool position_locked ()  const { return _position_locked; }
-#ifdef WITH_VIDEOTIMELINE
 	bool video_locked ()     const { return _video_locked; }
-#endif
 	bool valid_transients () const { return _valid_transients; }
 	bool automatic ()        const { return _automatic; }
 	bool whole_file ()       const { return _whole_file; }
@@ -224,7 +220,7 @@ class Region
 	bool at_natural_position () const;
 	void move_to_natural_position ();
 
-	void trim_start (framepos_t new_position);
+	void move_start (frameoffset_t distance);
 	void trim_front (framepos_t new_position);
 	void trim_end (framepos_t new_position);
 	void trim_to (framepos_t position, framecnt_t length);
@@ -246,9 +242,7 @@ class Region
 	void set_automatic (bool yn);
 	void set_opaque (bool yn);
 	void set_locked (bool yn);
-#ifdef WITH_VIDEOTIMELINE
 	void set_video_locked (bool yn);
-#endif
 	void set_position_locked (bool yn);
 
 	int apply (Filter &, Progress* progress = 0);
@@ -401,9 +395,7 @@ class Region
 	PBD::Property<bool>        _muted;
 	PBD::Property<bool>        _opaque;
 	PBD::Property<bool>        _locked;
-#ifdef WITH_VIDEOTIMELINE
 	PBD::Property<bool>        _video_locked;
-#endif
 	PBD::Property<bool>        _automatic;
 	PBD::Property<bool>        _whole_file;
 	PBD::Property<bool>        _import;