aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--layer.h12
-rw-r--r--layer_box.cpp2
-rw-r--r--layer_box.h2
-rw-r--r--layer_image.cpp2
-rw-r--r--layer_image.h2
-rw-r--r--layer_video.cpp8
-rw-r--r--layer_video.h8
-rw-r--r--main.cpp2
-rw-r--r--osc_server.cpp20
-rw-r--r--osc_server.h6
10 files changed, 32 insertions, 32 deletions
diff --git a/layer.h b/layer.h
index 9cf757c..e16ce98 100644
--- a/layer.h
+++ b/layer.h
@@ -12,7 +12,7 @@
#include "osc_graphics.h"
#include "osc_server.h"
-extern OscServer osc_server;
+extern OSCServer osc_server;
class Layer {
SDL_mutex *mutex;
@@ -42,14 +42,14 @@ public:
virtual void frame(SDL_Surface *target) = 0;
protected:
- inline OscServer::MethodHandlerId *
+ inline OSCServer::MethodHandlerId *
register_method(const char *method, const char *types,
- OscServer::MethodHandlerCb method_cb)
+ OSCServer::MethodHandlerCb method_cb)
{
return osc_server.register_method(this, method, types, method_cb);
}
inline void
- unregister_method(OscServer::MethodHandlerId *hnd)
+ unregister_method(OSCServer::MethodHandlerId *hnd)
{
osc_server.unregister_method(hnd);
}
@@ -64,7 +64,7 @@ private:
/*
* OSC handler methods
*/
- OscServer::MethodHandlerId *geo_osc_id;
+ OSCServer::MethodHandlerId *geo_osc_id;
static void
geo_osc(Layer *obj, lo_arg **argv)
{
@@ -74,7 +74,7 @@ private:
};
obj->geo(geo);
}
- OscServer::MethodHandlerId *alpha_osc_id;
+ OSCServer::MethodHandlerId *alpha_osc_id;
static void
alpha_osc(Layer *obj, lo_arg **argv)
{
diff --git a/layer_box.cpp b/layer_box.cpp
index 0ccaf7c..a05e971 100644
--- a/layer_box.cpp
+++ b/layer_box.cpp
@@ -10,7 +10,7 @@ LayerBox::LayerBox(const char *name, SDL_Rect geo, float opacity,
SDL_Color color) : Layer(name)
{
color_osc_id = register_method("color", "iii",
- (OscServer::MethodHandlerCb)color_osc);
+ (OSCServer::MethodHandlerCb)color_osc);
LayerBox::geo(geo);
LayerBox::color(color);
diff --git a/layer_box.h b/layer_box.h
index 3c9dace..413ee07 100644
--- a/layer_box.h
+++ b/layer_box.h
@@ -42,7 +42,7 @@ private:
g = color.g;
b = color.b;
}
- OscServer::MethodHandlerId *color_osc_id;
+ OSCServer::MethodHandlerId *color_osc_id;
static void
color_osc(LayerBox *obj, lo_arg **argv)
{
diff --git a/layer_image.cpp b/layer_image.cpp
index 21bba43..8f49471 100644
--- a/layer_image.cpp
+++ b/layer_image.cpp
@@ -62,7 +62,7 @@ LayerImage::LayerImage(const char *name, SDL_Rect geo, float opacity,
surf_scaled(NULL), surf(NULL)
{
file_osc_id = register_method("file", "s",
- (OscServer::MethodHandlerCb)file_osc);
+ (OSCServer::MethodHandlerCb)file_osc);
LayerImage::alpha(opacity);
LayerImage::geo(geo);
diff --git a/layer_image.h b/layer_image.h
index 69a3a7c..e374053 100644
--- a/layer_image.h
+++ b/layer_image.h
@@ -41,7 +41,7 @@ private:
void alpha(float opacity);
void file(const char *file = NULL);
- OscServer::MethodHandlerId *file_osc_id;
+ OSCServer::MethodHandlerId *file_osc_id;
static void
file_osc(LayerImage *obj, lo_arg **argv)
{
diff --git a/layer_video.cpp b/layer_video.cpp
index bcedda0..15108bf 100644
--- a/layer_video.cpp
+++ b/layer_video.cpp
@@ -43,12 +43,12 @@ LayerVideo::LayerVideo(const char *name, SDL_Rect geo, float opacity,
"--no-xlib" /* tell VLC to not use Xlib */
};
- url_osc_id = register_method("url", "s", (OscServer::MethodHandlerCb)url_osc);
- rate_osc_id = register_method("rate", "f", (OscServer::MethodHandlerCb)rate_osc);
+ url_osc_id = register_method("url", "s", (OSCServer::MethodHandlerCb)url_osc);
+ rate_osc_id = register_method("rate", "f", (OSCServer::MethodHandlerCb)rate_osc);
position_osc_id = register_method("position", "f",
- (OscServer::MethodHandlerCb)position_osc);
+ (OSCServer::MethodHandlerCb)position_osc);
paused_osc_id = register_method("paused", "i",
- (OscServer::MethodHandlerCb)paused_osc);
+ (OSCServer::MethodHandlerCb)paused_osc);
LayerVideo::geo(geo);
LayerVideo::alpha(opacity);
diff --git a/layer_video.h b/layer_video.h
index 4917b40..880f88c 100644
--- a/layer_video.h
+++ b/layer_video.h
@@ -62,28 +62,28 @@ private:
void alpha(float opacity);
void url(const char *url = NULL);
- OscServer::MethodHandlerId *url_osc_id;
+ OSCServer::MethodHandlerId *url_osc_id;
static void
url_osc(LayerVideo *obj, lo_arg **argv)
{
obj->url(&argv[0]->s);
}
void rate(float rate);
- OscServer::MethodHandlerId *rate_osc_id;
+ OSCServer::MethodHandlerId *rate_osc_id;
static void
rate_osc(LayerVideo *obj, lo_arg **argv)
{
obj->rate(argv[0]->f);
}
void position(float position);
- OscServer::MethodHandlerId *position_osc_id;
+ OSCServer::MethodHandlerId *position_osc_id;
static void
position_osc(LayerVideo *obj, lo_arg **argv)
{
obj->position(argv[0]->f);
}
void paused(bool paused);
- OscServer::MethodHandlerId *paused_osc_id;
+ OSCServer::MethodHandlerId *paused_osc_id;
static void
paused_osc(LayerVideo *obj, lo_arg **argv)
{
diff --git a/main.cpp b/main.cpp
index 1ef1606..1b3302f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -29,7 +29,7 @@
*/
SDL_Surface *screen;
-OscServer osc_server(PORT);
+OSCServer osc_server(PORT);
LayerList layers;
int config_dump_osc = 0;
diff --git a/osc_server.cpp b/osc_server.cpp
index aae7b1a..59ead72 100644
--- a/osc_server.cpp
+++ b/osc_server.cpp
@@ -83,8 +83,8 @@ ctor_generic_handler(const char *path __attribute__((unused)),
void *data __attribute__((unused)),
void *user_data)
{
- OscServer::ConstructorHandlerCb const_cb =
- (OscServer::ConstructorHandlerCb)user_data;
+ OSCServer::ConstructorHandlerCb const_cb =
+ (OSCServer::ConstructorHandlerCb)user_data;
Layer *layer;
SDL_Rect geo = {
@@ -109,7 +109,7 @@ ctor_generic_handler(const char *path __attribute__((unused)),
"/layer/new/%s", CLASS##_Info_Name); \
} while (0)
-OscServer::OscServer(const char *port)
+OSCServer::OSCServer(const char *port)
{
server = lo_server_thread_new(port, error_handler);
@@ -123,7 +123,7 @@ OscServer::OscServer(const char *port)
#undef REGISTER_LAYER
void
-OscServer::add_method_v(MethodHandlerId **hnd, const char *types,
+OSCServer::add_method_v(MethodHandlerId **hnd, const char *types,
lo_method_handler handler, void *data,
const char *fmt, va_list ap)
{
@@ -137,7 +137,7 @@ OscServer::add_method_v(MethodHandlerId **hnd, const char *types,
}
void
-OscServer::del_method(const char *types, const char *fmt, ...)
+OSCServer::del_method(const char *types, const char *fmt, ...)
{
char buf[255];
va_list ap;
@@ -150,7 +150,7 @@ OscServer::del_method(const char *types, const char *fmt, ...)
struct OscMethodDefaultCtx {
Layer *layer;
- OscServer::MethodHandlerCb method_cb;
+ OSCServer::MethodHandlerCb method_cb;
};
static int
@@ -169,8 +169,8 @@ method_generic_handler(const char *path __attribute__((unused)),
return 0;
}
-OscServer::MethodHandlerId *
-OscServer::register_method(Layer *layer, const char *method, const char *types,
+OSCServer::MethodHandlerId *
+OSCServer::register_method(Layer *layer, const char *method, const char *types,
MethodHandlerCb method_cb)
{
MethodHandlerId *hnd;
@@ -186,13 +186,13 @@ OscServer::register_method(Layer *layer, const char *method, const char *types,
}
void
-OscServer::unregister_method(MethodHandlerId *hnd)
+OSCServer::unregister_method(MethodHandlerId *hnd)
{
delete (struct OscMethodDefaultCtx *)hnd->data;
del_method(hnd);
}
-OscServer::~OscServer()
+OSCServer::~OSCServer()
{
lo_server_thread_free(server);
}
diff --git a/osc_server.h b/osc_server.h
index 362ded9..7df4e88 100644
--- a/osc_server.h
+++ b/osc_server.h
@@ -12,7 +12,7 @@
class Layer;
-class OscServer {
+class OSCServer {
lo_server_thread server;
public:
@@ -44,8 +44,8 @@ public:
typedef Layer *(*ConstructorHandlerCb)(const char *name, SDL_Rect geo,
float alpha, lo_arg **argv);
- OscServer(const char *port);
- ~OscServer();
+ OSCServer(const char *port);
+ ~OSCServer();
inline void
start()
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-11 20:01:21 +0000