A few type fixes.

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

diff --git a/libs/ardour/ardour/export_handler.h b/libs/ardour/ardour/export_handler.h
index ded6ed5b022d6f9898652a3291d6fcbf2887af92..f826e09bf5f8e48220313e38da8cceea130b900a 100644 (file)
--- a/libs/ardour/ardour/export_handler.h
+++ b/libs/ardour/ardour/export_handler.h
@@ -27,10 +27,14 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "ardour/session.h"
 #include "ardour/ardour.h"
+#include "ardour/session.h"
 #include "ardour/types.h"
 
+namespace AudioGrapher {
+       class BroadcastInfo;
+}
+
 namespace ARDOUR
 {
 
@@ -38,11 +42,12 @@ class ExportTimespan;
 class ExportChannelConfiguration;
 class ExportFormatSpecification;
 class ExportFilename;
-class ExportProcessor;
+class ExportGraphBuilder;
+
 
 class ExportElementFactory
 {
-  protected:
+  public:
        typedef boost::shared_ptr<ExportTimespan> TimespanPtr;
        typedef boost::shared_ptr<ExportChannelConfiguration> ChannelConfigPtr;
        typedef boost::shared_ptr<ExportFormatSpecification> FormatPtr;
@@ -70,29 +75,32 @@ class ExportElementFactory
 
 class ExportHandler : public ExportElementFactory
 {
-  private:
-
-       /* Stuff for export configs
-        * The multimap maps timespans to file specifications
-        */
-
+  public:
        struct FileSpec {
-
-               FileSpec (ChannelConfigPtr channel_config, FormatPtr format, FilenamePtr filename) :
-                 channel_config (channel_config),
-                 format (format),
-                 filename (filename)
-                 {}
+               FileSpec() {}
+               FileSpec (ChannelConfigPtr channel_config, FormatPtr format, FilenamePtr filename, boost::shared_ptr<AudioGrapher::BroadcastInfo> broadcast_info)
+                 : channel_config (channel_config)
+                 , format (format)
+                 , filename (filename)
+                 , broadcast_info (broadcast_info)
+                       {}
 
                ChannelConfigPtr channel_config;
                FormatPtr        format;
                FilenamePtr      filename;
+               boost::shared_ptr<AudioGrapher::BroadcastInfo> broadcast_info;
        };
+       
+  private:
+
+       /* Stuff for export configs
+        * The multimap maps timespans to file specifications
+        */
 
        typedef std::pair<TimespanPtr, FileSpec> ConfigPair;
        typedef std::multimap<TimespanPtr, FileSpec> ConfigMap;
 
-       typedef boost::shared_ptr<ExportProcessor> ProcessorPtr;
+       typedef boost::shared_ptr<ExportGraphBuilder> GraphBuilderPtr;
        typedef boost::shared_ptr<ExportStatus> StatusPtr;
 
   private:
@@ -106,28 +114,40 @@ class ExportHandler : public ExportElementFactory
   public:
        ~ExportHandler ();
 
-       bool add_export_config (TimespanPtr timespan, ChannelConfigPtr channel_config, FormatPtr format, FilenamePtr filename);
+       bool add_export_config (TimespanPtr timespan, ChannelConfigPtr channel_config, FormatPtr format, FilenamePtr filename, boost::shared_ptr<AudioGrapher::BroadcastInfo> broadcast_info);
        void do_export (bool rt = false);
 
   private:
 
+       int process (nframes_t frames);
+       
        Session &          session;
-       ProcessorPtr       processor;
+       GraphBuilderPtr    graph_builder;
        StatusPtr          export_status;
        ConfigMap          config_map;
 
        bool               realtime;
+       bool               normalizing;
+
+       /* Timespan management */
 
-       boost::signals2::scoped_connection          files_written_connection;
-       boost::signals2::scoped_connection          export_read_finished_connection;
-       std::list<Glib::ustring> files_written;
-       void add_file (const Glib::ustring&);
+       void start_timespan ();
+       int  process_timespan (nframes_t frames);
+       int  process_normalize ();
+       void finish_timespan ();
+
+       typedef std::pair<ConfigMap::iterator, ConfigMap::iterator> TimespanBounds;
+       TimespanPtr           current_timespan;
+       TimespanBounds        timespan_bounds;
+       
+       PBD::ScopedConnection process_connection;
+       framepos_t             process_position;
 
        /* CD Marker stuff */
 
        struct CDMarkerStatus {
                CDMarkerStatus (std::string out_file, TimespanPtr timespan, FormatPtr format, std::string filename) :
-                 out (out_file.c_str()), timespan (timespan), format (format), filename (filename),
+                 out (out_file.c_str()), timespan (timespan), format (format), filename (filename), marker(0),
                  track_number (1), track_position (0), track_duration (0), track_start_frame (0),
                  index_number (1), index_position (0)
                  {}
@@ -141,13 +161,13 @@ class ExportHandler : public ExportElementFactory
 
                /* Track info */
                uint32_t       track_number;
-               nframes_t      track_position;
-               nframes_t      track_duration;
-               nframes_t      track_start_frame;
+               framepos_t      track_position;
+               framepos_t      track_duration;
+               framepos_t      track_start_frame;
 
                /* Index info */
                uint32_t       index_number;
-               nframes_t      index_position;
+               framepos_t      index_position;
        };
 
 
@@ -162,23 +182,10 @@ class ExportHandler : public ExportElementFactory
        void write_index_info_cue (CDMarkerStatus & status);
        void write_index_info_toc (CDMarkerStatus & status);
 
-       void frames_to_cd_frames_string (char* buf, nframes_t when);
+       void frames_to_cd_frames_string (char* buf, framepos_t when);
 
        int cue_tracknum;
        int cue_indexnum;
-
-       /* Timespan management */
-
-       void start_timespan ();
-       void finish_timespan ();
-       void timespan_thread_finished ();
-
-       typedef std::pair<ConfigMap::iterator, ConfigMap::iterator> TimespanBounds;
-       TimespanPtr          current_timespan;
-       ConfigMap::iterator  current_map_it;
-       TimespanBounds       timespan_bounds;
-       boost::signals2::scoped_connection     channel_config_connection;
-
 };
 
 } // namespace ARDOUR