Merge branch 'windows' of git.ardour.org:ardour/ardour into windows

[ardour.git] / libs / surfaces / osc / osc.h

diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h
index 314d37c7bde4a460fbf7da0977961740cf8a1893..84dd0d9c86c082b7ba75e57e82e19b28a235ff45 100644 (file)
--- a/libs/surfaces/osc/osc.h
+++ b/libs/surfaces/osc/osc.h
@@ -32,12 +32,12 @@
 #include <glibmm/main.h>
 
 #include "pbd/abstract_ui.h"
-#include "pbd/scoped_connections.h"
 
 #include "ardour/types.h"
 #include "control_protocol/control_protocol.h"
 
 class OSCControllable;
+class OSCRouteObserver;
 
 namespace ARDOUR {
 class Session;
@@ -46,7 +46,7 @@ class Route;
        
 /* this is mostly a placeholder because I suspect that at some
    point we will want to add more members to accomodate
-   certain types of requests to the MIDI UI
+   certain types of requests to the OSC UI
 */
 
 struct OSCUIRequest : public BaseUI::BaseRequestObject {
@@ -55,12 +55,14 @@ struct OSCUIRequest : public BaseUI::BaseRequestObject {
        ~OSCUIRequest() {}
 };
 
-class OSC : public ARDOUR::ControlProtocol, public PBD::ScopedConnectionList, public AbstractUI<OSCUIRequest>
+class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
 {
   public:
        OSC (ARDOUR::Session&, uint32_t port);
        virtual ~OSC();
 
+       static OSC* instance() { return _instance; }
+
        XMLNode& get_state ();
        int set_state (const XMLNode&, int version);
 
@@ -109,11 +111,27 @@ class OSC : public ARDOUR::ControlProtocol, public PBD::ScopedConnectionList, pu
 
        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 **, int, 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); \
@@ -166,25 +184,67 @@ class OSC : public ARDOUR::ControlProtocol, public PBD::ScopedConnectionList, pu
                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 *, const char *, lo_arg **argv, int argc, void *) { \
+                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 *, const char *, lo_arg **argv, int argc, void *) { \
+                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);
        PATH_CALLBACK2(route_recenable,i,i);
        PATH_CALLBACK2(route_set_gain_abs,i,f);
        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_CALLBACK3(route_set_send_gain_abs,i,i,f);
+        PATH_CALLBACK3(route_set_send_gain_dB,i,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);
        int route_recenable (int rid, int yn);
        int route_set_gain_abs (int rid, float level);
        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_set_send_gain_abs (int rid, int sid, float val);
+       int route_set_send_gain_dB (int rid, int sid, float val);
+       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;
+       
+       RouteObservers route_observers;
 
-       Controllables controllables;
+       static OSC* _instance;
 };
 
 #endif // ardour_osc_h