summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2012-06-08 21:06:49 +0000
committerCarl Hetherington <carl@carlh.net>2012-06-08 21:06:49 +0000
commit0a4b746317153c96fb4e89b6ae8c9292ca30ba11 (patch)
tree9855f9867e373094618a1c843e9fdf097aa45d8f /libs/ardour/ardour
parentaba03a3aa6faaf95645996a26c188d3d731ffe42 (diff)
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
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/export_handler.h23
-rw-r--r--libs/ardour/ardour/session.h2
2 files changed, 9 insertions, 16 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 */
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index d31d1f9339..36a0733a3d 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -536,7 +536,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
boost::shared_ptr<ExportHandler> get_export_handler ();
boost::shared_ptr<ExportStatus> get_export_status ();
- int start_audio_export (framepos_t position, bool realtime);
+ int start_audio_export (framepos_t position);
PBD::Signal1<int, framecnt_t> ProcessExport;
static PBD::Signal2<void,std::string, std::string> Exported;