OMNIBUS COMMIT: prefer const XMLNode::property method (and provide a real one)
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 5 May 2016 03:09:37 +0000 (23:09 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 5 May 2016 03:09:45 +0000 (23:09 -0400)
94 files changed:
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui_dependents.cc
gtk2_ardour/audio_clock.cc
gtk2_ardour/automation_time_axis.cc
gtk2_ardour/editor.cc
gtk2_ardour/editor_rulers.cc
gtk2_ardour/engine_dialog.cc
gtk2_ardour/export_video_dialog.cc
gtk2_ardour/gui_object.cc
gtk2_ardour/keyboard.cc
gtk2_ardour/location_ui.cc
gtk2_ardour/meterbridge.cc
gtk2_ardour/mixer_ui.cc
gtk2_ardour/processor_box.cc
gtk2_ardour/route_time_axis.cc
gtk2_ardour/selection.cc
gtk2_ardour/selection_memento.cc
gtk2_ardour/ui_config.cc
gtk2_ardour/video_timeline.cc
libs/ardour/audio_diskstream.cc
libs/ardour/audio_playlist.cc
libs/ardour/audio_playlist_importer.cc
libs/ardour/audio_playlist_source.cc
libs/ardour/audio_region_importer.cc
libs/ardour/audio_track.cc
libs/ardour/audio_track_importer.cc
libs/ardour/audio_unit.cc
libs/ardour/audioregion.cc
libs/ardour/audiosource.cc
libs/ardour/automatable.cc
libs/ardour/automation_list.cc
libs/ardour/control_protocol_manager.cc
libs/ardour/delivery.cc
libs/ardour/diskstream.cc
libs/ardour/element_importer.cc
libs/ardour/engine_state_controller.cc
libs/ardour/export_channel.cc
libs/ardour/export_filename.cc
libs/ardour/export_format_specification.cc
libs/ardour/export_preset.cc
libs/ardour/export_profile_manager.cc
libs/ardour/file_source.cc
libs/ardour/internal_send.cc
libs/ardour/io.cc
libs/ardour/io_processor.cc
libs/ardour/ladspa_plugin.cc
libs/ardour/location.cc
libs/ardour/luaproc.cc
libs/ardour/lv2_plugin.cc
libs/ardour/lxvst_plugin.cc
libs/ardour/midi_automation_list_binder.cc
libs/ardour/midi_model.cc
libs/ardour/midi_playlist.cc
libs/ardour/midi_scene_change.cc
libs/ardour/midi_source.cc
libs/ardour/midi_track.cc
libs/ardour/midiport_manager.cc
libs/ardour/monitor_processor.cc
libs/ardour/mute_master.cc
libs/ardour/pannable.cc
libs/ardour/panner_shell.cc
libs/ardour/playlist.cc
libs/ardour/playlist_factory.cc
libs/ardour/playlist_source.cc
libs/ardour/plugin_insert.cc
libs/ardour/port.cc
libs/ardour/port_insert.cc
libs/ardour/processor.cc
libs/ardour/region.cc
libs/ardour/return.cc
libs/ardour/route.cc
libs/ardour/route_group.cc
libs/ardour/scene_change.cc
libs/ardour/send.cc
libs/ardour/session.cc
libs/ardour/session_state.cc
libs/ardour/source.cc
libs/ardour/source_factory.cc
libs/ardour/speakers.cc
libs/ardour/tempo.cc
libs/ardour/track.cc
libs/ardour/vst_plugin.cc
libs/ardour/windows_vst_plugin.cc
libs/gtkmm2ext/bindings.cc
libs/gtkmm2ext/keyboard.cc
libs/gtkmm2ext/tabbable.cc
libs/gtkmm2ext/tearoff.cc
libs/gtkmm2ext/window_proxy.cc
libs/pbd/configuration_variable.cc
libs/pbd/pbd/properties.h
libs/pbd/pbd/xml++.h
libs/pbd/xml++.cc
libs/surfaces/generic_midi/generic_midi_control_protocol.cc
libs/surfaces/mackie/mackie_control_protocol.cc

index fd384ecf81effc52123178a75291c49ba6b099c2..32d14144fb576d2ca8db5a281377981ce6a79f2f 100644 (file)
@@ -741,7 +741,7 @@ ARDOUR_UI::configure_handler (GdkEventConfigure* /*conf*/)
 void
 ARDOUR_UI::set_transport_controllable_state (const XMLNode& node)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if ((prop = node.property ("roll")) != 0) {
                roll_controllable->set_id (prop->value());
index 55d352bd0be082a3eaa960045103ef4d421e6eeb..1453732a113e059f4cb0832cc410e0edd0f2d48f 100644 (file)
@@ -331,7 +331,7 @@ ARDOUR_UI::setup_windows ()
        const XMLNode* mnode = main_window_settings ();
 
        if (mnode) {
-               const XMLProperty* prop;
+               XMLProperty const * prop;
                gint x = -1;
                gint y = -1;
                gint w = -1;
index 834f7f31f7aad9735ea1fd551e1d2ef989a3bbd3..a44c32a10aae23d1693a3e770df98d6980d4e60a 100644 (file)
@@ -1301,7 +1301,7 @@ AudioClock::set_session (Session *s)
                _session->config.ParameterChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_configuration_changed, this, _1), gui_context());
                _session->tempo_map().PropertyChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_property_changed, this, _1), gui_context());
 
-               const XMLProperty* prop;
+               XMLProperty const * prop;
                XMLNode* node = _session->extra_xml (X_("ClockModes"));
                AudioClock::Mode amode;
 
