diff options
| author | Robin Gareus <robin@gareus.org> | 2013-03-27 18:45:08 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-03-27 18:45:08 +0100 |
| commit | 78aa7a13fd5e5abac70637ce6641b7d2e73dd541 (patch) | |
| tree | dc630319a8844751197f701e0b421bf7c8b71323 /gtk2_ardour/video_timeline.cc | |
| parent | 7697ff6b7c5115cf6c76860856a59643c8e7cd30 (diff) | |
use C++ std function for max()
Diffstat (limited to 'gtk2_ardour/video_timeline.cc')
| -rw-r--r-- | gtk2_ardour/video_timeline.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc index 398859c1a1..f751866ba7 100644 --- a/gtk2_ardour/video_timeline.cc +++ b/gtk2_ardour/video_timeline.cc @@ -19,6 +19,7 @@ */ #ifdef WITH_VIDEOTIMELINE +#include <algorithm> #include <sigc++/bind.h> #include "ardour/tempo.h" @@ -46,10 +47,6 @@ using namespace ARDOUR; using namespace PBD; using namespace Timecode; -#ifndef MAX -#define MAX(a, b) (((a) > (b)) ? (a) : (b)) -#endif - VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Group *vbg, int initial_height) : editor (ed) , videotl_bar_group(vbg) @@ -519,8 +516,8 @@ VideoTimeLine::video_file_info (std::string filename, bool local) flush_local_cache (); _session->maybe_update_session_range( - MAX(get_offset(), 0), - MAX(get_offset() + get_duration(), 0) + std::max(get_offset(), (ARDOUR::frameoffset_t) 0), + std::max(get_offset() + get_duration(), (ARDOUR::frameoffset_t) 0) ); if (found_xjadeo() && local_file) { |