- Fix process callbakc handling during export

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

diff --git a/libs/ardour/ardour/export_channel_configuration.h b/libs/ardour/ardour/export_channel_configuration.h
index 28e5e8e533739027112db57b5a3930bca17170ef..4b027cc02050fd851681688a525a8e34d09fbfa4 100644 (file)
--- a/libs/ardour/ardour/export_channel_configuration.h
+++ b/libs/ardour/ardour/export_channel_configuration.h
@@ -24,7 +24,6 @@
 #include <list>
 
 #include <glibmm/ustring.h>
-#include <sigc++/signal.h>
 
 #include "ardour/export_channel.h"
 #include "ardour/export_status.h"
@@ -32,8 +31,6 @@
 
 #include "pbd/xml++.h"
 
-using Glib::ustring;
-
 namespace ARDOUR
 {
 
@@ -48,86 +45,40 @@ class Session;
 
 class ExportChannelConfiguration
 {
-  private:
-       typedef boost::shared_ptr<ExportProcessor> ProcessorPtr;
-       typedef boost::shared_ptr<ExportTimespan> TimespanPtr;
-       typedef boost::shared_ptr<ExportFormatSpecification const> FormatPtr;
-       typedef boost::shared_ptr<ExportFilename> FilenamePtr;
-       
-       typedef std::pair<FormatPtr, FilenamePtr> FileConfig;
-       typedef std::list<FileConfig> FileConfigList;
-       
-       /// Struct for threading, acts like a pointer to a ExportChannelConfiguration
-       struct WriterThread {
-               WriterThread (ExportChannelConfiguration & channel_config) :
-                 channel_config (channel_config), running (false) {}
-               
-               ExportChannelConfiguration * operator-> () { return &channel_config; }
-               ExportChannelConfiguration & operator* () { return channel_config; }
-               
-               ExportChannelConfiguration & channel_config;
-               
-               pthread_t thread;
-               bool      running;
-       };
 
   private:
        friend class ExportElementFactory;
        ExportChannelConfiguration (Session & session);
-       
+
   public:
+       bool operator== (ExportChannelConfiguration const & other) const { return channels == other.channels; }
+       bool operator!= (ExportChannelConfiguration const & other) const { return channels != other.channels; }
+       
        XMLNode & get_state ();
        int set_state (const XMLNode &);
-       
+
        typedef std::list<ExportChannelPtr> ChannelList;
-       
+
        ChannelList const & get_channels () const { return channels; }
        bool all_channels_have_ports () const;
-       
-       ustring name () const { return _name; }
-       void set_name (ustring name) { _name = name; }
+
+       Glib::ustring name () const { return _name; }
+       void set_name (Glib::ustring name) { _name = name; }
        void set_split (bool value) { split = value; }
-       
+
        bool get_split () const { return split; }
        uint32_t get_n_chans () const { return channels.size(); }
-       
+
        void register_channel (ExportChannelPtr channel) { channels.push_back (channel); }
-       void register_file_config (FormatPtr format, FilenamePtr filename) { file_configs.push_back (FileConfig (format, filename)); }
-       
        void clear_channels () { channels.clear (); }
-       
-       /// Writes all files for this channel config @return true if a new thread was spawned
-       bool write_files (boost::shared_ptr<ExportProcessor> new_processor);
-       sigc::signal<void> FilesWritten;
-       
-       // Tells the handler the necessary information for it to handle tempfiles
-       void register_with_timespan (TimespanPtr timespan);
-       
-       void unregister_all ();
-       
-  private:
-
-       typedef boost::shared_ptr<ExportStatus> ExportStatusPtr;
-
-        Session & session;
 
-       // processor has to be prepared before doing this.
-       void write_file ();
-       
-       /// The actual write files, needed for threading
-       static void *  _write_files (void *arg);
-       WriterThread    writer_thread;
-       ProcessorPtr    processor;
-       ExportStatusPtr status;
+  private:
 
-       bool            files_written;
+       Session & session;
 
-       TimespanPtr     timespan;
        ChannelList     channels;
-       FileConfigList  file_configs;
-       
        bool            split; // Split to mono files
-       ustring        _name;
+       Glib::ustring  _name;
 };
 
 } // namespace ARDOUR