cleanup confused mess related to jack_port_type_get_buffer_size()

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

diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc
index 9ffb7c17789915170f9b9ae2613b63e260402e2a..f34e8c326b498f5144316e10b47c59a3ef3ab9f0 100644 (file)
--- a/libs/ardour/export_handler.cc
+++ b/libs/ardour/export_handler.cc
@@ -56,46 +56,46 @@ ExportElementFactory::~ExportElementFactory ()
 
 }
 
-ExportElementFactory::TimespanPtr
+ExportTimespanPtr
 ExportElementFactory::add_timespan ()
 {
-       return TimespanPtr (new ExportTimespan (session.get_export_status(), session.frame_rate()));
+       return ExportTimespanPtr (new ExportTimespan (session.get_export_status(), session.frame_rate()));
 }
 
-ExportElementFactory::ChannelConfigPtr
+ExportChannelConfigPtr
 ExportElementFactory::add_channel_config ()
 {
-       return ChannelConfigPtr (new ExportChannelConfiguration (session));
+       return ExportChannelConfigPtr (new ExportChannelConfiguration (session));
 }
 
-ExportElementFactory::FormatPtr
+ExportFormatSpecPtr
 ExportElementFactory::add_format ()
 {
-       return FormatPtr (new ExportFormatSpecification (session));
+       return ExportFormatSpecPtr (new ExportFormatSpecification (session));
 }
 
-ExportElementFactory::FormatPtr
+ExportFormatSpecPtr
 ExportElementFactory::add_format (XMLNode const & state)
 {
-       return FormatPtr (new ExportFormatSpecification (session, state));
+       return ExportFormatSpecPtr (new ExportFormatSpecification (session, state));
 }
 
-ExportElementFactory::FormatPtr
-ExportElementFactory::add_format_copy (FormatPtr other)
+ExportFormatSpecPtr
+ExportElementFactory::add_format_copy (ExportFormatSpecPtr other)
 {
-       return FormatPtr (new ExportFormatSpecification (*other));
+       return ExportFormatSpecPtr (new ExportFormatSpecification (*other));
 }
 
-ExportElementFactory::FilenamePtr
+ExportFilenamePtr
 ExportElementFactory::add_filename ()
 {
-       return FilenamePtr (new ExportFilename (session));
+       return ExportFilenamePtr (new ExportFilename (session));
 }
 
-ExportElementFactory::FilenamePtr
-ExportElementFactory::add_filename_copy (FilenamePtr other)
+ExportFilenamePtr
+ExportElementFactory::add_filename_copy (ExportFilenamePtr other)
 {
-       return FilenamePtr (new ExportFilename (*other));
+       return ExportFilenamePtr (new ExportFilename (*other));
 }
 
 /*** ExportHandler ***/
@@ -118,12 +118,14 @@ ExportHandler::~ExportHandler ()
 }
 
 bool
-ExportHandler::add_export_config (TimespanPtr timespan, ChannelConfigPtr channel_config, FormatPtr format, FilenamePtr filename, boost::shared_ptr<AudioGrapher::BroadcastInfo> broadcast_info)
+ExportHandler::add_export_config (ExportTimespanPtr timespan, ExportChannelConfigPtr channel_config,
+                                  ExportFormatSpecPtr format, ExportFilenamePtr filename,
+                                  BroadcastInfoPtr broadcast_info)
 {
        FileSpec spec (channel_config, format, filename, broadcast_info);
        ConfigPair pair (timespan, spec);
        config_map.insert (pair);
-       
+
        return true;
 }
 
@@ -133,9 +135,10 @@ ExportHandler::do_export (bool rt)
        /* Count timespans */
 
        export_status->init();
-       std::set<TimespanPtr> timespan_set;
+       std::set<ExportTimespanPtr> timespan_set;
        for (ConfigMap::iterator it = config_map.begin(); it != config_map.end(); ++it) {
                timespan_set.insert (it->first);
+               export_status->total_frames += it->first->get_length();
        }
        export_status->total_timespans = timespan_set.size();
 
@@ -162,6 +165,7 @@ ExportHandler::start_timespan ()
 
        timespan_bounds = config_map.equal_range (current_timespan);
        graph_builder->reset ();
+       graph_builder->set_current_timespan (current_timespan);
        for (ConfigMap::iterator it = timespan_bounds.first; it != timespan_bounds.second; ++it) {
                // Filenames can be shared across timespans
                FileSpec & spec = it->second;
@@ -178,7 +182,7 @@ ExportHandler::start_timespan ()
 }
 
 int
-ExportHandler::process (nframes_t frames)
+ExportHandler::process (framecnt_t frames)
 {
        if (!export_status->running) {
                return 0;
@@ -190,14 +194,13 @@ ExportHandler::process (nframes_t frames)
 }
 
 int
-ExportHandler::process_timespan (nframes_t frames)
+ExportHandler::process_timespan (framecnt_t frames)
 {
        /* update position */
 
-       nframes_t frames_to_read = 0;
-       framepos_t const start = current_timespan->get_start();
+       framecnt_t frames_to_read = 0;
        framepos_t const end = current_timespan->get_end();
-       
+
        bool const last_cycle = (process_position + frames >= end);
 
        if (last_cycle) {
@@ -209,7 +212,8 @@ ExportHandler::process_timespan (nframes_t frames)
        }
 
        process_position += frames_to_read;
-       export_status->progress = (float) (process_position - start) / (end - start);
+       export_status->processed_frames += frames_to_read;
+       export_status->progress = (float) export_status->processed_frames / export_status->total_frames;
 
        /* Do actual processing */
 
@@ -221,8 +225,11 @@ ExportHandler::process_normalize ()
 {
        if (graph_builder->process_normalize ()) {
                finish_timespan ();
+               export_status->normalizing = false;
+       } else {
+               export_status->normalizing = true;
        }
-       
+
        return 0;
 }
 
@@ -245,7 +252,8 @@ struct LocationSortByStart {
 };
 
 void
-ExportHandler::export_cd_marker_file (TimespanPtr timespan, FormatPtr file_format, std::string filename, CDMarkerFormat format)
+ExportHandler::export_cd_marker_file (ExportTimespanPtr timespan, ExportFormatSpecPtr file_format,
+                                      std::string filename, CDMarkerFormat format)
 {
        string filepath;
        string basename = Glib::path_get_basename(filename);
@@ -538,7 +546,7 @@ void
 ExportHandler::frames_to_cd_frames_string (char* buf, framepos_t when)
 {
        framecnt_t remainder;
-       nframes_t fr = session.nominal_frame_rate();
+       framecnt_t fr = session.nominal_frame_rate();
        int mins, secs, frames;
 
        mins = when / (60 * fr);