No-op; some comments, remove some unused stuff, minor tidying up.

git-svn-id: svn://localhost/ardour2/branches/3.0@12616 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 8 insertions, 15 deletions

diff --git a/libs/ardour/ardour/export_handler.h b/libs/ardour/ardour/export_handler.h
index eb8ffc2333..235219e2f5 100644
--- a/libs/ardour/ardour/export_handler.h
+++ b/libs/ardour/ardour/export_handler.h
@@ -81,23 +81,12 @@ class ExportHandler : public ExportElementFactory
 			{}
 
 		ExportChannelConfigPtr channel_config;
-		ExportFormatSpecPtr        format;
+		ExportFormatSpecPtr    format;
 		ExportFilenamePtr      filename;
 		BroadcastInfoPtr       broadcast_info;
 	};
 
   private:
-
-	/* Stuff for export configs
-	 * The multimap maps timespans to file specifications
-	 */
-
-	typedef std::pair<ExportTimespanPtr, FileSpec> ConfigPair;
-	typedef std::multimap<ExportTimespanPtr, FileSpec> ConfigMap;
-
-	typedef boost::shared_ptr<ExportGraphBuilder> GraphBuilderPtr;
-
-  private:
 	/* Session::get_export_handler() should be used to obtain an export handler
 	 * This ensures that it doesn't go out of scope before finalize_audio_export is called
 	 */
@@ -111,7 +100,7 @@ class ExportHandler : public ExportElementFactory
 	bool add_export_config (ExportTimespanPtr timespan, ExportChannelConfigPtr channel_config,
 	                        ExportFormatSpecPtr format, ExportFilenamePtr filename,
 	                        BroadcastInfoPtr broadcast_info);
-	void do_export (bool rt = false);
+	void do_export ();
 
 	std::string get_cd_marker_filename(std::string filename, CDMarkerFormat format);
 
@@ -120,11 +109,15 @@ class ExportHandler : public ExportElementFactory
 	int process (framecnt_t frames);
 
 	Session &          session;
-	GraphBuilderPtr    graph_builder;
+	boost::shared_ptr<ExportGraphBuilder> graph_builder;
 	ExportStatusPtr    export_status;
+
+	/* The timespan and corresponding file specifications that we are exporting;
+	   there can be multiple FileSpecs for each ExportTimespan.
+	*/
+	typedef std::multimap<ExportTimespanPtr, FileSpec> ConfigMap;
 	ConfigMap          config_map;
 
-	bool               realtime;
 	bool               normalizing;
 
 	/* Timespan management */