forward port of 7539 from 2.x

[ardour.git] / gtk2_ardour / export_channel_selector.cc

diff --git a/gtk2_ardour/export_channel_selector.cc b/gtk2_ardour/export_channel_selector.cc
index c0205fa2019d06a60700d2379ffa493b4d6f99ff..1a6c15c45b7f4fce2112a3db2fc50c3dc77c82ed 100644 (file)
--- a/gtk2_ardour/export_channel_selector.cc
+++ b/gtk2_ardour/export_channel_selector.cc
@@ -108,11 +108,11 @@ void
 PortExportChannelSelector::fill_route_list ()
 {
        channel_view.clear_routes ();
-       RouteList routes = *session->get_routes();
+       RouteList routes = *_session->get_routes();
 
        /* Add master bus and then everything else */
 
-       ARDOUR::IO* master = session->master_out()->output().get();
+       ARDOUR::IO* master = _session->master_out()->output().get();
        channel_view.add_route (master);
 
        for (RouteList::iterator it = routes.begin(); it != routes.end(); ++it) {
@@ -189,7 +189,7 @@ PortExportChannelSelector::ChannelTreeView::ChannelTreeView (uint32_t max_channe
        column->add_attribute (text_renderer->property_text(), route_cols.name);
 
        Gtk::CellRendererToggle *toggle = dynamic_cast<Gtk::CellRendererToggle *>(get_column_cell_renderer (0));
-       toggle->signal_toggled().connect (mem_fun (*this, &PortExportChannelSelector::ChannelTreeView::update_toggle_selection));
+       toggle->signal_toggled().connect (sigc::mem_fun (*this, &PortExportChannelSelector::ChannelTreeView::update_toggle_selection));
 
        static_columns = get_columns().size();
 }
@@ -435,11 +435,11 @@ PortExportChannelSelector::ChannelTreeView::update_selection_text (Glib::ustring
        update_config ();
 }
 
-RegionExportChannelSelector::RegionExportChannelSelector (ARDOUR::Session * session,
+RegionExportChannelSelector::RegionExportChannelSelector (ARDOUR::Session * _session,
                                                           ProfileManagerPtr manager,
                                                           ARDOUR::AudioRegion const & region,
                                                           ARDOUR::AudioTrack & track) :
-  ExportChannelSelector (session, manager),
+  ExportChannelSelector (_session, manager),
   region (region),
   track (track),
   region_chans (region.n_channels()),
@@ -451,11 +451,11 @@ RegionExportChannelSelector::RegionExportChannelSelector (ARDOUR::Session * sess
 {
        pack_start (vbox);
 
-       raw_button.set_label (string_compose (_("Region contents without fades (channels: %1)"), region_chans));
+       raw_button.set_label (string_compose (_("Region contents without fades nor region gain (channels: %1)"), region_chans));
        raw_button.signal_toggled ().connect (sigc::mem_fun (*this, &RegionExportChannelSelector::handle_selection));
        vbox.pack_start (raw_button);
 
-       fades_button.set_label (string_compose (_("Region contents with fades (channels: %1)"), region_chans));
+       fades_button.set_label (string_compose (_("Region contents with fades and region gain (channels: %1)"), region_chans));
        fades_button.signal_toggled ().connect (sigc::mem_fun (*this, &RegionExportChannelSelector::handle_selection));
        vbox.pack_start (fades_button);
 
@@ -485,11 +485,11 @@ RegionExportChannelSelector::handle_selection ()
        state->config->clear_channels ();
 
        if (raw_button.get_active ()) {
-               factory.reset (new RegionExportChannelFactory (session, region, track, RegionExportChannelFactory::Raw));
+               factory.reset (new RegionExportChannelFactory (_session, region, track, RegionExportChannelFactory::Raw));
        } else if (fades_button.get_active ()) {
-               factory.reset (new RegionExportChannelFactory (session, region, track, RegionExportChannelFactory::Fades));
+               factory.reset (new RegionExportChannelFactory (_session, region, track, RegionExportChannelFactory::Fades));
        } else if (processed_button.get_active ()) {
-               factory.reset (new RegionExportChannelFactory(session, region, track, RegionExportChannelFactory::Processed));
+               factory.reset (new RegionExportChannelFactory(_session, region, track, RegionExportChannelFactory::Processed));
        } else {
                CriticalSelectionChanged ();
                return;