Use glibmm to simplify my earlier efforts with 'user_config_directory()' and 'user_ca...

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

diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc
index 6ef4327343069aa309950246dee9420190347c91..e046d5a830beda849f45ab7a77208f8de90a18ba 100644 (file)
--- a/libs/ardour/diskstream.cc
+++ b/libs/ardour/diskstream.cc
@@ -570,7 +570,7 @@ Diskstream::move_processor_automation (boost::weak_ptr<Processor> p, list< Evora
 
        set<Evoral::Parameter> const a = processor->what_can_be_automated ();
 
-       for (set<Evoral::Parameter>::iterator i = a.begin (); i != a.end (); ++i) {
+       for (set<Evoral::Parameter>::const_iterator i = a.begin (); i != a.end (); ++i) {
                boost::shared_ptr<AutomationList> al = processor->automation_control(*i)->alist();
                XMLNode & before = al->get_state ();
                bool const things_moved = al->move_ranges (movements);
@@ -600,7 +600,7 @@ Diskstream::check_record_status (framepos_t transport_frame, bool can_record)
        */
 
        rolling = _session.transport_speed() != 0.0f;
-       possibly_recording = (rolling << 2) | (record_enabled() << 1) | can_record;
+       possibly_recording = (rolling << 2) | ((int)record_enabled() << 1) | (int)can_record;
        change = possibly_recording ^ last_possibly_recording;
 
        if (possibly_recording == last_possibly_recording) {