aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/frontend.h6
-rw-r--r--src/jalv.c18
-rw-r--r--src/jalv_console.c6
-rw-r--r--src/jalv_gtk.c35
-rw-r--r--src/jalv_internal.h10
-rw-r--r--src/jalv_qt.cpp16
-rw-r--r--src/log.c2
-rw-r--r--src/log.h2
-rw-r--r--src/lv2_evbuf.c5
-rw-r--r--src/state.c2
-rw-r--r--src/state.h2
-rw-r--r--src/symap.c2
12 files changed, 54 insertions, 52 deletions
diff --git a/src/frontend.h b/src/frontend.h
index d0c4a76..c0aa505 100644
--- a/src/frontend.h
+++ b/src/frontend.h
@@ -32,15 +32,15 @@ jalv_frontend_ui_type(void);
/// Return true if an interactive frontend is available
bool
-jalv_frontend_discover(Jalv* jalv);
+jalv_frontend_discover(const Jalv* jalv);
/// Return the ideal refresh rate of the frontend in Hz
float
-jalv_frontend_refresh_rate(Jalv* jalv);
+jalv_frontend_refresh_rate(const Jalv* jalv);
/// Return the scale factor of the frontend (for example 2.0 for double sized)
float
-jalv_frontend_scale_factor(Jalv* jalv);
+jalv_frontend_scale_factor(const Jalv* jalv);
/// Attempt to get a plugin URI selection from the user
LilvNode*
diff --git a/src/jalv.c b/src/jalv.c
index 8b6c927..5faac70 100644
--- a/src/jalv.c
+++ b/src/jalv.c
@@ -122,7 +122,7 @@ static const LV2_Feature static_features[] = {
/// Return true iff Jalv supports the given feature
static bool
-feature_is_supported(Jalv* jalv, const char* uri)
+feature_is_supported(const Jalv* jalv, const char* uri)
{
if (!strcmp(uri, "http://lv2plug.in/ns/lv2core#isLive") ||
!strcmp(uri, "http://lv2plug.in/ns/lv2core#inPlaceBroken")) {
@@ -628,7 +628,7 @@ jalv_init_ui(Jalv* jalv)
}
static int
-jalv_write_control_change(Jalv* const jalv,
+jalv_write_control_change(const Jalv* const jalv,
ZixRing* const target,
const void* const header,
const uint32_t header_size,
@@ -649,7 +649,7 @@ jalv_write_control_change(Jalv* const jalv,
}
int
-jalv_write_event(Jalv* const jalv,
+jalv_write_event(const Jalv* const jalv,
ZixRing* const target,
const uint32_t port_index,
const uint32_t size,
@@ -672,10 +672,10 @@ jalv_write_event(Jalv* const jalv,
}
int
-jalv_write_control(Jalv* const jalv,
- ZixRing* const target,
- const uint32_t port_index,
- const float value)
+jalv_write_control(const Jalv* const jalv,
+ ZixRing* const target,
+ const uint32_t port_index,
+ const float value)
{
const ControlChange header = {port_index, 0, sizeof(value)};
@@ -785,7 +785,7 @@ jalv_apply_control_arg(Jalv* jalv, const char* s)
return false;
}
- ControlID* control = jalv_control_by_symbol(jalv, sym);
+ const ControlID* control = jalv_control_by_symbol(jalv, sym);
if (!control) {
jalv_log(
JALV_LOG_WARNING, "Ignoring value for unknown control `%s'\n", sym);
@@ -1394,7 +1394,7 @@ jalv_open(Jalv* const jalv, int* argc, char*** argv)
for (size_t i = 0; i < jalv->controls.n_controls; ++i) {
ControlID* control = jalv->controls.controls[i];
if (control->type == PORT && control->is_writable) {
- struct Port* port = &jalv->ports[control->index];
+ const struct Port* port = &jalv->ports[control->index];
jalv_print_control(jalv, port, port->control);
}
}
diff --git a/src/jalv_console.c b/src/jalv_console.c
index 750549a..bda894c 100644
--- a/src/jalv_console.c
+++ b/src/jalv_console.c
@@ -266,7 +266,7 @@ jalv_process_command(Jalv* jalv, const char* cmd)
}
bool
-jalv_frontend_discover(Jalv* jalv)
+jalv_frontend_discover(const Jalv* jalv)
{
return jalv->opts.show_ui;
}
@@ -313,13 +313,13 @@ jalv_run_custom_ui(Jalv* jalv)
}
float
-jalv_frontend_refresh_rate(Jalv* ZIX_UNUSED(jalv))
+jalv_frontend_refresh_rate(const Jalv* ZIX_UNUSED(jalv))
{
return 30.0f;
}
float
-jalv_frontend_scale_factor(Jalv* ZIX_UNUSED(jalv))
+jalv_frontend_scale_factor(const Jalv* ZIX_UNUSED(jalv))
{
return 1.0f;
}
diff --git a/src/jalv_gtk.c b/src/jalv_gtk.c
index 80067bd..002bcb4 100644
--- a/src/jalv_gtk.c
+++ b/src/jalv_gtk.c
@@ -63,8 +63,10 @@ get_float(const LilvNode* node, float fallback)
}
static void
-on_window_destroy(GtkWidget* ZIX_UNUSED(widget), gpointer ZIX_UNUSED(data))
+on_window_destroy(GtkWidget* widget, gpointer data)
{
+ (void)widget;
+ (void)data;
gtk_main_quit();
}
@@ -388,7 +390,7 @@ add_preset_to_menu(Jalv* jalv,
active_preset_item = GTK_CHECK_MENU_ITEM(item);
}
- LilvNode* bank =
+ const LilvNode* bank =
lilv_world_get(jalv->world, node, jalv->nodes.pset_bank, NULL);
if (bank) {
@@ -608,7 +610,7 @@ set_float_control(const ControlID* control, float value)
}
static double
-get_atom_double(Jalv* jalv,
+get_atom_double(const Jalv* jalv,
uint32_t ZIX_UNUSED(size),
LV2_URID type,
const void* body)
@@ -633,7 +635,7 @@ get_atom_double(Jalv* jalv,
}
static void
-control_changed(Jalv* jalv,
+control_changed(const Jalv* jalv,
Controller* controller,
uint32_t size,
LV2_URID type,
@@ -731,8 +733,8 @@ on_request_value(LV2UI_Feature_Handle handle,
const LV2_URID ZIX_UNUSED(type),
const LV2_Feature* const* ZIX_UNUSED(features))
{
- Jalv* jalv = (Jalv*)handle;
- ControlID* control = get_property_control(&jalv->controls, key);
+ Jalv* const jalv = (Jalv*)handle;
+ const ControlID* control = get_property_control(&jalv->controls, key);
if (!control) {
return LV2UI_REQUEST_VALUE_ERR_UNKNOWN;
@@ -901,8 +903,8 @@ switch_changed(GtkSwitch* toggle_switch, gboolean state, gpointer data)
static void
string_changed(GtkEntry* widget, gpointer data)
{
- ControlID* control = (ControlID*)data;
- const char* string = gtk_entry_get_text(widget);
+ const ControlID* control = (const ControlID*)data;
+ const char* string = gtk_entry_get_text(widget);
set_control(control, strlen(string) + 1, control->forge->String, string);
}
@@ -910,8 +912,8 @@ string_changed(GtkEntry* widget, gpointer data)
static void
file_changed(GtkFileChooserButton* widget, gpointer data)
{
- ControlID* control = (ControlID*)data;
- const char* filename =
+ const ControlID* control = (const ControlID*)data;
+ const char* filename =
gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
set_control(control, strlen(filename) + 1, s_jalv->forge.Path, filename);
@@ -1170,8 +1172,8 @@ build_control_widget(Jalv* jalv, GtkWidget* window)
g_array_sort_with_data(controls, control_group_cmp, jalv);
// Add controls in group order
- LilvNode* last_group = NULL;
- int n_rows = 0;
+ const LilvNode* last_group = NULL;
+ int n_rows = 0;
for (size_t i = 0; i < controls->len; ++i) {
ControlID* record = g_array_index(controls, ControlID*, i);
Controller* controller = NULL;
@@ -1307,13 +1309,13 @@ build_menu(Jalv* jalv, GtkWidget* window, GtkWidget* vbox)
}
bool
-jalv_frontend_discover(Jalv* ZIX_UNUSED(jalv))
+jalv_frontend_discover(const Jalv* ZIX_UNUSED(jalv))
{
return TRUE;
}
float
-jalv_frontend_refresh_rate(Jalv* ZIX_UNUSED(jalv))
+jalv_frontend_refresh_rate(const Jalv* ZIX_UNUSED(jalv))
{
GdkDisplay* const display = gdk_display_get_default();
GdkMonitor* const monitor = gdk_display_get_primary_monitor(display);
@@ -1324,7 +1326,7 @@ jalv_frontend_refresh_rate(Jalv* ZIX_UNUSED(jalv))
}
float
-jalv_frontend_scale_factor(Jalv* ZIX_UNUSED(jalv))
+jalv_frontend_scale_factor(const Jalv* ZIX_UNUSED(jalv))
{
GdkDisplay* const display = gdk_display_get_default();
GdkMonitor* const monitor = gdk_display_get_primary_monitor(display);
@@ -1536,8 +1538,9 @@ jalv_frontend_open(Jalv* jalv)
}
int
-jalv_frontend_close(Jalv* ZIX_UNUSED(jalv))
+jalv_frontend_close(Jalv* jalv)
{
+ (void)jalv;
gtk_main_quit();
s_jalv = NULL;
return 0;
diff --git a/src/jalv_internal.h b/src/jalv_internal.h
index f550f35..3934e86 100644
--- a/src/jalv_internal.h
+++ b/src/jalv_internal.h
@@ -186,7 +186,7 @@ jalv_ui_port_event(Jalv* jalv,
@return 0 on success, non-zero on failure (overflow).
*/
int
-jalv_write_event(Jalv* jalv,
+jalv_write_event(const Jalv* jalv,
ZixRing* target,
uint32_t port_index,
uint32_t size,
@@ -206,10 +206,10 @@ jalv_write_event(Jalv* jalv,
@return 0 on success, non-zero on failure (overflow).
*/
int
-jalv_write_control(Jalv* jalv,
- ZixRing* target,
- uint32_t port_index,
- float value);
+jalv_write_control(const Jalv* jalv,
+ ZixRing* target,
+ uint32_t port_index,
+ float value);
void
jalv_dump_atom(Jalv* jalv,
diff --git a/src/jalv_qt.cpp b/src/jalv_qt.cpp
index e849636..19acb9d 100644
--- a/src/jalv_qt.cpp
+++ b/src/jalv_qt.cpp
@@ -349,8 +349,8 @@ Control::Control(PortContainer portContainer, QWidget* parent)
, port(portContainer.port)
, label(new QLabel())
{
- JalvNodes* nodes = &portContainer.jalv->nodes;
- const LilvPort* lilvPort = port->lilv_port;
+ const JalvNodes* nodes = &portContainer.jalv->nodes;
+ const LilvPort* lilvPort = port->lilv_port;
LilvNode* nmin = nullptr;
LilvNode* nmax = nullptr;
@@ -540,7 +540,7 @@ Control::dialChanged(int)
static bool
portGroupLessThan(const PortContainer& p1, const PortContainer& p2)
{
- Jalv* jalv = p1.jalv;
+ const Jalv* jalv = p1.jalv;
const LilvPort* port1 = p1.port->lilv_port;
const LilvPort* port2 = p2.port->lilv_port;
@@ -586,7 +586,7 @@ build_control_widget(Jalv* jalv)
QHBoxLayout* groupLayout = nullptr;
for (int i = 0; i < portContainers.count(); ++i) {
const PortContainer portContainer = portContainers[i];
- Port* const port = portContainer.port;
+ const Port* const port = portContainer.port;
auto* const control = new Control(portContainer, nullptr);
LilvNode* group =
@@ -594,7 +594,7 @@ build_control_widget(Jalv* jalv)
if (group) {
if (!groupLayout || !lilv_node_equals(group, lastGroup)) {
// Group has changed
- LilvNode* groupName =
+ const LilvNode* groupName =
lilv_world_get(world, group, jalv->nodes.lv2_name, nullptr);
if (!groupName) {
groupName =
@@ -626,19 +626,19 @@ build_control_widget(Jalv* jalv)
}
bool
-jalv_frontend_discover(Jalv*)
+jalv_frontend_discover(const Jalv*)
{
return true;
}
float
-jalv_frontend_refresh_rate(Jalv*)
+jalv_frontend_refresh_rate(const Jalv*)
{
return static_cast<float>(QGuiApplication::primaryScreen()->refreshRate());
}
float
-jalv_frontend_scale_factor(Jalv*)
+jalv_frontend_scale_factor(const Jalv*)
{
return static_cast<float>(
QGuiApplication::primaryScreen()->devicePixelRatio());
diff --git a/src/log.c b/src/log.c
index e52f445..a624a2f 100644
--- a/src/log.c
+++ b/src/log.c
@@ -22,7 +22,7 @@
#include <string.h>
void
-jalv_print_control(Jalv* const jalv,
+jalv_print_control(const Jalv* const jalv,
const struct Port* const port,
const float value)
{
diff --git a/src/log.h b/src/log.h
index 100fc39..7981cf5 100644
--- a/src/log.h
+++ b/src/log.h
@@ -39,7 +39,7 @@ typedef struct {
} JalvLog;
void
-jalv_print_control(Jalv* jalv, const struct Port* port, float value);
+jalv_print_control(const Jalv* jalv, const struct Port* port, float value);
char*
jalv_strdup(const char* str);
diff --git a/src/lv2_evbuf.c b/src/lv2_evbuf.c
index f19aac2..355cac2 100644
--- a/src/lv2_evbuf.c
+++ b/src/lv2_evbuf.c
@@ -110,9 +110,8 @@ lv2_evbuf_next(const LV2_Evbuf_Iterator iter)
}
LV2_Atom_Sequence* aseq = &iter.evbuf->buf;
- LV2_Atom_Event* aev =
- (LV2_Atom_Event*)((char*)LV2_ATOM_CONTENTS(LV2_Atom_Sequence, aseq) +
- iter.offset);
+ const char* abuf = (const char*)LV2_ATOM_CONTENTS(LV2_Atom_Sequence, aseq);
+ const LV2_Atom_Event* aev = (const LV2_Atom_Event*)(abuf + iter.offset);
const uint32_t offset =
iter.offset + lv2_atom_pad_size(sizeof(LV2_Atom_Event) + aev->body.size);
diff --git a/src/state.c b/src/state.c
index 282b907..26c5c20 100644
--- a/src/state.c
+++ b/src/state.c
@@ -160,7 +160,7 @@ set_port_value(const char* port_symbol,
}
void
-jalv_apply_state(Jalv* jalv, LilvState* state)
+jalv_apply_state(Jalv* jalv, const LilvState* state)
{
bool must_pause = !jalv->safe_restore && jalv->play_state == JALV_RUNNING;
if (state) {
diff --git a/src/state.h b/src/state.h
index 86defd7..dfc3174 100644
--- a/src/state.h
+++ b/src/state.h
@@ -51,7 +51,7 @@ char*
jalv_make_path(LV2_State_Make_Path_Handle handle, const char* path);
void
-jalv_apply_state(Jalv* jalv, LilvState* state);
+jalv_apply_state(Jalv* jalv, const LilvState* state);
char*
atom_to_turtle(LV2_URID_Unmap* unmap,
diff --git a/src/symap.c b/src/symap.c
index f75da3b..46c147c 100644
--- a/src/symap.c
+++ b/src/symap.c
@@ -190,7 +190,7 @@ symap_unmap(const Symap* const map, const uint32_t id)
# include <stdio.h>
static void
-symap_dump(Symap* const map)
+symap_dump(const Symap* const map)
{
fprintf(stderr, "{\n");
for (uint32_t i = 0; i < map->size; ++i) {
generated by cgit v1.2.1 (git 2.18.0) at 2025-03-27 12:40:23 +0000