summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/automation_control.h4
-rw-r--r--libs/ardour/ardour/midi_track.h2
-rw-r--r--libs/ardour/ardour/monitor_control.h2
-rw-r--r--libs/ardour/ardour/mute_control.h2
-rw-r--r--libs/ardour/ardour/pan_controllable.h2
-rw-r--r--libs/ardour/ardour/phase_control.h2
-rw-r--r--libs/ardour/ardour/plugin_insert.h4
-rw-r--r--libs/ardour/ardour/record_enable_control.h2
-rw-r--r--libs/ardour/ardour/record_safe_control.h2
-rw-r--r--libs/ardour/ardour/slavable_automation_control.h2
-rw-r--r--libs/ardour/ardour/solo_control.h2
-rw-r--r--libs/ardour/ardour/solo_isolate_control.h2
-rw-r--r--libs/ardour/ardour/solo_safe_control.h2
13 files changed, 15 insertions, 15 deletions
diff --git a/libs/ardour/ardour/automation_control.h b/libs/ardour/ardour/automation_control.h
index 158996133c..fddb0685ab 100644
--- a/libs/ardour/ardour/automation_control.h
+++ b/libs/ardour/ardour/automation_control.h
@@ -105,7 +105,7 @@ class LIBARDOUR_API AutomationControl
* this is only used by automation playback.
*/
void set_value_unchecked (double val) {
- actually_set_value (val, PBD::Controllable::NoGroup);
+ (void) actually_set_value (val, PBD::Controllable::NoGroup);
}
double lower() const { return _desc.lower; }
@@ -134,7 +134,7 @@ class LIBARDOUR_API AutomationControl
Controllable::Changed signal is emitted when necessary.
*/
- virtual void actually_set_value (double value, PBD::Controllable::GroupControlDisposition);
+ virtual bool actually_set_value (double value, PBD::Controllable::GroupControlDisposition);
/* Session needs to call this method before it queues up the real
change for execution in a realtime context. C++ access control sucks.
diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index f756812e71..8a0f8c9f95 100644
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -95,7 +95,7 @@ public:
MidiTrack* _route;
private:
- void actually_set_value (double val, PBD::Controllable::GroupControlDisposition group_override);
+ bool actually_set_value (double val, PBD::Controllable::GroupControlDisposition group_override);
};
virtual void set_parameter_automation_state (Evoral::Parameter param, AutoState);
diff --git a/libs/ardour/ardour/monitor_control.h b/libs/ardour/ardour/monitor_control.h
index b18517255e..362bcfbc30 100644
--- a/libs/ardour/ardour/monitor_control.h
+++ b/libs/ardour/ardour/monitor_control.h
@@ -46,7 +46,7 @@ class LIBARDOUR_API MonitorControl : public SlavableAutomationControl
XMLNode& get_state ();
protected:
- void actually_set_value (double, PBD::Controllable::GroupControlDisposition group_override);
+ bool actually_set_value (double, PBD::Controllable::GroupControlDisposition group_override);
private:
Monitorable& _monitorable;
diff --git a/libs/ardour/ardour/mute_control.h b/libs/ardour/ardour/mute_control.h
index 909f0cbf02..b324e32908 100644
--- a/libs/ardour/ardour/mute_control.h
+++ b/libs/ardour/ardour/mute_control.h
@@ -71,7 +71,7 @@ class LIBARDOUR_API MuteControl : public SlavableAutomationControl
protected:
void master_changed (bool, PBD::Controllable::GroupControlDisposition, boost::shared_ptr<AutomationControl>);
- void actually_set_value (double, PBD::Controllable::GroupControlDisposition group_override);
+ bool actually_set_value (double, PBD::Controllable::GroupControlDisposition group_override);
void pre_remove_master (boost::shared_ptr<AutomationControl>);
void post_add_master (boost::shared_ptr<AutomationControl>);
diff --git a/libs/ardour/ardour/pan_controllable.h b/libs/ardour/ardour/pan_controllable.h
index 82aa60fe10..30130e35c8 100644
--- a/libs/ardour/ardour/pan_controllable.h
+++ b/libs/ardour/ardour/pan_controllable.h
@@ -51,7 +51,7 @@ class LIBARDOUR_API PanControllable : public AutomationControl
private:
Pannable* owner;
- void actually_set_value (double, PBD::Controllable::GroupControlDisposition group_override);
+ bool actually_set_value (double, PBD::Controllable::GroupControlDisposition group_override);
};
} // namespace
diff --git a/libs/ardour/ardour/phase_control.h b/libs/ardour/ardour/phase_control.h
index 0693c8ee50..489673db2d 100644
--- a/libs/ardour/ardour/phase_control.h
+++ b/libs/ardour/ardour/phase_control.h
@@ -60,7 +60,7 @@ class LIBARDOUR_API PhaseControl : public AutomationControl
XMLNode& get_state ();
protected:
- void actually_set_value (double, PBD::Controllable::GroupControlDisposition group_override);
+ bool actually_set_value (double, PBD::Controllable::GroupControlDisposition group_override);
private:
boost::dynamic_bitset<> _phase_invert;
diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h
index 474df73e41..d3936cc797 100644
--- a/libs/ardour/ardour/plugin_insert.h
+++ b/libs/ardour/ardour/plugin_insert.h
@@ -198,7 +198,7 @@ class LIBARDOUR_API PluginInsert : public Processor
private:
PluginInsert* _plugin;
- void actually_set_value (double val, PBD::Controllable::GroupControlDisposition group_override);
+ bool actually_set_value (double val, PBD::Controllable::GroupControlDisposition group_override);
};
/** A control that manipulates a plugin property (message). */
@@ -212,7 +212,7 @@ class LIBARDOUR_API PluginInsert : public Processor
double get_value (void) const;
XMLNode& get_state();
protected:
- void actually_set_value (double value, PBD::Controllable::GroupControlDisposition);
+ bool actually_set_value (double value, PBD::Controllable::GroupControlDisposition);
private:
PluginInsert* _plugin;
diff --git a/libs/ardour/ardour/record_enable_control.h b/libs/ardour/ardour/record_enable_control.h
index c5cb65c597..a9c4750eea 100644
--- a/libs/ardour/ardour/record_enable_control.h
+++ b/libs/ardour/ardour/record_enable_control.h
@@ -49,7 +49,7 @@ class LIBARDOUR_API RecordEnableControl : public SlavableAutomationControl
void set_value (double, PBD::Controllable::GroupControlDisposition);
protected:
- void actually_set_value (double val, Controllable::GroupControlDisposition gcd);
+ bool actually_set_value (double val, Controllable::GroupControlDisposition gcd);
void do_pre_realtime_queue_stuff (double value);
private:
diff --git a/libs/ardour/ardour/record_safe_control.h b/libs/ardour/ardour/record_safe_control.h
index ef062aa9f0..c7432cf3d4 100644
--- a/libs/ardour/ardour/record_safe_control.h
+++ b/libs/ardour/ardour/record_safe_control.h
@@ -39,7 +39,7 @@ class LIBARDOUR_API RecordSafeControl : public SlavableAutomationControl
~RecordSafeControl() {}
protected:
- void actually_set_value (double val, Controllable::GroupControlDisposition gcd);
+ bool actually_set_value (double val, Controllable::GroupControlDisposition gcd);
private:
Recordable& _recordable;
diff --git a/libs/ardour/ardour/slavable_automation_control.h b/libs/ardour/ardour/slavable_automation_control.h
index 7e46dd5a74..c7133df89d 100644
--- a/libs/ardour/ardour/slavable_automation_control.h
+++ b/libs/ardour/ardour/slavable_automation_control.h
@@ -102,7 +102,7 @@ class LIBARDOUR_API SlavableAutomationControl : public AutomationControl
void master_going_away (boost::weak_ptr<AutomationControl>);
double get_value_locked() const;
- void actually_set_value (double val, PBD::Controllable::GroupControlDisposition group_override);
+ bool actually_set_value (double val, PBD::Controllable::GroupControlDisposition group_override);
void update_boolean_masters_records (boost::shared_ptr<AutomationControl>);
virtual void master_changed (bool from_self, GroupControlDisposition gcd, boost::shared_ptr<AutomationControl>);
diff --git a/libs/ardour/ardour/solo_control.h b/libs/ardour/ardour/solo_control.h
index 3f0f522fc3..4678ca6049 100644
--- a/libs/ardour/ardour/solo_control.h
+++ b/libs/ardour/ardour/solo_control.h
@@ -96,7 +96,7 @@ class LIBARDOUR_API SoloControl : public SlavableAutomationControl
XMLNode& get_state ();
protected:
- void actually_set_value (double, PBD::Controllable::GroupControlDisposition group_override);
+ bool actually_set_value (double, PBD::Controllable::GroupControlDisposition group_override);
void master_changed (bool from_self, GroupControlDisposition, boost::shared_ptr<AutomationControl> m);
void pre_remove_master (boost::shared_ptr<AutomationControl>);
void post_add_master (boost::shared_ptr<AutomationControl>);
diff --git a/libs/ardour/ardour/solo_isolate_control.h b/libs/ardour/ardour/solo_isolate_control.h
index 1e49469067..e77591e272 100644
--- a/libs/ardour/ardour/solo_isolate_control.h
+++ b/libs/ardour/ardour/solo_isolate_control.h
@@ -74,7 +74,7 @@ class LIBARDOUR_API SoloIsolateControl : public SlavableAutomationControl
protected:
void master_changed (bool from_self, PBD::Controllable::GroupControlDisposition gcd, boost::shared_ptr<AutomationControl>);
- void actually_set_value (double, PBD::Controllable::GroupControlDisposition group_override);
+ bool actually_set_value (double, PBD::Controllable::GroupControlDisposition group_override);
private:
Soloable& _soloable;
diff --git a/libs/ardour/ardour/solo_safe_control.h b/libs/ardour/ardour/solo_safe_control.h
index e969959e94..ba31692589 100644
--- a/libs/ardour/ardour/solo_safe_control.h
+++ b/libs/ardour/ardour/solo_safe_control.h
@@ -44,7 +44,7 @@ class LIBARDOUR_API SoloSafeControl : public SlavableAutomationControl
XMLNode& get_state ();
protected:
- void actually_set_value (double, PBD::Controllable::GroupControlDisposition group_override);
+ bool actually_set_value (double, PBD::Controllable::GroupControlDisposition group_override);
private:
bool _solo_safe;