Merge branch 'master' into cairocanvas

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

diff --git a/libs/ardour/ardour/audio_track_importer.h b/libs/ardour/ardour/audio_track_importer.h
index 87b3b25177ef31e0ae86ad74207792dff343b17b..58789177e3750fb63f99a324b426e97399e45bc8 100644 (file)
--- a/libs/ardour/ardour/audio_track_importer.h
+++ b/libs/ardour/ardour/audio_track_importer.h
@@ -23,30 +23,30 @@
 
 #include <list>
 
-#include <pbd/xml++.h>
-#include <pbd/id.h>
+#include "pbd/xml++.h"
+#include "pbd/id.h"
 
-#include <ardour/element_importer.h>
-#include <ardour/element_import_handler.h>
+#include "ardour/element_importer.h"
+#include "ardour/element_import_handler.h"
 
 namespace ARDOUR {
 
 class AudioPlaylistImportHandler;
 class AudioPlaylistImporter;
 
-class AudioTrackImportHandler : public ElementImportHandler
+class LIBARDOUR_API AudioTrackImportHandler : public ElementImportHandler
 {
   public:
        AudioTrackImportHandler (XMLTree const & source, Session & session, AudioPlaylistImportHandler & pl_handler);
        virtual ~AudioTrackImportHandler () {}
-       virtual string get_info () const;
+       virtual std::string get_info () const;
 
   private:
        AudioPlaylistImportHandler & pl_handler;
 };
 
 
-class AudioTrackImporter : public ElementImporter
+class LIBARDOUR_API AudioTrackImporter : public ElementImporter
 {
   public:
        AudioTrackImporter (XMLTree const & source,
@@ -56,7 +56,7 @@ class AudioTrackImporter : public ElementImporter
                            AudioPlaylistImportHandler & pl_handler);
        ~AudioTrackImporter ();
 
-       string get_info () const;
+       std::string get_info () const;
 
   protected:
        bool _prepare_move ();
@@ -70,18 +70,18 @@ class AudioTrackImporter : public ElementImporter
 
        bool parse_route_xml ();
        bool parse_io ();
-       
+
        bool parse_processor (XMLNode & node);
        bool parse_controllable (XMLNode & node);
        bool parse_automation (XMLNode & node);
        bool rate_convert_events (XMLNode & node);
-       
+
        AudioTrackImportHandler & track_handler;
        XMLNode xml_track;
-       
+
        PBD::ID old_ds_id;
        PBD::ID new_ds_id;
-       
+
        PlaylistList playlists;
        AudioPlaylistImportHandler & pl_handler;
 };