first vaguely working version using PresentationInfo

remote control ID and "order keys" have been removed.
This commit is contained in:
Paul Davis 2016-05-16 07:30:28 -04:00
parent bae9474e9f
commit e0ff70cf86
65 changed files with 1193 additions and 1076 deletions

View file

@ -18,8 +18,6 @@
*/
#include "export_channel_selector.h"
#include <algorithm>
#include "pbd/convert.h"
@ -33,6 +31,9 @@
#include <sstream>
#include "export_channel_selector.h"
#include "route_sorter.h"
#include "i18n.h"
using namespace std;
@ -40,12 +41,6 @@ using namespace Glib;
using namespace ARDOUR;
using namespace PBD;
struct EditorOrderRouteSorter {
bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
return a->order_key () < b->order_key ();
}
};
PortExportChannelSelector::PortExportChannelSelector (ARDOUR::Session * session, ProfileManagerPtr manager) :
ExportChannelSelector (session, manager),
channels_label (_("Channels:"), Gtk::ALIGN_LEFT),
@ -126,7 +121,7 @@ PortExportChannelSelector::fill_route_list ()
channel_view.add_route (master);
}
routes.sort (EditorOrderRouteSorter ());
routes.sort (PresentationInfoSorter ());
for (RouteList::iterator it = routes.begin(); it != routes.end(); ++it) {
if ((*it)->is_master () || (*it)->is_monitor ()) {
@ -700,7 +695,7 @@ TrackExportChannelSelector::add_track (boost::shared_ptr<Route> route)
row[track_cols.selected] = false;
row[track_cols.label] = route->name();
row[track_cols.route] = route;
row[track_cols.order_key] = route->order_key();
row[track_cols.order_key] = route->presentation_info().global_order();
}
void