From f127eebff00706d080c730332ba48bf6f7d726b6 Mon Sep 17 00:00:00 2001 From: Nikolaus Gullotta Date: Wed, 28 Aug 2019 14:19:26 -0500 Subject: [PATCH] time span column should actually sort by location start time --- gtk2_ardour/export_timespan_selector.cc | 12 ++++++++---- gtk2_ardour/export_timespan_selector.h | 3 ++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/export_timespan_selector.cc b/gtk2_ardour/export_timespan_selector.cc index 185e250917..ef2dcd0a2a 100644 --- a/gtk2_ardour/export_timespan_selector.cc +++ b/gtk2_ardour/export_timespan_selector.cc @@ -415,9 +415,8 @@ ExportTimespanSelectorSingle::ExportTimespanSelectorSingle (ARDOUR::Session * se range_col->set_sort_column(4); // set sort name Gtk::TreeViewColumn* time_span_col = range_view.get_column(3); // time span column - time_span_col->set_sort_column(8); //set sort length_actual + time_span_col->set_sort_column(9); //set sort start - range_list->set_sort_column(5, Gtk::SORT_DESCENDING); Gtk::TreeViewColumn* date_col = range_view.get_column(5); // date column date_col->set_sort_column(7); // set sort as the timestamp @@ -465,6 +464,9 @@ ExportTimespanSelectorSingle::fill_range_list () //the actual samplecnt_t for sorting row[range_cols.length_actual] = (*it)->length(); + //start samplecnt_t for sorting + row[range_cols.start] = (*it)->start(); + Glib::DateTime gdt(Glib::DateTime::create_now_local ((*it)->timestamp())); row[range_cols.timestamp] = (*it)->timestamp(); row[range_cols.date] = gdt.format ("%F %H:%M");; @@ -527,9 +529,8 @@ ExportTimespanSelectorMultiple::ExportTimespanSelectorMultiple (ARDOUR::Session range_col->set_sort_column(4); // set sort name Gtk::TreeViewColumn* time_span_col = range_view.get_column(3); // time span column - time_span_col->set_sort_column(8); //set sort length_actual + time_span_col->set_sort_column(9); //set sort start - range_list->set_sort_column(5, Gtk::SORT_DESCENDING); Gtk::TreeViewColumn* date_col = range_view.get_column(5); // date column date_col->set_sort_column(7); // set sort as the timestamp @@ -568,6 +569,9 @@ ExportTimespanSelectorMultiple::fill_range_list () //the actual samplecnt_t for sorting row[range_cols.length_actual] = (*it)->length(); + //start samplecnt_t for sorting + row[range_cols.start] = (*it)->start(); + Glib::DateTime gdt(Glib::DateTime::create_now_local ((*it)->timestamp())); row[range_cols.timestamp] = (*it)->timestamp(); row[range_cols.date] = gdt.format ("%F %H:%M");; diff --git a/gtk2_ardour/export_timespan_selector.h b/gtk2_ardour/export_timespan_selector.h index eb797994e2..2a392be06a 100644 --- a/gtk2_ardour/export_timespan_selector.h +++ b/gtk2_ardour/export_timespan_selector.h @@ -144,8 +144,9 @@ protected: Gtk::TreeModelColumn date; Gtk::TreeModelColumn timestamp; Gtk::TreeModelColumn length_actual; + Gtk::TreeModelColumn start; - RangeCols () { add (location); add(label); add(selected); add(realtime); add(name); add(length); add(date); add(timestamp); add(length_actual);} + RangeCols () { add (location); add(label); add(selected); add(realtime); add(name); add(length); add(date); add(timestamp); add(length_actual); add(start);} }; RangeCols range_cols; -- 2.30.2