diff options
| author | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2014-05-19 20:54:36 +0100 |
|---|---|---|
| committer | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2014-05-19 20:54:36 +0100 |
| commit | 5399425f534e2d96d07cf29f427bfa0f39d904b7 (patch) | |
| tree | b2134c0b8e624b9df89904b942909ea3a688c563 /gtk2_ardour/export_timespan_selector.cc | |
| parent | 529a31bde7d17cade6c942e11e098f2c37d984a3 (diff) | |
| parent | c464feb6aa96226856305531fedb8fba2e06689e (diff) | |
Merge branch 'export-dialog' into cairocanvas
Fix merge conflicts in:
gtk2_ardour/export_range_markers_dialog.cc
gtk2_ardour/wscript
libs/ardour/ardour/export_handler.h
libs/ardour/system_exec.cc
libs/pbd/pbd/system_exec.h
libs/pbd/system_exec.cc
Diffstat (limited to 'gtk2_ardour/export_timespan_selector.cc')
| -rw-r--r-- | gtk2_ardour/export_timespan_selector.cc | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/gtk2_ardour/export_timespan_selector.cc b/gtk2_ardour/export_timespan_selector.cc index d6ca02fe03..61d813d222 100644 --- a/gtk2_ardour/export_timespan_selector.cc +++ b/gtk2_ardour/export_timespan_selector.cc @@ -105,6 +105,9 @@ ExportTimespanSelector::ExportTimespanSelector (ARDOUR::Session * session, Profi /* Range view */ range_list = Gtk::ListStore::create (range_cols); + // order by location start times + range_list->set_sort_column(range_cols.location, Gtk::SORT_ASCENDING); + range_list->set_sort_func(range_cols.location, sigc::mem_fun(*this, &ExportTimespanSelector::location_sorter)); range_view.set_model (range_list); range_view.set_headers_visible (true); } @@ -114,6 +117,22 @@ ExportTimespanSelector::~ExportTimespanSelector () } +int +ExportTimespanSelector::location_sorter(Gtk::TreeModel::iterator a, Gtk::TreeModel::iterator b) +{ + Location *l1 = (*a)[range_cols.location]; + Location *l2 = (*b)[range_cols.location]; + const Location *ls = _session->locations()->session_range_location(); + + // always sort session range first + if (l1 == ls) + return -1; + if (l2 == ls) + return +1; + + return l1->start() - l2->start(); +} + void ExportTimespanSelector::add_range_to_selection (ARDOUR::Location const * loc) { |