continue with MTC debugging

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

diff --git a/libs/ardour/ardour/export_file_io.h b/libs/ardour/ardour/export_file_io.h
index 0b314819de0ed4c2dd652adc0b1a573ffe539af6..48d5984f78454dcdb48f69748a55ce6dd7c2a3b3 100644 (file)
--- a/libs/ardour/ardour/export_file_io.h
+++ b/libs/ardour/ardour/export_file_io.h
@@ -34,8 +34,6 @@
 #include "ardour/export_format_specification.h"
 #include "ardour/export_utilities.h"
 
-using Glib::ustring;
-
 namespace ARDOUR
 {
 
@@ -45,15 +43,15 @@ class ExportFileWriter
   public:
        virtual ~ExportFileWriter () {}
 
-       string filename () const { return _filename; }
+       std::string filename () const { return _filename; }
        nframes_t position () const { return _position; }
-       
+
        void set_position (nframes_t position) { _position = position; }
-       
+
   protected:
-       ExportFileWriter (string filename) : _filename (filename) {}
+       ExportFileWriter (std::string filename) : _filename (filename) {}
 
-       string _filename;
+       std::string _filename;
        nframes_t _position;
 };
 
@@ -65,7 +63,7 @@ class SndfileWriterBase : public ExportFileWriter
        SNDFILE * get_sndfile () const { return sndfile; }
 
   protected:
-       SndfileWriterBase (int channels, nframes_t samplerate, int format, string const & path);
+       SndfileWriterBase (int channels, nframes_t samplerate, int format, std::string const & path);
        virtual ~SndfileWriterBase ();
 
        SF_INFO        sf_info;
@@ -81,7 +79,7 @@ class SndfileWriter : public SndfileWriterBase, public GraphSink<T>
        // Should only be created vie ExportFileFactory and derived classes
   public: // protected
        friend class ExportFileFactory;
-       SndfileWriter (int channels, nframes_t samplerate, int format, string const & path);
+       SndfileWriter (int channels, nframes_t samplerate, int format, std::string const & path);
 
   public:
        nframes_t write (T * data, nframes_t frames);
@@ -101,58 +99,58 @@ class ExportTempFile : public SndfileWriter<float>, public GraphSource<float>
   public:
        ExportTempFile (uint32_t channels, nframes_t samplerate);
        ~ExportTempFile () {}
-       
+
        /// Causes the file to be read from the beginning again
        void reset_read () { reading = false; }
        nframes_t read (float * data, nframes_t frames);
-       
+
        /* Silence management */
-       
+
        nframes_t trim_beginning (bool yn = true);
        nframes_t trim_end (bool yn = true);
-       
+
        void set_silence_beginning (nframes_t frames);
        void set_silence_end (nframes_t frames);
 
   private:
        /* File access */
-       
+
        sf_count_t get_length ();
        sf_count_t get_position ();
        sf_count_t get_read_position (); // get position seems to default to the write pointer
        sf_count_t locate_to (nframes_t frames);
        sf_count_t _read (float * data, nframes_t frames);
-       
+
        uint32_t channels;
        bool reading;
-       
+
        /* Silence related */
-       
+
        /* start and end are used by read() */
-       
+
        nframes_t start;
        nframes_t end;
-       
+
        /* these are the silence processing results and state */
-       
+
        void process_beginning ();
        void process_end ();
-       
+
        bool beginning_processed;
        bool end_processed;
-       
+
        nframes_t silent_frames_beginning;
        nframes_t silent_frames_end;
-       
+
        /* Silence to add to start and end */
-       
+
        nframes_t silence_beginning;
        nframes_t silence_end;
-       
+
        /* Takes care that the end postion gets set at some stage */
-       
+
        bool end_set;
-       
+
 };
 
 class ExportFileFactory
@@ -162,15 +160,15 @@ class ExportFileFactory
        typedef GraphSink<float> FloatSink;
        typedef boost::shared_ptr<FloatSink> FloatSinkPtr;
        typedef boost::shared_ptr<ExportFileWriter> FileWriterPtr;
-       
+
        typedef std::pair<FloatSinkPtr, FileWriterPtr> FilePair;
 
-       static FilePair create (FormatPtr format, uint32_t channels, ustring const & filename);
+       static FilePair create (FormatPtr format, uint32_t channels, Glib::ustring const & filename);
        static bool check (FormatPtr format, uint32_t channels);
 
   private:
 
-       static FilePair create_sndfile (FormatPtr format, unsigned int channels, ustring const & filename);
+       static FilePair create_sndfile (FormatPtr format, unsigned int channels, Glib::ustring const & filename);
        static bool check_sndfile (FormatPtr format, unsigned int channels);
 };