*** NEW CODING POLICY ***

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

diff --git a/libs/ardour/audio_track_importer.cc b/libs/ardour/audio_track_importer.cc
index 016f133bb00b3211c19f45e15d7e808840ecbf76..f822cfb8328bdfd0bad9a102971fec6f1b55191d 100644 (file)
--- a/libs/ardour/audio_track_importer.cc
+++ b/libs/ardour/audio_track_importer.cc
@@ -18,15 +18,17 @@
 
 */
 
-#include <ardour/audio_track_importer.h>
+#include "ardour/audio_track_importer.h"
 
-#include <ardour/audio_playlist_importer.h>
-#include <ardour/session.h>
+#include "ardour/audio_playlist_importer.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/session.h"
 
-#include <pbd/failed_constructor.h>
-#include <pbd/convert.h>
+#include "pbd/failed_constructor.h"
+#include "pbd/convert.h"
 
 #include <sstream>
+#include <algorithm>
 
 #include "i18n.h"
 
@@ -70,7 +72,7 @@ AudioTrackImportHandler::get_info () const
 
 AudioTrackImporter::AudioTrackImporter (XMLTree const & source,
                                         Session & session,
-                                        AudioTrackImportHandler & handler,
+                                        AudioTrackImportHandler & track_handler,
                                         XMLNode const & node,
                                         AudioPlaylistImportHandler & pl_handler) :
   ElementImporter (source, session),
@@ -88,18 +90,23 @@ AudioTrackImporter::AudioTrackImporter (XMLTree const & source,
                throw failed_constructor();
        }
        
-       XMLNodeList const & controllables = node.children ("controllable");
+       XMLNodeList const & controllables = node.children ("Controllable");
        for (XMLNodeList::const_iterator it = controllables.begin(); it != controllables.end(); ++it) {
                parse_controllable (**it);
        }
        
-       XMLNode * remote_control = xml_track.child ("remote_control");
+       XMLNode * remote_control = xml_track.child ("RemoteControl");
        if (remote_control && (prop = remote_control->property ("id"))) {
                uint32_t control_id = session.ntracks() + session.nbusses() + 1;
                prop->set_value (to_string (control_id, std::dec));
        }
        
-       xml_track.remove_nodes_and_delete ("extra");
+       xml_track.remove_nodes_and_delete ("Extra");
+}
+
+AudioTrackImporter::~AudioTrackImporter ()
+{
+       playlists.clear ();
 }
 
 bool
@@ -162,9 +169,18 @@ AudioTrackImporter::parse_io ()
                        (*it)->set_value (id.to_s());
                        id_ok = true;
                } else if (!prop.compare("inputs")) {
-                       // TODO Let the IO class do it's thing for now...
+                       // TODO Handle this properly!
+                       /* Input and output ports are counted and added empty, so that no in/output connecting function fails. */
+                       uint32_t num_inputs = std::count ((*it)->value().begin(), (*it)->value().end(), '{');
+                       std::string value;
+                       for (uint32_t i = 0; i < num_inputs; i++) { value += "{}"; }
+                       (*it)->set_value (value);
                } else if (!prop.compare("outputs")) {
-                       // TODO Let the IO class do it's thing for now...
+                       // TODO See comments above
+                       uint32_t num_outputs = std::count ((*it)->value().begin(), (*it)->value().end(), '{');
+                       std::string value;
+                       for (uint32_t i = 0; i < num_outputs; i++) { value += "{}"; }
+                       (*it)->set_value (value);
                } else {
                        std::cerr << string_compose (X_("AudioTrackImporter: did not recognise XML-property \"%1\""), prop) << endmsg;
                }
@@ -180,7 +196,7 @@ AudioTrackImporter::parse_io ()
                return false;
        }
        
-       XMLNodeList const & controllables = io->children ("controllable");
+       XMLNodeList const & controllables = io->children ("Controllable");
        for (XMLNodeList::const_iterator it = controllables.begin(); it != controllables.end(); ++it) {
                parse_controllable (**it);
        }
@@ -232,7 +248,6 @@ AudioTrackImporter::_prepare_move ()
        xml_track.child ("IO")->property ("name")->set_value (name);
        track_handler.add_name (name);
        
-       // TODO
        return true;
 }
 
@@ -241,13 +256,40 @@ AudioTrackImporter::_cancel_move ()
 {
        track_handler.remove_name (name);
        playlists.clear ();
-       // TODO
 }
 
 void
 AudioTrackImporter::_move ()
-{
-       // TODO
+{      
+       /* Add diskstream */
+       
+       boost::shared_ptr<XMLSharedNodeList> ds_node_list;
+       string xpath = "/Session/DiskStreams/AudioDiskstream[@id='" + old_ds_id.to_s() + "']";
+       ds_node_list = source.root()->find (xpath);
+       
+       if (ds_node_list->size() != 1) {
+               error << string_compose (_("Error Importing Audio track %1"), name) << endmsg;
+               return;
+       }
+       
+       boost::shared_ptr<XMLNode> ds_node = ds_node_list->front();
+       ds_node->property ("id")->set_value (new_ds_id.to_s());
+       
+       boost::shared_ptr<Diskstream> new_ds (new AudioDiskstream (session, *ds_node));
+       new_ds->set_name (name);
+       session.add_diskstream (new_ds);
+
+       /* Import playlists */
+
+       for (PlaylistList::const_iterator it = playlists.begin(); it != playlists.end(); ++it) {
+               (*it)->move ();
+       }
+
+       /* Import track */
+
+       XMLNode routes ("Routes");
+       routes.add_child_copy (xml_track);
+       session.load_routes (routes);
 }
 
 bool