fix PresentationInfo::flag_match() to match type bits

[ardour.git] / libs / ardour / export_profile_manager.cc

diff --git a/libs/ardour/export_profile_manager.cc b/libs/ardour/export_profile_manager.cc
index f924ed17e5a45021a023dcaa4c748d2c0575094c..94099faa262aa367d39b1a89da541e5902e4feba 100644 (file)
--- a/libs/ardour/export_profile_manager.cc
+++ b/libs/ardour/export_profile_manager.cc
@@ -58,7 +58,7 @@ namespace ARDOUR
 {
 
 ExportProfileManager::ExportProfileManager (Session & s, ExportType type)
-  : type(type)
+  : _type(type)
   , handler (s.get_export_handler())
   , session (s)
 
@@ -162,7 +162,7 @@ ExportProfileManager::prepare_for_export ()
                        }
 
                        // ...and each channel config
-                       filename->include_channel_config = (type == StemExport) ||
+                       filename->include_channel_config = (_type == StemExport) ||
                                                           (channel_configs.size() > 1);
                        for(ChannelConfigStateList::iterator cc_it = channel_configs.begin(); cc_it != channel_configs.end(); ++cc_it) {
                                handler->add_export_config (*ts_it, (*cc_it)->config, (*format_it)->format, filename, b);
@@ -589,9 +589,9 @@ ExportProfileManager::save_format_to_disk (ExportFormatSpecPtr format)
        string new_name = format->name();
        new_name += export_format_suffix;
 
-        /* make sure its legal for the filesystem */
+       /* make sure its legal for the filesystem */
 
-        new_name = legalize_for_path (new_name);
+       new_name = legalize_for_path (new_name);
 
        std::string new_path = Glib::build_filename (export_config_dir, new_name);
 
@@ -633,7 +633,6 @@ ExportProfileManager::save_format_to_disk (ExportFormatSpecPtr format)
                tree.write();
        }
 
-       FormatListChanged ();
        return new_path;
 }
 
@@ -878,10 +877,9 @@ ExportProfileManager::get_warnings ()
 
 void
 ExportProfileManager::check_config (boost::shared_ptr<Warnings> warnings,
-                                   TimespanStatePtr timespan_state,
-                                   ChannelConfigStatePtr channel_config_state,
-                                   FormatStatePtr format_state,
-                                   FilenameStatePtr filename_state)
+                                    TimespanStatePtr timespan_state,
+                                    ChannelConfigStatePtr channel_config_state,
+                                    FormatStatePtr format_state, FilenameStatePtr filename_state)
 {
        TimespanListPtr timespans = timespan_state->timespans;
        ExportChannelConfigPtr channel_config = channel_config_state->config;