Changes missing from previous commit

git-svn-id: svn://localhost/ardour2/branches/3.0@5070 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/lv2_plugin_ui.cc b/gtk2_ardour/lv2_plugin_ui.cc
index f83ff7384cab6cffd2f0b4543235c22de2bbe607..812f2640a71f1500d0fc06f183aa4133ba8e2454 100644 (file)
--- a/gtk2_ardour/lv2_plugin_ui.cc
+++ b/gtk2_ardour/lv2_plugin_ui.cc
@@ -159,7 +159,7 @@ LV2PluginUI::package (Gtk::Window& win)
 bool
 LV2PluginUI::configure_handler (GdkEventConfigure* ev)
 {
-       cout << "CONFIGURE" << endl;
+       std::cout << "CONFIGURE" << std::endl;
        return false;
 }
 

diff --git a/libs/ardour/ardour/lv2_plugin.h b/libs/ardour/ardour/lv2_plugin.h
index 7daf4ed2b16654c7c3e958415eb5cae0261b08ea..e7a755e4fc76f0eba8facdfa652f38407f198021 100644 (file)
--- a/libs/ardour/ardour/lv2_plugin.h
+++ b/libs/ardour/ardour/lv2_plugin.h
@@ -116,7 +116,7 @@ class LV2Plugin : public ARDOUR::Plugin
        XMLNode& get_state();
        int      set_state(const XMLNode& node);
        bool     save_preset(std::string uri);
-       bool     load_preset(const string uri);
+       bool     load_preset(const std::string uri);
        virtual std::vector<Plugin::PresetRecord> get_presets();
 
        bool has_editor() const;
@@ -136,8 +136,8 @@ class LV2Plugin : public ARDOUR::Plugin
        float*                   _defaults;
        float*                   _latency_control_port;
        bool                     _was_activated;
-       vector<bool>             _port_is_input;
-       map<string,uint32_t>     _port_indices;
+       std::vector<bool>        _port_is_input;
+       std::map<std::string,uint32_t> _port_indices;
 
        typedef struct { const void* (*extension_data)(const char* uri); } LV2_DataAccess;
        LV2_DataAccess _data_access_extension_data;