Give VSTPluginUI its own header.

[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..65d37adc2d2cd3238ea11e3a636df618a1177257 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();
 }
@@ -219,11 +219,11 @@ PortExportChannelSelector::ChannelTreeView::set_config (ChannelConfigPtr c)
                        Glib::RefPtr<Gtk::ListStore> port_list = r_it->get_value (route_cols.port_list_col);
                        std::set<AudioPort *> route_ports;
                        std::set<AudioPort *> intersection;
-                       std::map<AudioPort *, ustring> port_labels;
+                       std::map<AudioPort *, string> port_labels;
 
                        for (Gtk::ListStore::Children::const_iterator p_it = port_list->children().begin(); p_it != port_list->children().end(); ++p_it) {
                                route_ports.insert ((*p_it)->get_value (route_cols.port_cols.port));
-                               port_labels.insert (std::pair<AudioPort*, ustring> ((*p_it)->get_value (route_cols.port_cols.port),
+                               port_labels.insert (std::pair<AudioPort*, string> ((*p_it)->get_value (route_cols.port_cols.port),
                                                                                    (*p_it)->get_value (route_cols.port_cols.label)));
                        }
 
@@ -244,13 +244,13 @@ PortExportChannelSelector::ChannelTreeView::set_config (ChannelConfigPtr c)
 
                                for (uint32_t chn = 1; chn < i; ++chn) {
                                        r_it->set_value (route_cols.get_channel (chn).port, (AudioPort *) 0);
-                                       r_it->set_value (route_cols.get_channel (chn).label, ustring ("(none)"));
+                                       r_it->set_value (route_cols.get_channel (chn).label, string ("(none)"));
                                }
                        }
 
                        AudioPort * port = *intersection.begin();
-                       std::map<AudioPort *, ustring>::iterator label_it = port_labels.find (port);
-                       ustring label = label_it != port_labels.end() ? label_it->second : "error";
+                       std::map<AudioPort *, string>::iterator label_it = port_labels.find (port);
+                       string label = label_it != port_labels.end() ? label_it->second : "error";
 
                        r_it->set_value (route_cols.get_channel (i).port, port);
                        r_it->set_value (route_cols.get_channel (i).label, label);
@@ -328,7 +328,7 @@ PortExportChannelSelector::ChannelTreeView::set_channel_count (uint32_t channels
                /* put data into view */
 
                for (Gtk::ListStore::Children::iterator it = route_list->children().begin(); it != route_list->children().end(); ++it) {
-                       Glib::ustring label = it->get_value(route_cols.selected) ? "(none)" : "";
+                       std::string label = it->get_value(route_cols.selected) ? "(none)" : "";
                        it->set_value (route_cols.get_channel (n_channels).label, label);
                        it->set_value (route_cols.get_channel (n_channels).port, (AudioPort *) 0);
                }
@@ -384,7 +384,7 @@ PortExportChannelSelector::ChannelTreeView::update_config ()
 }
 
 void
-PortExportChannelSelector::ChannelTreeView::update_toggle_selection (Glib::ustring const & path)
+PortExportChannelSelector::ChannelTreeView::update_toggle_selection (std::string const & path)
 {
        Gtk::TreeModel::iterator iter = get_model ()->get_iter (path);
        bool selected = iter->get_value (route_cols.selected);
@@ -392,11 +392,11 @@ PortExportChannelSelector::ChannelTreeView::update_toggle_selection (Glib::ustri
        for (uint32_t i = 1; i <= n_channels; ++i) {
 
                if (!selected) {
-                       iter->set_value (route_cols.get_channel (i).label, Glib::ustring (""));
+                       iter->set_value (route_cols.get_channel (i).label, std::string (""));
                        continue;
                }
 
-               iter->set_value (route_cols.get_channel (i).label, Glib::ustring("(none)"));
+               iter->set_value (route_cols.get_channel (i).label, std::string("(none)"));
                iter->set_value (route_cols.get_channel (i).port, (AudioPort *) 0);
 
                Glib::RefPtr<Gtk::ListStore> port_list = iter->get_value (route_cols.port_list_col);
@@ -405,7 +405,7 @@ PortExportChannelSelector::ChannelTreeView::update_toggle_selection (Glib::ustri
 
                for (port_it = port_list->children().begin(); port_it != port_list->children().end(); ++port_it) {
                        if (port_number == i) {
-                               iter->set_value (route_cols.get_channel (i).label, (Glib::ustring) (*port_it)->get_value (route_cols.port_cols.label));
+                               iter->set_value (route_cols.get_channel (i).label, (std::string) (*port_it)->get_value (route_cols.port_cols.label));
                                iter->set_value (route_cols.get_channel (i).port, (AudioPort *) (*port_it)->get_value (route_cols.port_cols.port));
                        }
 
@@ -417,7 +417,7 @@ PortExportChannelSelector::ChannelTreeView::update_toggle_selection (Glib::ustri
 }
 
 void
-PortExportChannelSelector::ChannelTreeView::update_selection_text (Glib::ustring const & path, Glib::ustring const & new_text, uint32_t channel)
+PortExportChannelSelector::ChannelTreeView::update_selection_text (std::string const & path, std::string const & new_text, uint32_t channel)
 {
        Gtk::TreeModel::iterator iter = get_model ()->get_iter (path);
        iter->set_value (route_cols.get_channel (channel).label, new_text);
@@ -426,7 +426,7 @@ PortExportChannelSelector::ChannelTreeView::update_selection_text (Glib::ustring
        Gtk::ListStore::Children::iterator port_it;
 
        for (port_it = port_list->children().begin(); port_it != port_list->children().end(); ++port_it) {
-               Glib::ustring label = port_it->get_value (route_cols.port_cols.label);
+               std::string label = port_it->get_value (route_cols.port_cols.label);
                if (label == new_text) {
                        iter->set_value (route_cols.get_channel (channel).port, (AudioPort *) (*port_it)[route_cols.port_cols.port]);
                }
@@ -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;