expose more info from plugin-strip (for GUI display)

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

diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc
index dc918dfe1cd77a4cdb15bcdcbcb17d52b01a4624..f2909ea10dce3f4927b68d7ad23c11ea9e91a6d4 100644 (file)
--- a/libs/ardour/session_command.cc
+++ b/libs/ardour/session_command.cc
@@ -17,29 +17,28 @@
 
 */
 
-#include "ardour/session.h"
-#include "ardour/route.h"
-#include "pbd/memento_command.h"
-#include "ardour/diskstream.h"
+#include <string>
+
+#include "ardour/automation_list.h"
+#include "ardour/location.h"
+#include "ardour/midi_automation_list_binder.h"
 #include "ardour/playlist.h"
-#include "ardour/audioplaylist.h"
-#include "ardour/audio_track.h"
-#include "ardour/midi_playlist.h"
-#include "ardour/midi_track.h"
-#include "ardour/tempo.h"
-#include "ardour/audiosource.h"
-#include "ardour/audioregion.h"
-#include "ardour/midi_source.h"
-#include "ardour/midi_region.h"
-#include "ardour/session_playlists.h"
+#include "ardour/region.h"
 #include "ardour/region_factory.h"
-#include "ardour/midi_automation_list_binder.h"
+#include "ardour/route.h"
+#include "ardour/session.h"
+#include "ardour/session_playlists.h"
+#include "ardour/source.h"
+#include "ardour/tempo.h"
+#include "evoral/Curve.hpp"
 #include "pbd/error.h"
-#include "pbd/id.h"
-#include "pbd/statefuldestructible.h"
 #include "pbd/failed_constructor.h"
+#include "pbd/id.h"
+#include "pbd/memento_command.h"
 #include "pbd/stateful_diff_command.h"
-#include "evoral/Curve.hpp"
+#include "pbd/statefuldestructible.h"
+
+class Command;
 
 using namespace PBD;
 using namespace ARDOUR;
@@ -85,12 +84,12 @@ Session::memento_command_factory(XMLNode *n)
     }
 
     if (!child) {
-       error << _("Tried to reconstitute a MementoCommand with no contents, failing. id=") << id.to_s() << endmsg;
-       return 0;
+           error << string_compose (_("Tried to reconstitute a MementoCommand with no contents, failing. id=%1"), id.to_s()) << endmsg;
+           return 0;
     }
 
     /* create command */
-    string obj_T = n->property ("type-name")->value();
+    std::string obj_T = n->property ("type-name")->value();
 
     if (obj_T == "ARDOUR::AudioRegion" || obj_T == "ARDOUR::MidiRegion" || obj_T == "ARDOUR::Region") {
            boost::shared_ptr<Region> r = RegionFactory::region_by_id (id);
@@ -103,13 +102,13 @@ Session::memento_command_factory(XMLNode *n)
                    return new MementoCommand<Source>(*sources[id], before, after);
 
     } else if (obj_T == "ARDOUR::Location") {
-           Location* loc = _locations.get_location_by_id(id);
+           Location* loc = _locations->get_location_by_id(id);
            if (loc) {
                    return new MementoCommand<Location>(*loc, before, after);
            }
 
     } else if (obj_T == "ARDOUR::Locations") {
-           return new MementoCommand<Locations>(_locations, before, after);
+           return new MementoCommand<Locations>(*_locations, before, after);
 
     } else if (obj_T == "ARDOUR::TempoMap") {
            return new MementoCommand<TempoMap>(*_tempo_map, before, after);
@@ -138,9 +137,9 @@ Session::memento_command_factory(XMLNode *n)
                            before, after
                            );
            }
-           
-           cerr << "Alist not found\n";
-           
+
+           std::cerr << "Alist " << id << " not found\n";
+
     } else if (registry.count(id)) { // For Editor and AutomationLine which are off-limits herea
            return new MementoCommand<PBD::StatefulDestructible>(*registry[id], before, after);
     }
@@ -156,7 +155,7 @@ Session::stateful_diff_command_factory (XMLNode* n)
 {
        PBD::ID const id (n->property("obj-id")->value ());
 
-       string const obj_T = n->property ("type-name")->value ();
+       std::string const obj_T = n->property ("type-name")->value ();
        if ((obj_T == "ARDOUR::AudioRegion" || obj_T == "ARDOUR::MidiRegion")) {
                boost::shared_ptr<Region> r = RegionFactory::region_by_id (id);
                if (r) {
@@ -164,19 +163,19 @@ Session::stateful_diff_command_factory (XMLNode* n)
                }
 
        } else if (obj_T == "ARDOUR::AudioPlaylist" ||  obj_T == "ARDOUR::MidiPlaylist") {
-                boost::shared_ptr<Playlist> p = playlists->by_id (id);
-                if (p) {
-                        return new StatefulDiffCommand (p, *n);
-                } else {
-                        cerr << "Playlist with ID = " << id << " not found\n";
-                }
-        }
+               boost::shared_ptr<Playlist> p = playlists->by_id (id);
+               if (p) {
+                       return new StatefulDiffCommand (p, *n);
+               } else {
+                       std::cerr << "Playlist with ID = " << id << " not found\n";
+               }
+       }
 
        /* we failed */
-       
+
        error << string_compose (
                _("could not reconstitute StatefulDiffCommand from XMLNode. object type = %1 id = %2"), obj_T, id.to_s())
              << endmsg;
-       
+
        return 0;
 }