index cb2a3b44ea85b374a609ecce1aeaaa17ed4ba816..ae0a691710a32138476356a59b80051724ddc5e3 100644 (file)
@@ -873,7 +873,7 @@ AutomationTimeAxisView::what_has_visible_automation (const boost::shared_ptr<Aut
                        const XMLNode* gui_node = ac->extra_xml ("GUI");
 
                        if (gui_node) {
-                               const XMLProperty* prop = gui_node->property ("shown");
+                               XMLProperty const * prop = gui_node->property ("shown");
                                if (prop) {
                                        if (string_is_affirmative (prop->value())) {
                                                visible.insert (i->first);
index b267eae67014a0c117283c74ca29045597fc57d3..77a0261be1f0eed26482472c4e2f2c5c3aaf8b40 100644 (file)
@@ -2287,7 +2287,7 @@ Editor::set_edit_point_preference (EditPoint ep, bool force)
 int
 Editor::set_state (const XMLNode& node, int version)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
        set_id (node);
 
        Tabbable::set_state (node, version);
@@ -3873,7 +3873,7 @@ Editor::pane_allocation_handler (Allocation &alloc, Paned* which)
         */
 
        int pos;
-       XMLProperty* prop;
+       XMLProperty const * prop;
        char buf[32];
        XMLNode* node = ARDOUR_UI::instance()->editor_settings();
 
index 45f91a681f593eb9c12003b17bb4d954c4b19815..bb45e97bb336a2349a3f213b1c1c5f2abd5f1e63 100644 (file)
@@ -313,7 +313,7 @@ Editor::store_ruler_visibility ()
 void
 Editor::restore_ruler_visibility ()
 {
-       XMLProperty* prop;
+       XMLProperty const * prop;
        XMLNode * node = _session->extra_xml (X_("RulerVisibility"));
 
        no_ruler_shown_update = true;
index d9f92d80e51bbbe8d629bb703ce2024cffa5bb08..cc85bda8783e5b7a028a6b79be32e18ffbb51a92 100644 (file)
@@ -1970,9 +1970,9 @@ EngineControl::set_state (const XMLNode& root)
 {
        XMLNodeList          clist, cclist;
        XMLNodeConstIterator citer, cciter;
-       XMLNode* child;
-       XMLNode* grandchild;
-       XMLProperty* prop = NULL;
+       XMLNode const * child;
+       XMLNode const * grandchild;
+       XMLProperty const * prop = NULL;
 
        fprintf (stderr, "EngineControl::set_state\n");
 
index f09306db0d5078676b16e0cf393b5867a13b5a61..fc7c3d52be9a04868d7194ff1317acab5e007c1f 100644 (file)
@@ -402,7 +402,7 @@ ExportVideoDialog::apply_state (TimeSelection &tme, bool range)
 
        node = _session->extra_xml (X_("Videoexport"));
        if (node) {
-               const XMLProperty* prop;
+               XMLProperty const * prop;
                prop = node->property (X_("ChangeGeometry"));
                if (prop) { scale_checkbox.set_active(atoi(prop->value())?true:false); }
                prop = node->property (X_("KeepAspect"));
index 5ea94f9c0cabb27aaf9759d1568b71c4e4dd79c9..c073a3aaf05666922b981d78c5c533e1bd409b03 100644 (file)
@@ -94,7 +94,7 @@ GUIObjectState::get_string (const string& id, const string& prop_name, bool* emp
                return string ();
        }
 
-       const XMLProperty* p (i->second->property (prop_name));
+       XMLProperty const * p (i->second->property (prop_name));
        if (!p) {
                if (empty) {
                        *empty = true;
@@ -130,7 +130,7 @@ GUIObjectState::set_state (const XMLNode& node)
                if ((*i)->name() != X_("Object")) {
                        continue;
                }
-               const XMLProperty* prop = (*i)->property (X_("id"));
+               XMLProperty const * prop = (*i)->property (X_("id"));
                if (!prop) {
                        continue;
                }
index bdf40e680cdcef04ac512265a016b11ef46d2519..a84f6478060c1b24e45c6c65e263c45c4f068af8 100644 (file)
@@ -227,7 +227,7 @@ ArdourKeyboard::get_state (void)
 int
 ArdourKeyboard::set_state (const XMLNode& node, int version)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if ((prop = node.property ("constraint-modifier")) != 0) {
                sscanf (prop->value().c_str(), "%d", &constraint_mod);
index 1d54622c9357be74e3cac0931aae30264e0d8486..07ed9c41d8460bf31279ca339839fbb968e2a73f 100644 (file)
@@ -1143,7 +1143,7 @@ LocationUI::clock_mode_from_session_instant_xml () const
                return AudioClock::Frames;
        }
 
-       XMLProperty* p = node->property (X_("clock-mode"));
+       XMLProperty const * p = node->property (X_("clock-mode"));
        if (!p) {
                return ARDOUR_UI::instance()->secondary_clock->mode();
        }
index aa2046a948e2976469703eb602a18a27d4b95143..5906d7343a950d7102f0f865ab25f68997c446dc 100644 (file)
@@ -463,7 +463,7 @@ Meterbridge::session_going_away ()
 int
 Meterbridge::set_state (const XMLNode& node)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
        XMLNode* geometry;
 
        m_width = default_width;
@@ -473,7 +473,7 @@ Meterbridge::set_state (const XMLNode& node)
 
        if ((geometry = find_named_node (node, "geometry")) != 0) {
 
-               XMLProperty* prop;
+               XMLProperty const * prop;
 
                if ((prop = geometry->property("x_size")) == 0) {
                        prop = geometry->property ("x-size");
index a848ede49ed5582ce76119eab110244f0c7f9a9e..c39ae3347041db39b914ac5b848439c019d64b21 100644 (file)
@@ -1652,7 +1652,7 @@ private:
 int
 Mixer_UI::set_state (const XMLNode& node, int version)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        Tabbable::set_state (node, version);
 
@@ -1754,7 +1754,7 @@ void
 Mixer_UI::pane_allocation_handler (Allocation&, Gtk::Paned* which)
 {
        int pos;
-       XMLProperty* prop = 0;
+       XMLProperty const * prop = 0;
        XMLNode* node = ARDOUR_UI::instance()->mixer_settings();
        XMLNode* geometry;
        int height;
index f3997203fde6a3fc77effd9c0e461390d20adb67..51b8f3f885b920266c5b59d34962925662c78f7e 100644 (file)
@@ -657,7 +657,7 @@ ProcessorEntry::set_control_state (XMLNode const * node)
 
        if (_plugin_display) {
                XMLNode* n = GUIObjectState::get_node (node, X_("InlineDisplay"));
-               XMLProperty* p = n ? n->property (X_("visible")) : NULL;
+               XMLProperty const * p = n ? n->property (X_("visible")) : NULL;
                if (p) {
                        if (string_is_affirmative (p->value ())) {
                                _plugin_display->show();
@@ -947,7 +947,7 @@ ProcessorEntry::Control::set_state (XMLNode const * node)
 {
        XMLNode* n = GUIObjectState::get_node (node, state_id ());
        if (n) {
-               XMLProperty* p = n->property (X_("visible"));
+               XMLProperty const * p = n->property (X_("visible"));
                set_visible (p && string_is_affirmative (p->value ()));
        } else {
                set_visible (false);
@@ -4160,7 +4160,7 @@ ProcessorWindowProxy::set_state (const XMLNode& node, int /*version*/)
        XMLNodeList children = node.children ();
        XMLNodeList::const_iterator i = children.begin ();
        while (i != children.end()) {
-               XMLProperty* prop = (*i)->property (X_("name"));
+               XMLProperty const * prop = (*i)->property (X_("name"));
                if ((*i)->name() == X_("Window") && prop && prop->value() == _name) {
                        break;
                }
@@ -4168,7 +4168,7 @@ ProcessorWindowProxy::set_state (const XMLNode& node, int /*version*/)
        }
 
        if (i != children.end()) {
-               XMLProperty* prop;
+               XMLProperty const * prop;
                if ((prop = (*i)->property (X_("custom-ui"))) != 0) {
                        want_custom = PBD::string_is_affirmative (prop->value ());
                }
index 986a274ee620bad34ec1bf53bba77ce56e86f387..e480485d8496f192f026b16ae0d1257caababef2 100644 (file)
@@ -2646,7 +2646,7 @@ RouteTimeAxisView::set_underlay_state()
                        continue;
                }
 
-               XMLProperty* prop = child_node->property ("id");
+               XMLProperty const * prop = child_node->property ("id");
                if (prop) {
                        PBD::ID id (prop->value());
 
@@ -2688,7 +2688,7 @@ RouteTimeAxisView::add_underlay (StreamView* v, bool /*update_xml*/)
                        }
 
                        XMLNode* node = underlay_xml_node->add_child("Underlay");
-                       XMLProperty* prop = node->add_property("id");
+                       XMLProperty const * prop = node->add_property("id");
                        prop->set_value(v->trackview().route()->id().to_s());
                }
 #endif
index d5fadb9cbb4f57d09b40b953c67fc742de8e94a4..2e5b8b84e0bfbbb7143eaa2d7e71678e624db1fd 100644 (file)
@@ -1365,7 +1365,7 @@ Selection::set_state (XMLNode const & node, int)
        for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
                if ((*i)->name() == X_("RouteView")) {
 
-                       XMLProperty* prop_id = (*i)->property (X_("id"));
+                       XMLProperty const * prop_id = (*i)->property (X_("id"));
                        assert (prop_id);
                        PBD::ID id (prop_id->value ());
                        RouteTimeAxisView* rtv = editor->get_route_view_by_route_id (id);
@@ -1374,7 +1374,7 @@ Selection::set_state (XMLNode const & node, int)
                        }
 
                } else if ((*i)->name() == X_("Region")) {
-                       XMLProperty* prop_id = (*i)->property (X_("id"));
+                       XMLProperty const * prop_id = (*i)->property (X_("id"));
                        assert (prop_id);
                        PBD::ID id (prop_id->value ());
 
@@ -1392,7 +1392,7 @@ Selection::set_state (XMLNode const & node, int)
                        }
 
                } else if ((*i)->name() == X_("MIDINote")) {
-                       XMLProperty* prop_region_id = (*i)->property (X_("region-id"));
+                       XMLProperty const * prop_region_id = (*i)->property (X_("region-id"));
 
                        assert (prop_region_id);
 
@@ -1405,12 +1405,12 @@ Selection::set_state (XMLNode const & node, int)
                        XMLNodeList children = (*i)->children ();
 
                        for (XMLNodeList::const_iterator ci = children.begin(); ci != children.end(); ++ci) {
-                               XMLProperty* prop_channel = (*ci)->property (X_("channel"));
-                               XMLProperty* prop_time = (*ci)->property (X_("time"));
-                               XMLProperty* prop_note = (*ci)->property (X_("note"));
-                               XMLProperty* prop_length = (*ci)->property (X_("length"));
-                               XMLProperty* prop_velocity = (*ci)->property (X_("velocity"));
-                               XMLProperty* prop_off_velocity = (*ci)->property (X_("off-velocity"));
+                               XMLProperty const * prop_channel = (*ci)->property (X_("channel"));
+                               XMLProperty const * prop_time = (*ci)->property (X_("time"));
+                               XMLProperty const * prop_note = (*ci)->property (X_("note"));
+                               XMLProperty const * prop_length = (*ci)->property (X_("length"));
+                               XMLProperty const * prop_velocity = (*ci)->property (X_("velocity"));
+                               XMLProperty const * prop_off_velocity = (*ci)->property (X_("off-velocity"));
 
                                assert (prop_channel);
                                assert (prop_time);
@@ -1445,16 +1445,16 @@ Selection::set_state (XMLNode const & node, int)
                        }
 
                } else if  ((*i)->name() == X_("ControlPoint")) {
-                       XMLProperty* prop_type = (*i)->property (X_("type"));
+                       XMLProperty const * prop_type = (*i)->property (X_("type"));
 
                        assert(prop_type);
 
                        if (prop_type->value () == "track") {
 
-                               XMLProperty* prop_route_id = (*i)->property (X_("route-id"));
-                               XMLProperty* prop_alist_id = (*i)->property (X_("automation-list-id"));
-                               XMLProperty* prop_parameter = (*i)->property (X_("parameter"));
-                               XMLProperty* prop_view_index = (*i)->property (X_("view-index"));
+                               XMLProperty const * prop_route_id = (*i)->property (X_("route-id"));
+                               XMLProperty const * prop_alist_id = (*i)->property (X_("automation-list-id"));
+                               XMLProperty const * prop_parameter = (*i)->property (X_("parameter"));
+                               XMLProperty const * prop_view_index = (*i)->property (X_("view-index"));
 
                                assert (prop_route_id);
                                assert (prop_alist_id);
@@ -1484,8 +1484,8 @@ Selection::set_state (XMLNode const & node, int)
                                        add (cps);
                                }
                        } else if (prop_type->value () == "region") {
-                               XMLProperty* prop_region_id = (*i)->property (X_("region-id"));
-                               XMLProperty* prop_view_index = (*i)->property (X_("view-index"));
+                               XMLProperty const * prop_region_id = (*i)->property (X_("region-id"));
+                               XMLProperty const * prop_view_index = (*i)->property (X_("view-index"));
 
                                if (!prop_region_id || !prop_view_index) {
                                        continue;
@@ -1515,8 +1515,8 @@ Selection::set_state (XMLNode const & node, int)
                        }
 
                } else if  ((*i)->name() == X_("AudioRange")) {
-                       XMLProperty* prop_start = (*i)->property (X_("start"));
-                       XMLProperty* prop_end = (*i)->property (X_("end"));
+                       XMLProperty const * prop_start = (*i)->property (X_("start"));
+                       XMLProperty const * prop_end = (*i)->property (X_("end"));
 
                        assert (prop_start);
                        assert (prop_end);
@@ -1528,8 +1528,8 @@ Selection::set_state (XMLNode const & node, int)
 
                } else if ((*i)->name() == X_("AutomationView")) {
 
-                       XMLProperty* prop_id = (*i)->property (X_("id"));
-                       XMLProperty* prop_parameter = (*i)->property (X_("parameter"));
+                       XMLProperty const * prop_id = (*i)->property (X_("id"));
+                       XMLProperty const * prop_parameter = (*i)->property (X_("parameter"));
 
                        assert (prop_id);
                        assert (prop_parameter);
@@ -1552,8 +1552,8 @@ Selection::set_state (XMLNode const & node, int)
 
                } else if ((*i)->name() == X_("Marker")) {
 
-                       XMLProperty* prop_id = (*i)->property (X_("id"));
-                       XMLProperty* prop_start = (*i)->property (X_("start"));
+                       XMLProperty const * prop_id = (*i)->property (X_("id"));
+                       XMLProperty const * prop_start = (*i)->property (X_("start"));
                        assert (prop_id);
                        assert (prop_start);
 
index ae3ad730ad6aed67983d907e33bd1e1b280ad84c..ffce0790f865d910824ec29b53817daaf524af7c 100644 (file)
@@ -54,7 +54,7 @@ SelectionMemento::get_state () {
 int
 SelectionMemento::set_state (const XMLNode& node, int /*version*/) {
 
-       const XMLProperty* prop;
+       XMLProperty const * prop;
        PublicEditor& editor = PublicEditor::instance();
        if (node.name() != X_("SelectionMemento")) {
                return -1;
index c001e5c5b1838d0008e9ea2452d9d51e8d791162..931030180cf8ff29be04e3651be120881689f446 100644 (file)
@@ -534,11 +534,12 @@ UIConfiguration::load_color_aliases (XMLNode const & node)
        color_aliases.clear ();
 
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-               if ((*niter)->name() != X_("ColorAlias")) {
+               XMLNode const * child = *niter;
+               if (child->name() != X_("ColorAlias")) {
                        continue;
                }
-               name = (*niter)->property (X_("name"));
-               alias = (*niter)->property (X_("alias"));
+               name = child->property (X_("name"));
+               alias = child->property (X_("alias"));
 
                if (name && alias) {
                        color_aliases.insert (make_pair (name->value(), alias->value()));
@@ -557,11 +558,12 @@ UIConfiguration::load_colors (XMLNode const & node)
        colors.clear ();
 
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-               if ((*niter)->name() != X_("Color")) {
+               XMLNode const * child = *niter;
+               if (child->name() != X_("Color")) {
                        continue;
                }
-               name = (*niter)->property (X_("name"));
-               color = (*niter)->property (X_("value"));
+               name = child->property (X_("name"));
+               color = child->property (X_("value"));
 
                if (name && color) {
                        ArdourCanvas::Color c;
@@ -583,12 +585,13 @@ UIConfiguration::load_modifiers (XMLNode const & node)
        modifiers.clear ();
 
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-               if ((*niter)->name() != X_("Modifier")) {
+               XMLNode const * child = *niter;
+               if (child->name() != X_("Modifier")) {
                        continue;
                }
 
-               name = (*niter)->property (X_("name"));
-               mod = (*niter)->property (X_("modifier"));
+               name = child->property (X_("name"));
+               mod = child->property (X_("modifier"));
 
                if (name && mod) {
                        SVAModifier svam (mod->value());
index 713ca1ca12d7a7c69a0eb53de9328932c5e8bd39..53336fa507bdbd7ef368ade7047a1c5381ce2fcd 100644 (file)
@@ -155,38 +155,38 @@ VideoTimeLine::set_session (ARDOUR::Session *s)
 
        set_id(*node);
 
-       const XMLProperty* proph = node->property (X_("Height"));
+       XMLProperty const * proph = node->property (X_("Height"));
        if (proph) {
                editor->set_video_timeline_height(atoi(proph->value()));
        }
 #if 0 /* TODO THINK: set FPS first time only ?! */
-       const XMLProperty* propasfps = node->property (X_("AutoFPS"));
+       XMLProperty const * propasfps = node->property (X_("AutoFPS"));
        if (propasfps) {
                auto_set_session_fps = atoi(propasfps->value())?true:false;
        }
 #endif
 
-       const XMLProperty* propoffset = node->property (X_("VideoOffset"));
+       XMLProperty const * propoffset = node->property (X_("VideoOffset"));
        if (propoffset) {
                video_offset = atoll(propoffset->value());
                video_offset_p = video_offset;
        }
 
-       const XMLProperty* proplock = node->property (X_("VideoOffsetLock"));
+       XMLProperty const * proplock = node->property (X_("VideoOffsetLock"));
        if (proplock) {
                video_offset_lock = atoi(proplock->value())?true:false;
        }
 
-       const XMLProperty* localfile = node->property (X_("LocalFile"));
+       XMLProperty const * localfile = node->property (X_("LocalFile"));
        if (localfile) {
                local_file = atoi(localfile->value())?true:false;
        }
 
-       const XMLProperty* propf = node->property (X_("Filename"));
+       XMLProperty const * propf = node->property (X_("Filename"));
        video_file_info(propf->value(), local_file);
 
        if ((node = _session->extra_xml (X_("Videomonitor")))) {
-               const XMLProperty* prop = node->property (X_("active"));
+               XMLProperty const * prop = node->property (X_("active"));
                if (prop && prop->value() == "yes" && found_xjadeo() && !video_filename.empty() && local_file) {
                        open_video_monitor();
                }
@@ -225,7 +225,7 @@ int
 VideoTimeLine::set_state (const XMLNode& node, int /*version*/)
 {
        LocaleGuard lg (X_("C"));
-       const XMLProperty* propoffset = node.property (X_("VideoOffset"));
+       XMLProperty const * propoffset = node.property (X_("VideoOffset"));
        if (propoffset) {
                video_offset = atoll(propoffset->value());
        }
@@ -804,7 +804,7 @@ VideoTimeLine::open_video_monitor() {
                /* load mask from Session */
                XMLNode* node = _session->extra_xml (X_("XJRestoreSettings"));
                if (node) {
-                       const XMLProperty* prop = node->property (X_("mask"));
+                       XMLProperty const * prop = node->property (X_("mask"));
                        if (prop) {
                                xj_settings_mask = atoi(prop->value());
                        }
@@ -825,7 +825,7 @@ VideoTimeLine::open_video_monitor() {
                if (_session) {
                        XMLNode* node = _session->extra_xml (X_("Videomonitor"));
                        if (node) {
-                               const XMLProperty* prop = node->property (X_("active"));
+                               XMLProperty const * prop = node->property (X_("active"));
                                if (prop && prop->value() != "yes") _session->set_dirty ();
                        } else {
                                _session->set_dirty ();
index f755f15a8924622e1f9416754243b05744933fdf..7a50934630f92d91f6fba9209788087cdb570c75 100644 (file)
@@ -1932,7 +1932,7 @@ AudioDiskstream::get_state ()
 int
 AudioDiskstream::set_state (const XMLNode& node, int version)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
        XMLNodeList nlist = node.children();
        XMLNodeIterator niter;
        uint32_t nchans = 1;
@@ -2260,7 +2260,7 @@ AudioDiskstream::capture_buffer_load () const
 int
 AudioDiskstream::use_pending_capture_data (XMLNode& node)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
        XMLNodeList nlist = node.children();
        XMLNodeIterator niter;
        boost::shared_ptr<AudioFileSource> fs;
index 0553206367676e1ecb261e6bd657f697cc0230a8..b70771fc150745ea835c427cc493d7964e16a06d 100644 (file)
@@ -38,7 +38,7 @@ AudioPlaylist::AudioPlaylist (Session& session, const XMLNode& node, bool hidden
        : Playlist (session, node, DataType::AUDIO, hidden)
 {
 #ifndef NDEBUG
-       const XMLProperty* prop = node.property("type");
+       XMLProperty const * prop = node.property("type");
        assert(!prop || DataType(prop->value()) == DataType::AUDIO);
 #endif
 
@@ -487,7 +487,7 @@ AudioPlaylist::load_legacy_crossfades (const XMLNode& node, int version)
        for (XMLNodeConstIterator i = children.begin(); i != children.end(); ++i) {
                if ((*i)->name() == X_("Crossfade")) {
 
-                       XMLProperty* p = (*i)->property (X_("active"));
+                       XMLProperty const * p = (*i)->property (X_("active"));
                        assert (p);
 
                        if (!string_is_affirmative (p->value())) {
index 5390f1c9d4c399a3a2a9c3c4da1683a87a54fc95..f24777c68d5c96395a3adf5027ed55341d70dc4e 100644 (file)
@@ -51,7 +51,7 @@ AudioPlaylistImportHandler::AudioPlaylistImportHandler (XMLTree const & source,
 
        XMLNodeList const & pl_children = playlists->children();
        for (XMLNodeList::const_iterator it = pl_children.begin(); it != pl_children.end(); ++it) {
-               const XMLProperty* type = (*it)->property("type");
+               XMLProperty const * type = (*it)->property("type");
                if ( !type || type->value() == "audio" ) {
                        try {
                                elements.push_back (ElementPtr ( new AudioPlaylistImporter (source, session, *this, **it)));
@@ -75,7 +75,7 @@ AudioPlaylistImportHandler::get_regions (XMLNode const & node, ElementList & lis
 }
 
 void
-AudioPlaylistImportHandler::update_region_id (XMLProperty* id_prop)
+AudioPlaylistImportHandler::update_region_id (XMLProperty * id_prop)
 {
        PBD::ID old_id (id_prop->value());
        PBD::ID new_id (region_handler.get_new_id (old_id));
@@ -178,7 +178,7 @@ AudioPlaylistImporter::_prepare_move ()
                name = rename_pair.second;
        }
 
-       XMLProperty* p = xml_playlist.property ("name");
+       XMLProperty * p = xml_playlist.property ("name");
        if (!p) {
                error << _("badly-formed XML in imported playlist") << endmsg;
                return false;
@@ -219,8 +219,8 @@ AudioPlaylistImporter::_move ()
        // Update region ids in crossfades
        XMLNodeList crossfades = xml_playlist.children("Crossfade");
        for (XMLNodeIterator it = crossfades.begin(); it != crossfades.end(); ++it) {
-               XMLProperty* in = (*it)->property("in");
-               XMLProperty* out = (*it)->property("out");
+               XMLProperty * in = (*it)->property("in");
+               XMLProperty * out = (*it)->property("out");
                if (!in || !out) {
                        error << string_compose (X_("AudioPlaylistImporter (%1): did not find the \"in\" or \"out\" property from a crossfade"), name) << endmsg;
                        continue; // or fatal?
@@ -230,12 +230,12 @@ AudioPlaylistImporter::_move ()
                handler.update_region_id (out);
 
                // rate convert length and position
-               XMLProperty* length = (*it)->property("length");
+               XMLProperty * length = (*it)->property("length");
                if (length) {
                        length->set_value (rate_convert_samples (length->value()));
                }
 
-               XMLProperty* position = (*it)->property("position");
+               XMLProperty * position = (*it)->property("position");
                if (position) {
                        position->set_value (rate_convert_samples (position->value()));
                }
index 8effdd0c808145f866056338f1ea02e203e01f41..7ac487815caf9307d022258a6f80e6a3eeb32903 100644 (file)
@@ -108,7 +108,7 @@ AudioPlaylistSource::set_state (const XMLNode& node, int version, bool with_desc
                }
        }
 
-       const XMLProperty* prop;
+       XMLProperty const * prop;
        pair<framepos_t,framepos_t> extent = _playlist->get_extent();
 
        AudioSource::_length = extent.second - extent.first;
index 53367a35a443282d752ee5b99546b06b27ae97a5..615ec4c0d70b6f6f2112944858a57427011f0928 100644 (file)
@@ -236,7 +236,7 @@ AudioRegionImporter::parse_source_xml ()
        char buf[128];
        std::string source_dir(get_sound_dir (source));
        XMLNode * source_node;
-       XMLProperty *prop;
+       XMLProperty const * prop;
 
        // Get XML for sources
        if (!(source_node = source.root()->child (X_("Sources")))) {
index 47746ffe312d0a1e018e9a5e46c65899d101a5dd..661469e01e6aba5e0a0a5d010de2b333349068df 100644 (file)
@@ -158,7 +158,7 @@ AudioTrack::deprecated_use_diskstream_connections ()
                return 0;
        }
 
-       const XMLProperty* prop;
+       XMLProperty const * prop;
        XMLNode& node (*diskstream->deprecated_io_node);
 
        /* don't do this more than once. */
@@ -200,7 +200,7 @@ AudioTrack::deprecated_use_diskstream_connections ()
 int
 AudioTrack::set_state (const XMLNode& node, int version)
 {
-       const XMLProperty *prop;
+       XMLProperty const * prop;
 
        if ((prop = node.property (X_("mode"))) != 0) {
                _mode = TrackMode (string_2_enum (prop->value(), _mode));
@@ -266,7 +266,7 @@ void
 AudioTrack::set_state_part_two ()
 {
        XMLNode* fnode;
-       XMLProperty* prop;
+       XMLProperty const * prop;
        LocaleGuard lg (X_("C"));
 
        /* This is called after all session state has been restored but before
index 43a40101cf9aeb64f834b77f6ae79600b937e920..5280216d1b0c14c0335c9477284b2c9e8b6c5103 100644 (file)
@@ -51,7 +51,7 @@ AudioTrackImportHandler::AudioTrackImportHandler (XMLTree const & source, Sessio
 
        XMLNodeList const & route_list = routes->children();
        for (XMLNodeList::const_iterator it = route_list.begin(); it != route_list.end(); ++it) {
-               const XMLProperty* type = (*it)->property("default-type");
+               XMLProperty const * type = (*it)->property("default-type");
                if ( (!type || type->value() == "audio") &&  ((*it)->property ("diskstream") != 0 || (*it)->property ("diskstream-id") != 0)) {
                        try {
                                elements.push_back (ElementPtr ( new AudioTrackImporter (source, session, *this, **it, pl_handler)));
@@ -254,7 +254,7 @@ AudioTrackImporter::_prepare_move ()
                return false;
        }
 
-       XMLProperty* p = c->property ("name");
+       XMLProperty * p = c->property ("name");
        if (!p) {
                error << _("badly-formed XML in imported track") << endmsg;
                return false;
@@ -289,7 +289,7 @@ AudioTrackImporter::_move ()
        }
 
        boost::shared_ptr<XMLNode> ds_node = ds_node_list->front();
-       XMLProperty* p = ds_node->property (X_("id"));
+       XMLProperty * p = ds_node->property (X_("id"));
        assert (p);
        p->set_value (new_ds_id.to_s());
 
index c748b686adb6baf5f3c996e3eeacbb129aff6805..c2c377eb5eb847c39e7e438236fb1d0cb8f00b2e 100644 (file)
@@ -3165,7 +3165,7 @@ AUPluginInfo::load_cached_info ()
        }
 
        //initial version has incorrectly stored i/o info, and/or garbage chars.
-       const XMLProperty* version = root->property(X_("version"));
+       XMLProperty const * version = root->property(X_("version"));
        if (! ((version != NULL) && (version->value() == X_(AU_CACHE_VERSION)))) {
                error << "au_cache is not correct version.  AU plugins will be re-scanned" << endmsg;
                return -1;
@@ -3183,7 +3183,7 @@ AUPluginInfo::load_cached_info ()
 
                        const XMLNode* gchild;
                        const XMLNodeList gchildren = child->children();
-                       const XMLProperty* prop = child->property (X_("id"));
+                       XMLProperty const * prop = child->property (X_("id"));
 
                        if (!prop) {
                                continue;
@@ -3221,8 +3221,8 @@ AUPluginInfo::load_cached_info ()
 
                                        int in;
                                        int out;
-                                       const XMLProperty* iprop;
-                                       const XMLProperty* oprop;
+                                       XMLProperty const * iprop;
+                                       XMLProperty const * oprop;
 
                                        if (((iprop = gchild->property (X_("in"))) != 0) &&
                                            ((oprop = gchild->property (X_("out"))) != 0)) {
index 22c1758ef1618bf0e3437826a27cd8ad062eec94..987a226c7633f6d5c12a0fc59c249509e5a7040f 100644 (file)
@@ -840,7 +840,7 @@ int
 AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_changed, bool send)
 {
        const XMLNodeList& nlist = node.children();
-       const XMLProperty *prop;
+       XMLProperty const * prop;
        LocaleGuard lg (X_("C"));
        boost::shared_ptr<Playlist> the_playlist (_playlist.lock());
 
@@ -871,7 +871,7 @@ AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_
 
        for (XMLNodeConstIterator niter = nlist.begin(); niter != nlist.end(); ++niter) {
                XMLNode *child;
-               XMLProperty *prop;
+               XMLProperty const * prop;
 
                child = (*niter);
 
index 9d90d05cb12ddc030fa16f67a85d353977b28347..7b3f424663ab78b8ce879c8ba4531dd3dc21a2c9 100644 (file)
@@ -142,7 +142,7 @@ AudioSource::get_state ()
 int
 AudioSource::set_state (const XMLNode& node, int /*version*/)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if ((prop = node.property ("captured-for")) != 0) {
                _captured_for = prop->value();
index 3c5d610ce88eaf7f1b4ffccfca4d8846741c18fd..f85bc83e8549a49e78ce806cb4edc444ee5cc2fd 100644 (file)
@@ -77,7 +77,7 @@ Automatable::~Automatable ()
 int
 Automatable::old_set_automation_state (const XMLNode& node)
 {
-       const XMLProperty *prop;
+       XMLProperty const * prop;
 
        if ((prop = node.property ("path")) != 0) {
                load_automation (prop->value());
@@ -220,7 +220,7 @@ Automatable::set_automation_xml_state (const XMLNode& node, Evoral::Parameter le
 
                if ((*niter)->name() == "AutomationList") {
 
-                       const XMLProperty* id_prop = (*niter)->property("automation-id");
+                       XMLProperty const * id_prop = (*niter)->property("automation-id");
 
                        Evoral::Parameter param = (id_prop
                                        ? EventTypeMap::instance().from_symbol(id_prop->value())
index 761aa31867807b0e6363f6b7f097ced8e6d4216b..21825612fad8487ff9822baae28b86c2b8dc89b2 100644 (file)
@@ -425,7 +425,7 @@ AutomationList::set_state (const XMLNode& node, int version)
        XMLNodeList nlist = node.children();
        XMLNode* nsos;
        XMLNodeIterator niter;
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if (node.name() == X_("events")) {
                /* partial state setting*/
@@ -443,7 +443,7 @@ AutomationList::set_state (const XMLNode& node, int version)
 
                const XMLNodeList& elist = node.children();
                XMLNodeConstIterator i;
-               XMLProperty* prop;
+               XMLProperty const * prop;
                pframes_t x;
                double y;
 
index 7423d3b5c6a4c82ac464b1fd2d4b26c56d254369..9f6216062adb6a54bdf3758db5d84577a7cdf68e 100644 (file)
@@ -168,7 +168,7 @@ ControlProtocolManager::instantiate (ControlProtocolInfo& cpi)
 
        cpi.descriptor = get_descriptor (cpi.path);
 
-       DEBUG_TRACE (DEBUG::ControlProtocols, string_compose ("instantiating %1\n", cpi.name));
+       DEBUG_TRACE (DEBUG::ControlProtocols, string_compose ("instantiating %1\n", cpi.name));
 
        if (cpi.descriptor == 0) {
                error << string_compose (_("control protocol name \"%1\" has no descriptor"), cpi.name) << endmsg;
@@ -410,22 +410,24 @@ ControlProtocolManager::set_state (const XMLNode& node, int /*version*/)
 {
        XMLNodeList clist;
        XMLNodeConstIterator citer;
-       XMLProperty* prop;
+       XMLProperty const * prop;
 
        Glib::Threads::Mutex::Lock lm (protocols_lock);
 
        clist = node.children();
 
        for (citer = clist.begin(); citer != clist.end(); ++citer) {
-               if ((*citer)->name() == X_("Protocol")) {
+               XMLNode const * child = *citer;
 
-                       if ((prop = (*citer)->property (X_("active"))) == 0) {
+               if (child->name() == X_("Protocol")) {
+
+                       if ((prop = child->property (X_("active"))) == 0) {
                                continue;
                        }
 
                        bool active = string_is_affirmative (prop->value());
 
-                       if ((prop = (*citer)->property (X_("name"))) == 0) {
+                       if ((prop = child->property (X_("name"))) == 0) {
                                continue;
                        }
 
index c538f6be8a5d597bb572cde045c313e54e6b731c..ed1c89a3e262dbf9fab670c07343b49254f7de5a 100644 (file)
@@ -352,7 +352,7 @@ Delivery::state (bool full_state)
 int
 Delivery::set_state (const XMLNode& node, int version)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if (IOProcessor::set_state (node, version)) {
                return -1;
index 7f4214037d6a2bbe1b12450cedd1cd3eaee4d7b2..1e5cc0c7c189e9055868ceba30158224c9633e3b 100644 (file)
@@ -483,7 +483,7 @@ Diskstream::get_state ()
 int
 Diskstream::set_state (const XMLNode& node, int /*version*/)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if ((prop = node.property ("name")) != 0) {
                _name = prop->value();
index 4f635f1693ccef28b51afc745a23a98e37e84f99..d1a67da2c4d25650750ddeee2c4185091f4bc646 100644 (file)
@@ -42,7 +42,7 @@ ElementImporter::ElementImporter (XMLTree const & source, ARDOUR::Session & sess
   _broken (false)
 {
        // Get samplerate
-       XMLProperty *prop;
+       XMLProperty const * prop;
        prop = source.root()->property ("sample-rate");
        if (prop) {
                std::istringstream iss (prop->value());
index 57b8a848884501e50ec0616cf2f78d726cc19c8b..67cdc7d086b329204eb52203773a949ae092e734 100644 (file)
@@ -150,7 +150,7 @@ EngineStateController::_deserialize_and_load_engine_states ()
 
                XMLNode* state_node = *state_node_iter;
                StatePtr engine_state (new State);
-               XMLProperty* prop = NULL;
+               XMLProperty const * prop = NULL;
 
                if ((prop = state_node->property ("backend-name")) == 0) {
                        continue;
@@ -302,7 +302,7 @@ EngineStateController::_deserialize_and_load_midi_port_states ()
                        for (; input_state_node_iter != input_state_nodes.end (); ++input_state_node_iter) {
 
                                XMLNode* input_state_node = *input_state_node_iter;
-                               XMLProperty* prop = NULL;
+                               XMLProperty const * prop = NULL;
 
                                if (input_state_node->name () != "input") {
                                        continue;
@@ -341,7 +341,7 @@ EngineStateController::_deserialize_and_load_midi_port_states ()
                        for (; output_state_node_iter != output_state_nodes.end (); ++output_state_node_iter) {
 
                                XMLNode* output_state_node = *output_state_node_iter;
-                               XMLProperty* prop = NULL;
+                               XMLProperty const * prop = NULL;
 
                                if (output_state_node->name () != "output") {
                                        continue;
index 2ccaf1ae33cd3f208c83f3e2c74c2c8f0a3b19cf..26f5a7bb28611543ffb4711a8d20b7919b4b4fc6 100644 (file)
@@ -98,7 +98,7 @@ PortExportChannel::get_state (XMLNode * node) const
 void
 PortExportChannel::set_state (XMLNode * node, Session & session)
 {
-       XMLProperty * prop;
+       XMLProperty const * prop;
        XMLNodeList xml_ports = node->children ("Port");
        for (XMLNodeList::iterator it = xml_ports.begin(); it != xml_ports.end(); ++it) {
                if ((prop = (*it)->property ("name"))) {
index 201abb934be93a08344db3a5d86a410a43907dec..efeb3398e52127ce412daf07ba6c9fe3fd6ef26a 100644 (file)
@@ -107,7 +107,7 @@ int
 ExportFilename::set_state (const XMLNode & node)
 {
        XMLNode * child;
-       XMLProperty * prop;
+       XMLProperty const * prop;
        FieldPair pair;
 
        child = node.child ("Folder");
@@ -372,7 +372,7 @@ ExportFilename::get_field (XMLNode const & node, string const & name)
        XMLNodeList children = node.children();
 
        for (XMLNodeList::iterator it = children.begin(); it != children.end(); ++it) {
-               XMLProperty * prop = (*it)->property ("name");
+               XMLProperty const * prop = (*it)->property ("name");
                if (prop && !prop->value().compare (name)) {
 
                        prop = (*it)->property ("enabled");
index 6b0e2f237f8bb5e23ad32bc562daa47071056462..6183d0d2bf6fcffcaf22d0f2a3d6c6d66d943eac 100644 (file)
@@ -700,7 +700,7 @@ ExportFormatSpecification::get_option (XMLNode const * node, std::string const &
        XMLNodeList list (node->children ("Option"));
 
        for (XMLNodeList::iterator it = list.begin(); it != list.end(); ++it) {
-               XMLProperty * prop = (*it)->property ("name");
+               XMLProperty const * prop = (*it)->property ("name");
                if (prop && !name.compare (prop->value())) {
                        prop = (*it)->property ("value");
                        if (prop) {
index c6bae093c40ebf6fa4a5ca9938342256920d3ee5..dec4c4b79a63200753444e39c4788b0ee4d06cd5 100644 (file)
@@ -30,7 +30,7 @@ ExportPreset::ExportPreset (string filename, Session & s) :
 {
        XMLNode * root;
        if ((root = global.root())) {
-               XMLProperty * prop;
+               XMLProperty const * prop;
                if ((prop = root->property ("id"))) {
                        set_id (prop->value());
                }
@@ -124,7 +124,7 @@ ExportPreset::get_instant_xml () const
        if ((instant_xml = session.instant_xml ("ExportPresets"))) {
                XMLNodeList children = instant_xml->children ("ExportPreset");
                for (XMLNodeList::iterator it = children.begin(); it != children.end(); ++it) {
-                       XMLProperty * prop;
+                       XMLProperty const * prop;
                        if ((prop = (*it)->property ("id")) && _id == PBD::UUID(prop->value())) {
                                return *it;
                        }
index 932b99057a89b6c63c56c7c82dd01d4169c10190..717f1e305c43cf455b9b2f69ec514f2d3e4f5c21 100644 (file)
@@ -701,7 +701,7 @@ ExportProfileManager::init_formats (XMLNodeList nodes)
 ExportProfileManager::FormatStatePtr
 ExportProfileManager::deserialize_format (XMLNode & root)
 {
-       XMLProperty * prop;
+       XMLProperty const * prop;
        PBD::UUID id;
 
        if ((prop = root.property ("id"))) {
index 3ec561d66718f103db1dd1ed7c3d56619676e3c9..c148c6dd82e8fa87b707e52dede1ea3183e8dd14 100644 (file)
@@ -140,7 +140,7 @@ FileSource::init (const string& pathstr, bool must_exist)
 int
 FileSource::set_state (const XMLNode& node, int /*version*/)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if ((prop = node.property (X_("channel"))) != 0) {
                _channel = atoi (prop->value());
index 88705359395ee043df501ecc4d5420362bc7b25d..1c42993d4fa91247b2cce263507c4f4a58c939d0 100644 (file)
@@ -274,7 +274,7 @@ InternalSend::get_state()
 int
 InternalSend::set_state (const XMLNode& node, int version)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        init_gain ();
 
index 87bac6b8f49beac392913cf55c7ec2a61fdc2798..642b2a04351403ab8ef1e6c5ea2dba7f2cf91527 100644 (file)
@@ -595,7 +595,7 @@ IO::set_state (const XMLNode& node, int version)
         */
        assert (version >= 3000);
 
-       const XMLProperty* prop;
+       XMLProperty const * prop;
        XMLNodeConstIterator iter;
        LocaleGuard lg (X_("C"));
 
@@ -656,7 +656,7 @@ IO::set_state (const XMLNode& node, int version)
 int
 IO::set_state_2X (const XMLNode& node, int version, bool in)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
        XMLNodeConstIterator iter;
        LocaleGuard lg (X_("C"));
 
@@ -928,7 +928,7 @@ IO::make_connections (const XMLNode& node, int version, bool in)
                return make_connections_2X (node, version, in);
        }
 
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        for (XMLNodeConstIterator i = node.children().begin(); i != node.children().end(); ++i) {
 
@@ -989,7 +989,7 @@ IO::prepare_for_reset (XMLNode& node, const std::string& name)
           the name of the thing we're applying it to.
        */
 
-       XMLProperty* prop;
+       XMLProperty * prop;
        XMLNodeList children = node.children();
 
        for (XMLNodeIterator i = children.begin(); i != children.end(); ++i) {
@@ -1020,7 +1020,7 @@ IO::prepare_for_reset (XMLNode& node, const std::string& name)
 int
 IO::make_connections_2X (const XMLNode& node, int /*version*/, bool in)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        /* XXX: bundles ("connections" as was) */
 
@@ -1596,7 +1596,7 @@ IO::bundle_channel_name (uint32_t c, uint32_t n, DataType t) const
 string
 IO::name_from_state (const XMLNode& node)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if ((prop = node.property ("name")) != 0) {
                return prop->value();
index 6a6f09bbe21b5787f11d9a3ef215d0b0d394a330..955447a3869f67390994088f7e50350278e6282a 100644 (file)
@@ -147,7 +147,7 @@ IOProcessor::set_state (const XMLNode& node, int version)
                return set_state_2X (node, version);
        }
 
-       const XMLProperty *prop;
+       XMLProperty const * prop;
        const XMLNode *io_node = 0;
 
        Processor::set_state(node, version);
@@ -170,7 +170,7 @@ IOProcessor::set_state (const XMLNode& node, int version)
 
        if (_own_input && _input) {
                for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-                       const XMLProperty* prop;
+                       XMLProperty const * prop;
                        if ((prop = (*niter)->property ("name")) != 0) {
                                if (_name == prop->value()) {
                                        if ((prop = (*niter)->property ("direction")) != 0) {
@@ -200,7 +200,7 @@ IOProcessor::set_state (const XMLNode& node, int version)
        if (_own_output && _output) {
                for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
                        if ((*niter)->name() == "IO") {
-                               const XMLProperty* prop;
+                               XMLProperty const * prop;
                                if ((prop = (*niter)->property ("name")) != 0) {
                                        if (_name == prop->value()) {
                                                if ((prop = (*niter)->property ("direction")) != 0) {
index d0d3ad57ba2d98eaade5050c057c8de2128899b7..a80c2797c6b0083435bc0b325eb2b5e0e178f2d9 100644 (file)
@@ -374,7 +374,7 @@ LadspaPlugin::set_state (const XMLNode& node, int version)
 
 #ifndef NO_PLUGIN_STATE
        XMLNodeList nodes;
-       XMLProperty *prop;
+       XMLProperty const * prop;
        XMLNodeConstIterator iter;
        XMLNode *child;
        const char *port;
@@ -424,7 +424,7 @@ LadspaPlugin::set_state_2X (const XMLNode& node, int /* version */)
 {
 #ifndef NO_PLUGIN_STATE
        XMLNodeList nodes;
-       XMLProperty *prop;
+       XMLProperty const * prop;
        XMLNodeConstIterator iter;
        XMLNode *child;
        const char *port;
index 1b63ce4431cf3b86f8ceefe8afa824088a37734d..0820660db6cf201d978e42ab3ca361303686bf42 100644 (file)
@@ -598,7 +598,7 @@ Location::get_state ()
 int
 Location::set_state (const XMLNode& node, int version)
 {
-       const XMLProperty *prop;
+       XMLProperty const * prop;
 
        XMLNodeList cd_list = node.children();
        XMLNodeConstIterator cd_iter;
index af9e8503da7c39bb313302120c39db40b002b367..1ab93e4d15db6ad81f4fecfebd0bb1f933b1c562 100644 (file)
@@ -776,7 +776,7 @@ LuaProc::set_state (const XMLNode& node, int version)
 {
 #ifndef NO_PLUGIN_STATE
        XMLNodeList nodes;
-       XMLProperty *prop;
+       XMLProperty const * prop;
        XMLNodeConstIterator iter;
        XMLNode *child;
        const char *value;
@@ -1067,7 +1067,7 @@ LuaProc::load_preset (PresetRecord r)
 
        XMLNode* root = t->root ();
        for (XMLNodeList::const_iterator i = root->children().begin(); i != root->children().end(); ++i) {
-               XMLProperty* label = (*i)->property (X_("label"));
+               XMLProperty const * label = (*i)->property (X_("label"));
                assert (label);
                if (label->value() != r.label) {
                        continue;
@@ -1075,8 +1075,8 @@ LuaProc::load_preset (PresetRecord r)
 
                for (XMLNodeList::const_iterator j = (*i)->children().begin(); j != (*i)->children().end(); ++j) {
                        if ((*j)->name() == X_("Parameter")) {
-                               XMLProperty* index = (*j)->property (X_("index"));
-                               XMLProperty* value = (*j)->property (X_("value"));
+                               XMLProperty const * index = (*j)->property (X_("index"));
+                               XMLProperty const * value = (*j)->property (X_("value"));
                                assert (index);
                                assert (value);
                                set_parameter (atoi (index->value().c_str()), atof (value->value().c_str ()));
@@ -1139,8 +1139,8 @@ LuaProc::find_presets ()
                XMLNode* root = t->root ();
                for (XMLNodeList::const_iterator i = root->children().begin(); i != root->children().end(); ++i) {
 
-                       XMLProperty* uri = (*i)->property (X_("uri"));
-                       XMLProperty* label = (*i)->property (X_("label"));
+                       XMLProperty const * uri = (*i)->property (X_("uri"));
+                       XMLProperty const * label = (*i)->property (X_("label"));
 
                        assert (uri);
                        assert (label);
@@ -1207,8 +1207,8 @@ LuaPluginInfo::get_presets (bool /*user_only*/) const
                if (t->read ()) {
                        XMLNode* root = t->root ();
                        for (XMLNodeList::const_iterator i = root->children().begin(); i != root->children().end(); ++i) {
-                               XMLProperty* uri = (*i)->property (X_("uri"));
-                               XMLProperty* label = (*i)->property (X_("label"));
+                               XMLProperty const * uri = (*i)->property (X_("uri"));
+                               XMLProperty const * label = (*i)->property (X_("label"));
                                p.push_back (Plugin::PresetRecord (uri->value(), label->value(), true));
                        }
                }
index dd5292eb5ad9c39ef5aa18988fe4c76173b2e45a..908b6b49f973b159d09516ae9acf34ab468f4d79 100644 (file)
@@ -1800,7 +1800,7 @@ int
 LV2Plugin::set_state(const XMLNode& node, int version)
 {
        XMLNodeList          nodes;
-       const XMLProperty*   prop;
+       XMLProperty const * prop;
        XMLNodeConstIterator iter;
        XMLNode*             child;
        const char*          sym;
index 2c50144f26f24e8acace6c494f77de5165ec12a0..4b32e47bb5672e12874be7e9b7a1b4feadf59da6 100644 (file)
@@ -150,8 +150,8 @@ LXVSTPluginInfo::get_presets (bool user_only) const
                if (t->read ()) { // TODO read names only. skip parsing the actual data
                        XMLNode* root = t->root ();
                        for (XMLNodeList::const_iterator i = root->children().begin(); i != root->children().end(); ++i) {
-                               XMLProperty* uri = (*i)->property (X_("uri"));
-                               XMLProperty* label = (*i)->property (X_("label"));
+                               XMLProperty const * uri = (*i)->property (X_("uri"));
+                               XMLProperty const * label = (*i)->property (X_("label"));
                                p.push_back (Plugin::PresetRecord (uri->value(), label->value(), true));
                        }
                }
index f7249d72b1e1b95303bc33e28ca3fd6269d76674..b01155b7391719ce4a5dd1b86a8b140f1bb3077b 100644 (file)
@@ -35,10 +35,10 @@ MidiAutomationListBinder::MidiAutomationListBinder (boost::shared_ptr<MidiSource
 MidiAutomationListBinder::MidiAutomationListBinder (XMLNode* node, Session::SourceMap const & sources)
        : _parameter (0, 0, 0)
 {
-       XMLProperty* source = node->property ("source-id");
+       XMLProperty const * source = node->property ("source-id");
        assert (source);
 
-       XMLProperty* parameter = node->property ("parameter");
+       XMLProperty const * parameter = node->property ("parameter");
        assert (parameter);
 
        Session::SourceMap::const_iterator i = sources.find (PBD::ID (source->value()));
index 1950fbeb190d2a6e519be494557ebc5c5d1a6f67..b5e93ae494e829a719a9b4e0a48496c5920ded1f 100644 (file)
@@ -491,7 +491,7 @@ Evoral::Sequence<MidiModel::TimeType>::NotePtr
 MidiModel::NoteDiffCommand::unmarshal_note (XMLNode *xml_note)
 {
        unsigned int note;
-       XMLProperty* prop;
+       XMLProperty const * prop;
        unsigned int channel;
        MidiModel::TimeType time;
        MidiModel::TimeType length;
@@ -599,7 +599,7 @@ MidiModel::NoteDiffCommand::marshal_change (const NoteChange& change)
 MidiModel::NoteDiffCommand::NoteChange
 MidiModel::NoteDiffCommand::unmarshal_change (XMLNode *xml_change)
 {
-       XMLProperty* prop;
+       XMLProperty const * prop;
        NoteChange change;
        change.note_id = 0;
 
@@ -876,7 +876,7 @@ MidiModel::SysExDiffCommand::marshal_change (const Change& change)
 MidiModel::SysExDiffCommand::Change
 MidiModel::SysExDiffCommand::unmarshal_change (XMLNode *xml_change)
 {
-       XMLProperty* prop;
+       XMLProperty const * prop;
        Change change;
 
        if ((prop = xml_change->property ("property")) != 0) {
@@ -1235,8 +1235,8 @@ MidiModel::PatchChangeDiffCommand::marshal_change (const Change& c)
 MidiModel::PatchChangePtr
 MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n)
 {
-       XMLProperty* prop;
-       XMLProperty* prop_id;
+       XMLProperty const * prop;
+       XMLProperty const * prop_id;
        Evoral::event_id_t id = 0;
        Evoral::Beats time = Evoral::Beats();
        int channel = 0;
@@ -1277,7 +1277,7 @@ MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n)
 MidiModel::PatchChangeDiffCommand::Change
 MidiModel::PatchChangeDiffCommand::unmarshal_change (XMLNode* n)
 {
-       XMLProperty* prop;
+       XMLProperty const * prop;
        Change c;
        int an_int;
 
index 7adbe70ff3d4cde1a43e47397cb78d8a73216db6..5402664ed1fcd3b045911d8e4af02a85cf47e6e8 100644 (file)
@@ -48,7 +48,7 @@ MidiPlaylist::MidiPlaylist (Session& session, const XMLNode& node, bool hidden)
        , _read_end(0)
 {
 #ifndef NDEBUG
-       const XMLProperty* prop = node.property("type");
+       XMLProperty const * prop = node.property("type");
        assert(prop && DataType(prop->value()) == DataType::MIDI);
 #endif
 
index ed0729b0710ec282ffad5da28fb8136874f7ec85..9304a6432322539acf417fbabca6e169ec57d219 100644 (file)
@@ -123,7 +123,7 @@ MIDISceneChange::set_state (const XMLNode& node, int /* version-ignored */)
                return -1;
        }
 
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if ((prop = node.property (X_("program"))) == 0) {
                return -1;
index 0314a92c235901178fb3cf532e009554933886a7..b8afba6b3f0804d0770dbffbe7f946fd3ed8d310 100644 (file)
@@ -113,7 +113,7 @@ MidiSource::get_state ()
 int
 MidiSource::set_state (const XMLNode& node, int /*version*/)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
        if ((prop = node.property ("captured-for")) != 0) {
                _captured_for = prop->value();
        }
index da47fabc78c8a13f850396ecefb333f85587c796..3aba6bf39ec6ea5aaf91355703e3213773d211b5 100644 (file)
@@ -161,7 +161,7 @@ MidiTrack::midi_diskstream() const
 int
 MidiTrack::set_state (const XMLNode& node, int version)
 {
-       const XMLProperty *prop;
+       XMLProperty const * prop;
 
        /* This must happen before Track::set_state(), as there will be a buffer
           fill during that call, and we must fill buffers using the correct
@@ -272,7 +272,7 @@ void
 MidiTrack::set_state_part_two ()
 {
        XMLNode* fnode;
-       XMLProperty* prop;
+       XMLProperty const * prop;
        LocaleGuard lg (X_("C"));
 
        /* This is called after all session state has been restored but before
index 7f3f05a7db718cbf06410f09159538fb180e73d4..5b97b4090ae6a95a06e1e88022b05c5ac42b8ce8 100644 (file)
@@ -111,7 +111,7 @@ MidiPortManager::create_ports ()
 void
 MidiPortManager::set_midi_port_states (const XMLNodeList&nodes)
 {
-       XMLProperty* prop;
+       XMLProperty const * prop;
        typedef map<std::string,boost::shared_ptr<Port> > PortMap;
        PortMap ports;
        const int version = 0;
index 6b73af6e3157f9be2f6ec2932194801b93590f14..e8585c8da2ee00f18d2c42a353f7418b94f7a5d8 100644 (file)
@@ -112,7 +112,7 @@ MonitorProcessor::set_state (const XMLNode& node, int version)
                 return ret;
         }
 
-        const XMLProperty* prop;
+        XMLProperty const * prop;
 
         if ((prop = node.property (X_("type"))) == 0) {
                 error << string_compose (X_("programming error: %1"), X_("MonitorProcessor XML settings have no type information"))
index 8f81a5e672058f98fb4e92470c1deb86175f0c87..4b83d57a9b6f126a8f4089193504fd9a45891a4a 100644 (file)
@@ -136,7 +136,7 @@ MuteMaster::set_mute_points (MutePoint mp)
 int
 MuteMaster::set_state (const XMLNode& node, int /*version*/)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if ((prop = node.property ("mute-point")) != 0) {
                _mute_point = (MutePoint) string_2_enum (prop->value(), _mute_point);
index f589024435ed281f6953c82c08f8ecc363eda5ac..11fec12eca3300b8cf0380302bc836d9c5f3e5bb 100644 (file)
@@ -213,7 +213,7 @@ Pannable::set_state (const XMLNode& root, int version)
 
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
                if ((*niter)->name() == Controllable::xml_node_name) {
-                       const XMLProperty* prop = (*niter)->property (X_("name"));
+                       XMLProperty const * prop = (*niter)->property (X_("name"));
 
                        if (!prop) {
                                continue;
@@ -235,7 +235,7 @@ Pannable::set_state (const XMLNode& root, int version)
                        set_automation_xml_state (**niter, PanAzimuthAutomation);
 
                } else {
-                       const XMLProperty* prop;
+                       XMLProperty const * prop;
 
                        /* old school (alpha1-6) XML info */
 
index 1af0da0279fc873ff17d1b327b20cb899bc40cd6..606fc0ca00ff67ea8dab18eff5cb945b06f3121e 100644 (file)
@@ -171,7 +171,7 @@ PannerShell::set_state (const XMLNode& node, int version)
 {
        XMLNodeList nlist = node.children ();
        XMLNodeConstIterator niter;
-       const XMLProperty *prop;
+       XMLProperty const * prop;
        LocaleGuard lg (X_("C"));
 
        if ((prop = node.property (X_("bypassed"))) != 0) {
index e2d66c109a7a780a4185cdc40c47629d48873286..3301fe9f9ece1a7305f1a6bebd7f5d84af8b4825 100644 (file)
@@ -141,7 +141,7 @@ Playlist::Playlist (Session& sess, const XMLNode& node, DataType type, bool hide
        , _type(type)
 {
 #ifndef NDEBUG
-       const XMLProperty* prop = node.property("type");
+       XMLProperty const * prop = node.property("type");
        assert(!prop || DataType(prop->value()) == _type);
 #endif
 
@@ -2156,7 +2156,7 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir)
         XMLNodeConstIterator niter;
         XMLPropertyList plist;
         XMLPropertyConstIterator piter;
-        XMLProperty *prop;
+        XMLProperty const * prop;
         boost::shared_ptr<Region> region;
         string region_name;
         bool seen_region_nodes = false;
index 150ae6c3aca3de9956989042a347dbc7e6aea122..79bbfb02f36b35199137d00c52d8038ba33ab67f 100644 (file)
@@ -36,7 +36,7 @@ PBD::Signal2<void,boost::shared_ptr<Playlist>, bool> PlaylistFactory::PlaylistCr
 boost::shared_ptr<Playlist>
 PlaylistFactory::create (Session& s, const XMLNode& node, bool hidden, bool unused)
 {
-       const XMLProperty* type = node.property("type");
+       XMLProperty const * type = node.property("type");
 
        boost::shared_ptr<Playlist> pl;
 
index ed8735b86530c06b866858baa8c4ae1af179a9c6..8dc2bce418dbb0dc6b9aa1215dcbf95bdf8bcee5 100644 (file)
@@ -93,7 +93,7 @@ PlaylistSource::set_state (const XMLNode& node, int /*version*/)
 {
        /* check that we have a playlist ID */
 
-       const XMLProperty *prop = node.property (X_("playlist"));
+       XMLProperty const * prop = node.property (X_("playlist"));
 
        if (!prop) {
                error << _("No playlist ID in PlaylistSource XML!") << endmsg;
index 7ae6eb6a0ce5579210441ae64f8c02bb1ea238d1..5a0ae808e13d74b97f67a5884712e7fd93239e88 100644 (file)
@@ -2006,7 +2006,7 @@ PluginInsert::set_control_ids (const XMLNode& node, int version)
 
        for (iter = nlist.begin(); iter != nlist.end(); ++iter) {
                if ((*iter)->name() == Controllable::xml_node_name) {
-                       const XMLProperty* prop;
+                       XMLProperty const * prop;
 
                        uint32_t p = (uint32_t)-1;
 #ifdef LV2_SUPPORT
@@ -2047,7 +2047,7 @@ PluginInsert::set_state(const XMLNode& node, int version)
        XMLNodeList nlist = node.children();
        XMLNodeIterator niter;
        XMLPropertyList plist;
-       const XMLProperty *prop;
+       XMLProperty const * prop;
        ARDOUR::PluginType type;
 
        if ((prop = node.property ("type")) == 0) {
@@ -2329,7 +2329,7 @@ PluginInsert::set_parameter_state_2X (const XMLNode& node, int version)
                }
 
                XMLNodeList cnodes;
-               XMLProperty *cprop;
+               XMLProperty const * cprop;
                XMLNodeConstIterator iter;
                XMLNode *child;
                const char *port;
index 7888167a70e8ea23c32a2d075ada1f92ffba85dc..61313f371cb965004063b33e65b2e965dbcd10d6 100644 (file)
@@ -587,7 +587,7 @@ Port::get_state () const
 int
 Port::set_state (const XMLNode& node, int)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if (node.name() != state_node_name) {
                return -1;
index ce34048dde05737da28c4422ed942946e8bea5c5..8ec5ead530b66da5b1e41b83dc7854db58e91178 100644 (file)
@@ -186,7 +186,7 @@ PortInsert::set_state (const XMLNode& node, int version)
        XMLNodeList nlist = node.children();
        XMLNodeIterator niter;
        XMLPropertyList plist;
-       const XMLProperty *prop;
+       XMLProperty const * prop;
 
        const XMLNode* insert_node = &node;
 
index d3ffe152cb7d24534cf2c742fcac553c5a86a221..f13edb516532c7bfa84cf79d2422e8d495884dee 100644 (file)
@@ -180,8 +180,8 @@ Processor::set_state (const XMLNode& node, int version)
                return set_state_2X (node, version);
        }
 
-       const XMLProperty *prop;
-       const XMLProperty *legacy_active = 0;
+       XMLProperty const * prop;
+       XMLProperty const * legacy_active = 0;
        bool leave_name_alone = (node.property ("ignore-name") != 0);
 
        if (!leave_name_alone) {
@@ -205,7 +205,7 @@ Processor::set_state (const XMLNode& node, int version)
 
                if ((*niter)->name() == X_("Automation")) {
 
-                       XMLProperty *prop;
+                       XMLProperty const * prop;
 
                        if ((prop = (*niter)->property ("path")) != 0) {
                                old_set_automation_state (*(*niter));
index 753e578f6402e6e13bff0d3089d8819dfae7f7c0..bcc63af9d6cef78d276c1fe3e8702fe81ea36a68 100644 (file)
@@ -1260,7 +1260,7 @@ Region::set_state (const XMLNode& node, int version)
 int
 Region::_set_state (const XMLNode& node, int /*version*/, PropertyChange& what_changed, bool send)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        Stateful::save_extra_xml (node);
 
index db8156847957bb420488c42322ff22d1a2e4df54..9c0f19ab03f37081d39979295b8a767cec0674a1 100644 (file)
@@ -86,7 +86,7 @@ Return::set_state (const XMLNode& node, int version)
 {
        XMLNodeList nlist = node.children();
        XMLNodeIterator niter;
-       const XMLProperty* prop;
+       XMLProperty const * prop;
        const XMLNode* insert_node = &node;
 
        /* Return has regular IO automation (gain, pan) */
index 7cfcffdb37c338500fa2932ef9a478ca564f8ea1..5466cb5a843a58146bfe926f6b7fc065538d8d7a 100644 (file)
@@ -1362,7 +1362,7 @@ Route::processor_selfdestruct (boost::weak_ptr<Processor> wp)
 bool
 Route::add_processor_from_xml_2X (const XMLNode& node, int version)
 {
-       const XMLProperty *prop;
+       XMLProperty const * prop;
 
        try {
                boost::shared_ptr<Processor> processor;
@@ -2821,7 +2821,7 @@ Route::set_state (const XMLNode& node, int version)
        XMLNodeList nlist;
        XMLNodeConstIterator niter;
        XMLNode *child;
-       const XMLProperty *prop;
+       XMLProperty const * prop;
 
        if (node.name() != "Route"){
                error << string_compose(_("Bad node sent to Route::set_state() [%1]"), node.name()) << endmsg;
@@ -3044,7 +3044,7 @@ Route::set_state_2X (const XMLNode& node, int version)
        XMLNodeList nlist;
        XMLNodeConstIterator niter;
        XMLNode *child;
-       const XMLProperty *prop;
+       XMLProperty const * prop;
 
        /* 2X things which still remain to be handled:
         * default-type
@@ -3330,7 +3330,7 @@ Route::set_processor_state (const XMLNode& node)
 
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
 
-               XMLProperty* prop = (*niter)->property ("type");
+               XMLProperty const * prop = (*niter)->property ("type");
 
                if (prop->value() == "amp") {
                        _amp->set_state (**niter, Stateful::current_state_version);
@@ -3367,7 +3367,7 @@ Route::set_processor_state (const XMLNode& node)
                        ProcessorList::iterator o;
 
                        for (o = _processors.begin(); o != _processors.end(); ++o) {
-                               XMLProperty* id_prop = (*niter)->property(X_("id"));
+                               XMLProperty const * id_prop = (*niter)->property(X_("id"));
                                if (id_prop && (*o)->id() == id_prop->value()) {
                                        (*o)->set_state (**niter, Stateful::current_state_version);
                                        new_order.push_back (*o);
@@ -4585,7 +4585,7 @@ Route::set_name_in_state (XMLNode& node, string const & name, bool rename_playli
 
                } else if ((*i)->name() == X_("Processor")) {
 
-                       XMLProperty* role = (*i)->property (X_("role"));
+                       XMLProperty const * role = (*i)->property (X_("role"));
                        if (role && role->value() == X_("Main")) {
                                (*i)->add_property (X_("name"), name);
                        }
index 9ad5aa91e6cfc16fd7caa47b0ad91446707b42c7..b482bb85d32fa704b6507c9317044577e426914f 100644 (file)
@@ -249,7 +249,7 @@ RouteGroup::set_state (const XMLNode& node, int version)
                return set_state_2X (node, version);
        }
 
-       const XMLProperty *prop;
+       XMLProperty const * prop;
 
        set_id (node);
        set_values (node);
index aed899565fbbed97aefea12e1fdae97c47bdc910..dcf83951cd2acdf6b51a0ceaca60b5d64925bee9 100644 (file)
@@ -30,7 +30,7 @@ const uint32_t SceneChange::out_of_bound_color = 0x00000000; /* note: zero alpha
 boost::shared_ptr<SceneChange>
 SceneChange::factory (const XMLNode& node, int version)
 {
-       const XMLProperty* prop = node.property (X_("type"));
+       XMLProperty const * prop = node.property (X_("type"));
 
        if (prop->value() == X_("MIDI")) {
                return boost::shared_ptr<SceneChange> (new MIDISceneChange (node, version));
index ebe8c46c8f9f0061e981f02ef361ae1a807a0d39..6ebaaf28b35c72066f750a46e623abeea0a54342 100644 (file)
@@ -239,7 +239,7 @@ Send::set_state (const XMLNode& node, int version)
                return set_state_2X (node, version);
        }
 
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        Delivery::set_state (node, version);
 
index 718b68279dd8af54322525fd462e7324fea0e8d9..0a402a3b2d5bf4cbb9ec8f9a14a3a0b2b61b0454 100644 (file)
@@ -381,8 +381,9 @@ Session::Session (AudioEngine &eng,
                 */
 
                if (state_tree) {
-                       const XMLProperty* prop;
-                       if ((prop = state_tree->root()->property (X_("sample-rate"))) != 0) {
+                       XMLProperty const * prop;
+                       XMLNode const * root (state_tree->root());
+                       if ((prop = root->property (X_("sample-rate"))) != 0) {
                                sr = atoi (prop->value());
                        }
                }
@@ -3221,13 +3222,13 @@ Session::new_route_from_template (uint32_t how_many, XMLNode& node, const std::s
                        for (XMLNodeList::iterator i = children.begin(); i != children.end(); ++i) {
                                if ((*i)->name() == X_("Processor")) {
                                        /* ForceIDRegeneration does not catch the following */
-                                       XMLProperty* role = (*i)->property (X_("role"));
-                                       XMLProperty* type = (*i)->property (X_("type"));
+                                       XMLProperty const * role = (*i)->property (X_("role"));
+                                       XMLProperty const * type = (*i)->property (X_("type"));
                                        if (role && role->value() == X_("Aux")) {
                                                /* check if the target bus exists.
                                                 * we should not save aux-sends in templates.
                                                 */
-                                               XMLProperty* target = (*i)->property (X_("target"));
+                                               XMLProperty const * target = (*i)->property (X_("target"));
                                                if (!target) {
                                                        (*i)->add_property ("type", "dangling-aux-send");
                                                        continue;
index d495d0b701ca61d8d0012d29b177796d1418046a..4afac073fdaee1d77cdf8df1444a366a25c75395 100644 (file)
@@ -949,7 +949,7 @@ Session::load_state (string snapshot_name)
                return -1;
        }
 
-       XMLNode& root (*state_tree->root());
+       XMLNode const & root (*state_tree->root());
 
        if (root.name() != X_("Session")) {
                error << string_compose (_("Session file %1 is not a session"), xmlpath) << endmsg;
@@ -958,7 +958,7 @@ Session::load_state (string snapshot_name)
                return -1;
        }
 
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if ((prop = root.property ("version")) == 0) {
                /* no version implies very old version of Ardour */
@@ -1298,7 +1298,7 @@ Session::set_state (const XMLNode& node, int version)
 {
        XMLNodeList nlist;
        XMLNode* child;
-       const XMLProperty* prop;
+       XMLProperty const * prop;
        int ret = -1;
 
        _state_of_the_state = StateOfTheState (_state_of_the_state|CannotSave);
@@ -1581,7 +1581,7 @@ Session::XMLRouteFactory (const XMLNode& node, int version)
        XMLNode* ds_child = find_named_node (node, X_("Diskstream"));
 
        DataType type = DataType::AUDIO;
-       const XMLProperty* prop = node.property("default-type");
+       XMLProperty const * prop = node.property("default-type");
 
        if (prop) {
                type = DataType (prop->value());
@@ -1614,7 +1614,7 @@ Session::XMLRouteFactory (const XMLNode& node, int version)
 
        } else {
                enum Route::Flag flags = Route::Flag(0);
-               const XMLProperty* prop = node.property("flags");
+               XMLProperty const * prop = node.property("flags");
                if (prop) {
                        flags = Route::Flag (string_2_enum (prop->value(), flags));
                }
@@ -1647,7 +1647,7 @@ Session::XMLRouteFactory_2X (const XMLNode& node, int version)
        }
 
        DataType type = DataType::AUDIO;
-       const XMLProperty* prop = node.property("default-type");
+       XMLProperty const * prop = node.property("default-type");
 
        if (prop) {
                type = DataType (prop->value());
@@ -1692,7 +1692,7 @@ Session::XMLRouteFactory_2X (const XMLNode& node, int version)
 
        } else {
                enum Route::Flag flags = Route::Flag(0);
-               const XMLProperty* prop = node.property("flags");
+               XMLProperty const * prop = node.property("flags");
                if (prop) {
                        flags = Route::Flag (string_2_enum (prop->value(), flags));
                }
@@ -1724,7 +1724,7 @@ Session::load_regions (const XMLNode& node)
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
                if ((region = XMLRegionFactory (**niter, false)) == 0) {
                        error << _("Session: cannot create Region from XML description.");
-                       const XMLProperty *name = (**niter).property("name");
+                       XMLProperty const * name = (**niter).property("name");
 
                        if (name) {
                                error << " " << string_compose (_("Can not load state for region '%1'"), name->value());
@@ -1742,7 +1742,7 @@ Session::load_compounds (const XMLNode& node)
 {
        XMLNodeList calist = node.children();
        XMLNodeConstIterator caiter;
-       XMLProperty *caprop;
+       XMLProperty const * caprop;
 
        for (caiter = calist.begin(); caiter != calist.end(); ++caiter) {
                XMLNode* ca = *caiter;
@@ -1789,7 +1789,7 @@ Session::load_nested_sources (const XMLNode& node)
                        /* it may already exist, so don't recreate it unnecessarily
                         */
 
-                       XMLProperty* prop = (*niter)->property (X_("id"));
+                       XMLProperty const * prop = (*niter)->property (X_("id"));
                        if (!prop) {
                                error << _("Nested source has no ID info in session file! (ignored)") << endmsg;
                                continue;
@@ -1813,7 +1813,7 @@ Session::load_nested_sources (const XMLNode& node)
 boost::shared_ptr<Region>
 Session::XMLRegionFactory (const XMLNode& node, bool full)
 {
-       const XMLProperty* type = node.property("type");
+       XMLProperty const * type = node.property("type");
 
        try {
 
@@ -1842,7 +1842,7 @@ Session::XMLRegionFactory (const XMLNode& node, bool full)
 boost::shared_ptr<AudioRegion>
 Session::XMLAudioRegionFactory (const XMLNode& node, bool /*full*/)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
        boost::shared_ptr<Source> source;
        boost::shared_ptr<AudioSource> as;
        SourceList sources;
@@ -1961,7 +1961,7 @@ Session::XMLAudioRegionFactory (const XMLNode& node, bool /*full*/)
 boost::shared_ptr<MidiRegion>
 Session::XMLMidiRegionFactory (const XMLNode& node, bool /*full*/)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
        boost::shared_ptr<Source> source;
        boost::shared_ptr<MidiSource> ms;
        SourceList sources;
@@ -2793,7 +2793,7 @@ Session::find_all_sources (string path, set<string>& result)
 
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
 
-               XMLProperty* prop;
+               XMLProperty const * prop;
 
                if ((prop = (*niter)->property (X_("type"))) == 0) {
                        continue;
@@ -4230,27 +4230,29 @@ Session::get_info_from_path (const string& xmlpath, float& sample_rate, SampleFo
 
        /* sample rate */
 
-       const XMLProperty* prop;
-       if ((prop = tree.root()->property (X_("sample-rate"))) != 0) {
+       XMLProperty const * prop;
+       XMLNode const * root (tree.root());
+
+       if ((prop = root->property (X_("sample-rate"))) != 0) {
                sample_rate = atoi (prop->value());
                found_sr = true;
        }
 
-       const XMLNodeList& children (tree.root()->children());
+       const XMLNodeList& children (root->children());
        for (XMLNodeList::const_iterator c = children.begin(); c != children.end(); ++c) {
                const XMLNode* child = *c;
                if (child->name() == "Config") {
                        const XMLNodeList& options (child->children());
                        for (XMLNodeList::const_iterator oc = options.begin(); oc != options.end(); ++oc) {
-                               const XMLNode* option = *oc;
-                               const XMLProperty* name = option->property("name");
+                               XMLNode const * option = *oc;
+                               XMLProperty const * name = option->property("name");
 
                                if (!name) {
                                        continue;
                                }
 
                                if (name->value() == "native-file-data-format") {
-                                       const XMLProperty* value = option->property ("value");
+                                       XMLProperty const * value = option->property ("value");
                                        if (value) {
                                                SampleFormat fmt = (SampleFormat) string_2_enum (option->property ("value")->value(), fmt);
                                                data_format = fmt;
@@ -4282,7 +4284,7 @@ Session::get_snapshot_from_instant (const std::string& session_dir)
                return "";
        }
 
-       const XMLProperty* prop;
+       XMLProperty const * prop;
        XMLNode *last_used_snapshot = tree.root()->child("LastUsedSnapshot");
        if (last_used_snapshot && (prop = last_used_snapshot->property ("name")) != 0) {
                return prop->value();
index aaa50ff2973aaaa79039011f7c3e043c14dc247a..ee32e508e2c46b4853f242c14527ce8bb51c5e5b 100644 (file)
@@ -113,7 +113,7 @@ Source::get_state ()
 int
 Source::set_state (const XMLNode& node, int version)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if ((prop = node.property ("name")) != 0) {
                _name = prop->value();
index 76975354cbc9dded29d0de2df11f9f70158c4f5e..45b39802cbd4334a7717a4de0adcd2cd39c89968 100644 (file)
@@ -150,7 +150,7 @@ boost::shared_ptr<Source>
 SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
 {
        DataType type = DataType::AUDIO;
-       const XMLProperty* prop = node.property("type");
+       XMLProperty const * prop = node.property("type");
 
        if (prop) {
                type = DataType (prop->value());
index 7c7b02f0cc796ab4bbda3b637d8f186aac1e289e..7abdaf3a42f9a696bb4c2e93ada05d452326fe37 100644 (file)
@@ -267,7 +267,7 @@ int
 Speakers::set_state (const XMLNode& node, int /*version*/)
 {
         XMLNodeConstIterator i;
-        const XMLProperty* prop;
+        XMLProperty const * prop;
         double a, e, d;
         LocaleGuard lg (X_("C"));
         int n = 0;
index 2a0ac50cc2759d31ce19b1caf5f4f84122b87ec2..31e2f9a6117737ac9b9d73a3158867308c2d71f4 100644 (file)
@@ -72,7 +72,7 @@ const string TempoSection::xml_state_node_name = "Tempo";
 TempoSection::TempoSection (const XMLNode& node)
        : MetricSection (BBT_Time()), Tempo (TempoMap::default_tempo())
 {
-       const XMLProperty *prop;
+       XMLProperty const * prop;
        BBT_Time start;
        LocaleGuard lg (X_("C"));
 
@@ -194,7 +194,7 @@ const string MeterSection::xml_state_node_name = "Meter";
 MeterSection::MeterSection (const XMLNode& node)
        : MetricSection (BBT_Time()), Meter (TempoMap::default_meter())
 {
-       const XMLProperty *prop;
+       XMLProperty const * prop;
        BBT_Time start;
        LocaleGuard lg (X_("C"));
 
index f279eae3069cbab3dfcedad52c45868b2357c238..ac9b616ffb16c16c75db62101a5776dc191a56dd 100644 (file)
@@ -134,7 +134,7 @@ Track::set_state (const XMLNode& node, int version)
        for (XMLNodeConstIterator niter = nlist.begin(); niter != nlist.end(); ++niter) {
                child = *niter;
 
-               XMLProperty* prop;
+               XMLProperty const * prop;
                if (child->name() == Controllable::xml_node_name && (prop = child->property ("name")) != 0) {
                        if (prop->value() == X_("recenable")) {
                                _rec_enable_control->set_state (*child, version);
@@ -142,7 +142,7 @@ Track::set_state (const XMLNode& node, int version)
                }
        }
 
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if ((prop = node.property (X_("monitoring"))) != 0) {
                _monitoring = MonitorChoice (string_2_enum (prop->value(), _monitoring));
index 4c2f0f9b154a7279418da67bd2aa4559cd9a0170..1afdc27b670123bfb5e9bdd6cf381f24379bdb89 100644 (file)
@@ -377,7 +377,7 @@ VSTPlugin::load_user_preset (PresetRecord r)
        XMLNode* root = t->root ();
 
        for (XMLNodeList::const_iterator i = root->children().begin(); i != root->children().end(); ++i) {
-               XMLProperty* label = (*i)->property (X_("label"));
+               XMLProperty const * label = (*i)->property (X_("label"));
 
                assert (label);
 
@@ -411,8 +411,8 @@ VSTPlugin::load_user_preset (PresetRecord r)
 
                        for (XMLNodeList::const_iterator j = (*i)->children().begin(); j != (*i)->children().end(); ++j) {
                                if ((*j)->name() == X_("Parameter")) {
-                                               XMLProperty* index = (*j)->property (X_("index"));
-                                               XMLProperty* value = (*j)->property (X_("value"));
+                                               XMLProperty const * index = (*j)->property (X_("index"));
+                                               XMLProperty const * value = (*j)->property (X_("value"));
 
                                                assert (index);
                                                assert (value);
@@ -704,8 +704,8 @@ VSTPlugin::find_presets ()
                XMLNode* root = t->root ();
                for (XMLNodeList::const_iterator i = root->children().begin(); i != root->children().end(); ++i) {
 
-                       XMLProperty* uri = (*i)->property (X_("uri"));
-                       XMLProperty* label = (*i)->property (X_("label"));
+                       XMLProperty const * uri = (*i)->property (X_("uri"));
+                       XMLProperty const * label = (*i)->property (X_("label"));
 
                        assert (uri);
                        assert (label);
index a480642e3afbb030d2d99bc0d8b7db12fbd0fa24..9dec5ea7724be2c029148398af3fde99003c7680 100644 (file)
@@ -115,8 +115,8 @@ WindowsVSTPluginInfo::get_presets (bool user_only) const
                if (t->read ()) {
                        XMLNode* root = t->root ();
                        for (XMLNodeList::const_iterator i = root->children().begin(); i != root->children().end(); ++i) {
-                               XMLProperty* uri = (*i)->property (X_("uri"));
-                               XMLProperty* label = (*i)->property (X_("label"));
+                               XMLProperty const * uri = (*i)->property (X_("uri"));
+                               XMLProperty const * label = (*i)->property (X_("label"));
                                p.push_back (Plugin::PresetRecord (uri->value(), label->value(), true));
                        }
                }
index 7b52882f5f2ce2f5cd70abf97c8d0461a3e32445..deac345418e76d2e274662fe07b19749b218c22f 100644 (file)
@@ -709,13 +709,14 @@ Bindings::load_operation (XMLNode const& node)
 
                for (XMLNodeList::const_iterator p = children.begin(); p != children.end(); ++p) {
 
-                       XMLProperty* ap;
-                       XMLProperty* kp;
-                       XMLProperty* bp;
-
-                       ap = (*p)->property ("action");
-                       kp = (*p)->property ("key");
-                       bp = (*p)->property ("button");
+                       XMLProperty const * ap;
+                       XMLProperty const * kp;
+                       XMLProperty const * bp;
+                       XMLNode const * child = *p;
+
+                       ap = child->property ("action");
+                       kp = child->property ("key");
+                       bp = child->property ("button");
 
                        if (!ap || (!kp && !bp)) {
                                continue;
index 7975fdebd7f225708cff35e85fd54e4396c21940..983edbd0cf0cde30bf4c4c52e2dc50af383aaeec 100644 (file)
@@ -215,7 +215,7 @@ Keyboard::get_state (void)
 int
 Keyboard::set_state (const XMLNode& node, int /*version*/)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if ((prop = node.property ("copy-modifier")) != 0) {
                sscanf (prop->value().c_str(), "%d", &CopyModifier);
@@ -702,8 +702,9 @@ Keyboard::read_keybindings (string const & path)
        XMLNodeList const& children = tree.root()->children();
 
        for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
-               if ((*i)->name() == X_("Bindings")) {
-                       XMLProperty const* name = (*i)->property (X_("name"));
+               XMLNode const * child = *i;
+               if (child->name() == X_("Bindings")) {
+                       XMLProperty const* name = child->property (X_("name"));
                        if (!name) {
                                warning << _("Keyboard binding found without a name") << endmsg;
                                continue;
index e0058c11f4003b589bbb135a418f59e3d69a27c7..b84de2b10df77998aa02e78dd9e01f3857c55ece 100644 (file)
@@ -352,7 +352,7 @@ Tabbable::set_state (const XMLNode& node, int version)
        XMLNode* window_node = node.child ("Window");
 
        if (window_node) {
-               const XMLProperty* prop = window_node->property (X_("tabbed"));
+               XMLProperty const * prop = window_node->property (X_("tabbed"));
                if (prop) {
                        tab_requested_by_state = PBD::string_is_affirmative (prop->value());
                }
index dbe5c3dc5cce3912adc5b8106a2c9be445e49b26..c107bd988adb4b4a6c13d80e1395d617e6997f02 100644 (file)
@@ -286,7 +286,7 @@ void
 TearOff::set_state (const XMLNode& node)
 {
         Glib::RefPtr<Gdk::Window> win;
-        const XMLProperty* prop;
+        XMLProperty const * prop;
 
         if ((prop = node.property (X_("tornoff"))) == 0) {
                 return;
index d859c730c0f7f49d024b79969dcd0d486c67a00b..28ec4fb28d37b7d5a4eddb1cacf2b3fa251ce1bd 100644 (file)
@@ -84,12 +84,13 @@ int
 WindowProxy::set_state (const XMLNode& node, int /* version */)
 {
        XMLNodeList children = node.children ();
-
+       XMLNode const * child;
        XMLNodeList::const_iterator i = children.begin ();
 
        while (i != children.end()) {
-               XMLProperty* prop = (*i)->property (X_("name"));
-               if ((*i)->name() == X_("Window") && prop && prop->value() == _name) {
+               child = *i;
+               XMLProperty const * prop = child->property (X_("name"));
+               if (child->name() == X_("Window") && prop && prop->value() == _name) {
                        break;
                }
 
@@ -98,22 +99,23 @@ WindowProxy::set_state (const XMLNode& node, int /* version */)
 
        if (i != children.end()) {
 
-               XMLProperty* prop;
+               XMLProperty const * prop;
+               child = *i;
 
-               if ((prop = (*i)->property (X_("visible"))) != 0) {
+               if ((prop = child->property (X_("visible"))) != 0) {
                        _visible = PBD::string_is_affirmative (prop->value ());
                }
 
-               if ((prop = (*i)->property (X_("x-off"))) != 0) {
+               if ((prop = child->property (X_("x-off"))) != 0) {
                        _x_off = atoi (prop->value());
                }
-               if ((prop = (*i)->property (X_("y-off"))) != 0) {
+               if ((prop = child->property (X_("y-off"))) != 0) {
                        _y_off = atoi (prop->value());
                }
-               if ((prop = (*i)->property (X_("x-size"))) != 0) {
+               if ((prop = child->property (X_("x-size"))) != 0) {
                        _width = atoi (prop->value());
                }
-               if ((prop = (*i)->property (X_("y-size"))) != 0) {
+               if ((prop = child->property (X_("y-size"))) != 0) {
                        _height = atoi (prop->value());
                }
        }
index cacad87d9a29e048a6d59d2be66f4e7997eb8fa2..578114e92a55b32e1fcf5e53fedfb3797dab3e9d 100644 (file)
@@ -47,7 +47,7 @@ ConfigVariableBase::set_from_node (XMLNode const & node)
                const XMLProperty* prop;
                XMLNodeList nlist;
                XMLNodeConstIterator niter;
-               XMLNode* child;
+               XMLNode const * child;
 
                nlist = node.children();
 
index 0ba42b8e55a623a5a1fab3108c14a3ae7b3b556d..c97b4722aee6b6110b3539c7ae8357d312d88313 100644 (file)
@@ -236,8 +236,8 @@ public:
                if (i == children.end()) {
                        return 0;
                }
-               XMLProperty* from = (*i)->property ("from");
-               XMLProperty* to = (*i)->property ("to");
+               XMLProperty const * from = (*i)->property ("from");
+               XMLProperty const * to = (*i)->property ("to");
 
                if (!from || !to) {
                        return 0;
index 1f8b710f3f3e9973312808250e47d1399c008089..f0956edd259617584de6dc692080aad4de3ee9e2 100644 (file)
@@ -117,10 +117,10 @@ public:
        std::string attribute_value();
 
        const XMLPropertyList& properties() const { return _proplist; }
-       XMLProperty*       property(const char*);
-       XMLProperty*       property(const std::string&);
-       const XMLProperty* property(const char* n)   const { return const_cast<XMLNode*>(this)->property(n); }
-       const XMLProperty* property(const std::string& n) const { return const_cast<XMLNode*>(this)->property(n); }
+       XMLProperty const *    property(const char*) const;
+       XMLProperty const *    property(const std::string&) const;
+       XMLProperty *    property(const char*);
+       XMLProperty *    property(const std::string&);
 
        bool has_property_with_value (const std::string&, const std::string&) const;
 
index 580ad8dc8bcde649aff6a976588abdf20a4f19ba..80fc88242dc9884dc79b5351a10bcd37830c981c 100644 (file)
@@ -6,7 +6,10 @@
  */
 
 #include <iostream>
+
+#include "pbd/stacktrace.h"
 #include "pbd/xml++.h"
+
 #include <libxml/debugXML.h>
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
@@ -404,7 +407,32 @@ XMLNode::add_content(const string& c)
        return add_child_copy(XMLNode (string(), c));
 }
 
-XMLProperty*
+XMLProperty const *
+XMLNode::property(const char* n) const
+{
+       string ns(n);
+       map<string,XMLProperty*>::const_iterator iter;
+
+       if ((iter = _propmap.find(ns)) != _propmap.end()) {
+               return iter->second;
+       }
+
+       return 0;
+}
+
+XMLProperty const *
+XMLNode::property(const string& ns) const
+{
+       map<string,XMLProperty*>::const_iterator iter;
+
+       if ((iter = _propmap.find(ns)) != _propmap.end()) {
+               return iter->second;
+       }
+
+       return 0;
+}
+
+XMLProperty *
 XMLNode::property(const char* n)
 {
        string ns(n);
@@ -417,7 +445,7 @@ XMLNode::property(const char* n)
        return 0;
 }
 
-XMLProperty*
+XMLProperty *
 XMLNode::property(const string& ns)
 {
        map<string,XMLProperty*>::iterator iter;
@@ -534,7 +562,7 @@ void
 XMLNode::remove_nodes_and_delete(const string& propname, const string& val)
 {
        XMLNodeIterator i = _children.begin();
-       XMLProperty* prop;
+       XMLProperty const * prop;
 
        while (i != _children.end()) {
                prop = (*i)->property(propname);
index e319f65e1f8e0d1d6fc1488b9cc270dfb34b0b3d..ec6e82222f0916dba9ebd8d440bb656444ac6cde 100644 (file)
@@ -168,7 +168,7 @@ GenericMidiControlProtocol::reload_maps ()
 
                MapInfo mi;
 
-               XMLProperty* prop = tree.root()->property ("name");
+               XMLProperty const * prop = tree.root()->property ("name");
 
                if (!prop) {
                        continue;
index a898746112b84cbaef976722d78fd85be8836a08..1ee5d95e07d14d89114e771d04ff1759b7adf2fd 100644 (file)
@@ -867,7 +867,7 @@ MackieControlProtocol::create_surfaces ()
                        XMLNode* this_device = 0;
                        XMLNodeList const& devices = configuration_state->children();
                        for (XMLNodeList::const_iterator d = devices.begin(); d != devices.end(); ++d) {
-                               XMLProperty* prop = (*d)->property (X_("name"));
+                               XMLProperty const * prop = (*d)->property (X_("name"));
                                if (prop && prop->value() == _device_info.name()) {
                                        this_device = *d;
                                        break;