projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OSC: Only send new select send values
[ardour.git]
/
libs
/
surfaces
/
osc
/
osc_global_observer.h
diff --git
a/libs/surfaces/osc/osc_global_observer.h
b/libs/surfaces/osc/osc_global_observer.h
index 8f0ceb83106109752083992037d21a25142be3e6..ef9637274f261efcac2128ddcbb91a1855b63239 100644
(file)
--- a/
libs/surfaces/osc/osc_global_observer.h
+++ b/
libs/surfaces/osc/osc_global_observer.h
@@
-33,13
+33,15
@@
class OSCGlobalObserver
{
public:
{
public:
- OSCGlobalObserver (A
RDOUR::Session& s, lo_address addr, uint32_t gainmode, std::bitset<32> feedback
);
+ OSCGlobalObserver (A
rdourSurface::OSC& o, ARDOUR::Session& s, ArdourSurface::OSC::OSCSurface* su
);
~OSCGlobalObserver ();
lo_address address() const { return addr; };
void tick (void);
~OSCGlobalObserver ();
lo_address address() const { return addr; };
void tick (void);
+ void clear_observer (void);
private:
private:
+ ArdourSurface::OSC& _osc;
PBD::ScopedConnectionList strip_connections;
PBD::ScopedConnectionList session_connections;
PBD::ScopedConnectionList strip_connections;
PBD::ScopedConnectionList session_connections;
@@
-49,15
+51,24
@@
class OSCGlobalObserver
Monitor,
};
Monitor,
};
-
+ ArdourSurface::OSC::OSCSurface* sur;
+ bool _init;
+ float _last_master_gain;
+ float _last_master_trim;
+ float _last_monitor_gain;
lo_address addr;
std::string path;
uint32_t gainmode;
std::bitset<32> feedback;
ARDOUR::Session* session;
lo_address addr;
std::string path;
uint32_t gainmode;
std::bitset<32> feedback;
ARDOUR::Session* session;
-
framepos_t _last_fram
e;
+
samplepos_t _last_sampl
e;
uint32_t _heartbeat;
float _last_meter;
uint32_t _heartbeat;
float _last_meter;
+ uint32_t master_timeout;
+ uint32_t monitor_timeout;
+ uint32_t last_punchin;
+ uint32_t last_punchout;
+ uint32_t last_click;
void send_change_message (std::string path, boost::shared_ptr<PBD::Controllable> controllable);
void send_gain_message (std::string path, boost::shared_ptr<PBD::Controllable> controllable);
void send_change_message (std::string path, boost::shared_ptr<PBD::Controllable> controllable);
void send_gain_message (std::string path, boost::shared_ptr<PBD::Controllable> controllable);
@@
-65,8
+76,8
@@
class OSCGlobalObserver
void send_transport_state_changed (void);
void send_record_state_changed (void);
void solo_active (bool active);
void send_transport_state_changed (void);
void send_record_state_changed (void);
void solo_active (bool active);
- void
text_message (std::string path, std::string text
);
- void
float_message (std::string path, float value
);
+ void
session_name (std::string path, std::string name
);
+ void
extra_check (void
);
};
#endif /* __osc_oscglobalobserver_h__ */
};
#endif /* __osc_oscglobalobserver_h__ */