summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorNikolaus Gullotta <nik@harrisonconsoles.com>2019-08-28 14:19:26 -0500
committerNikolaus Gullotta <nik@harrisonconsoles.com>2019-08-28 14:19:26 -0500
commitf127eebff00706d080c730332ba48bf6f7d726b6 (patch)
treec11bd4f03b3f8d6ab20a513e9f662a049ad44b16 /gtk2_ardour
parent96f55e8184af064bb74a6361644b223e6471236e (diff)
time span column should actually sort by location start time
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/export_timespan_selector.cc12
-rw-r--r--gtk2_ardour/export_timespan_selector.h3
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<std::string> date;
Gtk::TreeModelColumn<time_t> timestamp;
Gtk::TreeModelColumn<ARDOUR::samplecnt_t> length_actual;
+ Gtk::TreeModelColumn<ARDOUR::samplecnt_t> 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;