X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Fosc.h;h=27c2e6ba03e5384dc9c4f12889deefce4b5ec245;hb=6a3ce666c6716ceb9378e508d6116f83c32957c7;hp=de73bdb913a13887bbee23548a66836fdc8c58e9;hpb=c7df5f5271be9652ab4bac25a1f8dcb4e4373ba4;p=ardour.git

diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h
index de73bdb913..27c2e6ba03 100644
--- a/libs/surfaces/osc/osc.h
+++ b/libs/surfaces/osc/osc.h
@@ -37,6 +37,7 @@
 #include "control_protocol/control_protocol.h"
 
 class OSCControllable;
+class OSCRouteObserver;
 
 namespace ARDOUR {
 class Session;
@@ -110,11 +111,27 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
 
 	void send_current_value (const char* path, lo_arg** argv, int argc, lo_message msg);
 	void current_value_query (const char* path, size_t len, lo_arg **argv, int argc, lo_message msg);
+	
+	int current_value (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
+	
 	int catchall (const char *path, const char *types, lo_arg **argv, int argc, void *data);
 	static int _catchall (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
 
-	int current_value (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
+	void routes_list (lo_message msg);
+	void transport_frame(lo_message msg);
 
+#define PATH_CALLBACK_MSG(name)					\
+        static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \
+		return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \
+        } \
+        int cb_ ## name (const char *, const char *, lo_arg **argv, int argc, void *data) { \
+		name (data);		\
+		return 0;		\
+	}
+	
+	PATH_CALLBACK_MSG(routes_list);
+	PATH_CALLBACK_MSG(transport_frame);
+	
 #define PATH_CALLBACK(name) \
         static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \
 		return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \
@@ -167,6 +184,28 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
 		return 0;						\
 	}
 
+#define PATH_CALLBACK3(name,arg1type,arg2type,arg3type)                \
+        static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \
+               return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \
+        } \
+        int cb_ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data) { \
+                if (argc > 1) {                                                \
+                 name (argv[0]->arg1type, argv[1]->arg2type,argv[2]->arg3type); \
+                }                                                      \
+               return 0;                                               \
+       }
+
+#define PATH_CALLBACK4(name,arg1type,arg2type,arg3type,arg4type)               \
+        static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \
+               return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \
+        } \
+        int cb_ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data) { \
+                if (argc > 1) {                                                \
+                 name (argv[0]->arg1type, argv[1]->arg2type,argv[2]->arg3type,argv[3]->arg4type); \
+                }                                                      \
+               return 0;                                               \
+       } 
+
         PATH_CALLBACK2(locate,i,i);
 	PATH_CALLBACK2(route_mute,i,i);
 	PATH_CALLBACK2(route_solo,i,i);
@@ -175,6 +214,8 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
 	PATH_CALLBACK2(route_set_gain_dB,i,f);
 	PATH_CALLBACK2(route_set_pan_stereo_position,i,f);
 	PATH_CALLBACK2(route_set_pan_stereo_width,i,f);
+        PATH_CALLBACK4(route_plugin_parameter,i,i,i,f);
+        PATH_CALLBACK3(route_plugin_parameter_print,i,i,i); 
 
 	int route_mute (int rid, int yn);
 	int route_solo (int rid, int yn);
@@ -183,14 +224,21 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
 	int route_set_gain_dB (int rid, float dB);
 	int route_set_pan_stereo_position (int rid, float left_right_fraction);
 	int route_set_pan_stereo_width (int rid, float percent);
-
+	int route_plugin_parameter (int rid, int piid,int par, float val);
+	int route_plugin_parameter_print (int rid, int piid,int par);
+	
 	void listen_to_route (boost::shared_ptr<ARDOUR::Route>, lo_address);
 	void end_listen (boost::shared_ptr<ARDOUR::Route>, lo_address);
 	void drop_route (boost::weak_ptr<ARDOUR::Route>);
+	
+	void route_name_changed (const PBD::PropertyChange&, boost::weak_ptr<ARDOUR::Route> r, lo_address addr);
+	
+	void update_clock ();
+
 
-	typedef std::list<OSCControllable*> Controllables;
+	typedef std::list<OSCRouteObserver*> RouteObservers;
 	
-	Controllables controllables;
+	RouteObservers route_observers;
 
 	static OSC* _instance;
 };