Add an API to reset export-handler configs.

config_map.erase() is only called in ExportHandler::finish_timespan().

When an export fails (throw) or is aborted, the export-handler's
config remains as is and the next export will run it again.

The export-handler is global, per session and
ExportHandler::add_export_config() only ever inserts or ignores insert.

This is in preparation to fix:
1) export to invalid path -> fail, error is thrown
2) correct path -> new config is inserted in the map
3) try to export again, first runs the not-completed export from (1)
  -> constant errors.

diff --git a/libs/ardour/ardour/export_handler.h b/libs/ardour/ardour/export_handler.h
index 352451c4a30dccb39c565267c9d600d54d2388d1..d9d268af014c96515f66c15eff862e2036381805 100644 (file)
--- a/libs/ardour/ardour/export_handler.h
+++ b/libs/ardour/ardour/export_handler.h
@@ -124,6 +124,8 @@ class LIBARDOUR_API ExportHandler : public ExportElementFactory, public sigc::tr
        bool soundcloud_open_page;
        bool soundcloud_downloadable;
 
+       void reset ();
+
   private:
 
        void handle_duplicate_format_extensions();

diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc
index df74bda06532720cd16a7436264f4ff3d887ce02..3cad72c8d9905aa35c4781a3aabe88891d2339a4 100644 (file)
--- a/libs/ardour/export_handler.cc
+++ b/libs/ardour/export_handler.cc
@@ -465,6 +465,13 @@ ExportHandler::finish_timespan ()
        start_timespan ();
 }
 
+void
+ExportHandler::reset ()
+{
+       config_map.clear ();
+       graph_builder->reset ();
+}
+
 /*** CD Marker stuff ***/
 
 struct LocationSortByStart {