projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use ::g_rename instead of ::rename in ARDOUR::FileSource class
[ardour.git]
/
libs
/
ardour
/
ardour
/
monitor_control.h
diff --git
a/libs/ardour/ardour/monitor_control.h
b/libs/ardour/ardour/monitor_control.h
index 871263a0c6cff9817937a0933f49f0b8557efb5a..b18517255ee362b82c3221d3b09c6dcbf05e4f99 100644
(file)
--- a/
libs/ardour/ardour/monitor_control.h
+++ b/
libs/ardour/ardour/monitor_control.h
@@
-24,7
+24,7
@@
#include <boost/shared_ptr.hpp>
#include <boost/dynamic_bitset.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/dynamic_bitset.hpp>
-#include "ardour/automation_control.h"
+#include "ardour/
slavable_
automation_control.h"
#include "ardour/monitorable.h"
#include "ardour/libardour_visibility.h"
#include "ardour/monitorable.h"
#include "ardour/libardour_visibility.h"
@@
-39,7
+39,7
@@
class LIBARDOUR_API MonitorControl : public SlavableAutomationControl
MonitorControl (Session& session, std::string const & name, Monitorable& m);
~MonitorControl() {}
MonitorControl (Session& session, std::string const & name, Monitorable& m);
~MonitorControl() {}
- MonitorChoice monitoring_choice() const { return static_cast<MonitorChoice> (get_value()); }
+ MonitorChoice monitoring_choice() const { return static_cast<MonitorChoice> (
(int)
get_value()); }
MonitorState monitoring_state () const { return _monitorable.monitoring_state(); }
int set_state (XMLNode const&, int);
MonitorState monitoring_state () const { return _monitorable.monitoring_state(); }
int set_state (XMLNode const&, int);