diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-25 15:35:31 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-25 15:35:31 +0000 |
| commit | 1fde1118c78309dee4c2e76bb2b39147dc9b7f2a (patch) | |
| tree | f941d46483995162359f281b6be155695cd6be52 /src/wx/timeline.h | |
| parent | 2e9855c34f861ed59affb0cfc021f78ea5417808 (diff) | |
Hand-apply 39e9f0794349f44caf440db9568b8b15eb900381 from master; snap improvements in timeline.
Diffstat (limited to 'src/wx/timeline.h')
| -rw-r--r-- | src/wx/timeline.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wx/timeline.h b/src/wx/timeline.h index 82d10afde..7595f1067 100644 --- a/src/wx/timeline.h +++ b/src/wx/timeline.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -91,6 +91,7 @@ private: boost::shared_ptr<View> event_to_view (wxMouseEvent &); ContentViewList selected_views () const; ContentList selected_content () const; + void maybe_snap (DCPTime a, DCPTime b, boost::optional<DCPTime>& nearest_distance) const; ContentPanel* _content_panel; boost::weak_ptr<Film> _film; |