Remove all use of nframes_t.

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

diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc
index a9335add37c362e7c5e5bbea4cad457a84e8570e..59a023c4d8483074d86aa04779d9ee22f1c6a327 100644 (file)
--- a/libs/ardour/export_handler.cc
+++ b/libs/ardour/export_handler.cc
@@ -35,6 +35,8 @@
 #include "ardour/export_filename.h"
 #include "ardour/export_failed.h"
 
+#include "i18n.h"
+
 using namespace std;
 using namespace PBD;
 
@@ -104,7 +106,9 @@ ExportHandler::ExportHandler (Session & session)
   , graph_builder (new ExportGraphBuilder (session))
   , export_status (session.get_export_status ())
   , realtime (false)
-
+  , normalizing (false)
+  , cue_tracknum (0)
+  , cue_indexnum (0)
 {
 }
 
@@ -114,9 +118,9 @@ ExportHandler::~ExportHandler ()
 }
 
 bool
-ExportHandler::add_export_config (TimespanPtr timespan, ChannelConfigPtr channel_config, FormatPtr format, FilenamePtr filename)
+ExportHandler::add_export_config (TimespanPtr timespan, ChannelConfigPtr channel_config, FormatPtr format, FilenamePtr filename, boost::shared_ptr<AudioGrapher::BroadcastInfo> broadcast_info)
 {
-       FileSpec spec (channel_config, format, filename);
+       FileSpec spec (channel_config, format, filename, broadcast_info);
        ConfigPair pair (timespan, spec);
        config_map.insert (pair);
        
@@ -174,7 +178,7 @@ ExportHandler::start_timespan ()
 }
 
 int
-ExportHandler::process (nframes_t frames)
+ExportHandler::process (framecnt_t frames)
 {
        if (!export_status->running) {
                return 0;
@@ -186,13 +190,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;
-       sframes_t const start = current_timespan->get_start();
-       sframes_t const end = current_timespan->get_end();
+       framecnt_t frames_to_read = 0;
+       framepos_t const start = current_timespan->get_start();
+       framepos_t const end = current_timespan->get_end();
        
        bool const last_cycle = (process_position + frames >= end);
 
@@ -288,7 +292,7 @@ ExportHandler::export_cd_marker_file (TimespanPtr timespan, FormatPtr file_forma
        Locations::LocationList temp;
 
        for (i = locations.begin(); i != locations.end(); ++i) {
-               if ((*i)->start() >= timespan->get_start() && (*i)->end() <= timespan->get_end() && (*i)->is_cd_marker() && !(*i)->is_end()) {
+               if ((*i)->start() >= timespan->get_start() && (*i)->end() <= timespan->get_end() && (*i)->is_cd_marker() && !(*i)->is_session_range()) {
                        temp.push_back (*i);
                }
        }
@@ -304,7 +308,7 @@ ExportHandler::export_cd_marker_file (TimespanPtr timespan, FormatPtr file_forma
 
        /* Start actual marker stuff */
 
-       sframes_t last_end_time = timespan->get_start(), last_start_time = timespan->get_start();
+       framepos_t last_end_time = timespan->get_start(), last_start_time = timespan->get_start();
        status.track_position = last_start_time - timespan->get_start();
 
        for (i = temp.begin(); i != temp.end(); ++i) {
@@ -360,7 +364,7 @@ ExportHandler::export_cd_marker_file (TimespanPtr timespan, FormatPtr file_forma
 void
 ExportHandler::write_cue_header (CDMarkerStatus & status)
 {
-       Glib::ustring title = status.timespan->name().compare ("Session") ? status.timespan->name() : (Glib::ustring) session.name();
+       string title = status.timespan->name().compare ("Session") ? status.timespan->name() : (string) session.name();
 
        status.out << "REM Cue file generated by Ardour" << endl;
        status.out << "TITLE \"" << title << "\"" << endl;
@@ -384,7 +388,7 @@ ExportHandler::write_cue_header (CDMarkerStatus & status)
        status.out << "FILE \"" << Glib::path_get_basename(status.filename) << "\" ";
        if (!status.format->format_name().compare ("WAV")) {
                status.out  << "WAVE";
-       } else if (status.format->format_name() == ExportFormatBase::F_RAW &&
+       } else if (status.format->format_id() == ExportFormatBase::F_RAW &&
                   status.format->sample_format() == ExportFormatBase::SF_16 &&
                   status.format->sample_rate() == ExportFormatBase::SR_44_1) {
                // Format is RAW 16bit 44.1kHz
@@ -403,7 +407,7 @@ ExportHandler::write_cue_header (CDMarkerStatus & status)
 void
 ExportHandler::write_toc_header (CDMarkerStatus & status)
 {
-       Glib::ustring title = status.timespan->name().compare ("Session") ? status.timespan->name() : (Glib::ustring) session.name();
+       string title = status.timespan->name().compare ("Session") ? status.timespan->name() : (string) session.name();
 
        status.out << "CD_DA" << endl;
        status.out << "CD_TEXT {" << endl << "  LANGUAGE_MAP {" << endl << "    0 : EN" << endl << "  }" << endl;
@@ -531,10 +535,10 @@ ExportHandler::write_index_info_toc (CDMarkerStatus & status)
 }
 
 void
-ExportHandler::frames_to_cd_frames_string (char* buf, sframes_t when)
+ExportHandler::frames_to_cd_frames_string (char* buf, framepos_t when)
 {
-       sframes_t remainder;
-       nframes_t fr = session.nominal_frame_rate();
+       framecnt_t remainder;
+       framecnt_t fr = session.nominal_frame_rate();
        int mins, secs, frames;
 
        mins = when / (60 * fr);