diff options
| -rw-r--r-- | src/jack.c | 2 | ||||
| -rw-r--r-- | src/jalv.c | 14 | ||||
| -rw-r--r-- | src/jalv_internal.h | 2 |
3 files changed, 9 insertions, 9 deletions
@@ -552,7 +552,7 @@ jack_initialize(jack_client_t* const client, const char* const load_init) } } - const int err = jalv_open(jalv, argc, argv); + const int err = jalv_open(jalv, &argc, &argv); if (err) { jalv_backend_close(jalv); free(jalv); @@ -732,9 +732,9 @@ setup_signals(Jalv* const jalv) } int -jalv_open(Jalv* const jalv, int argc, char** argv) +jalv_open(Jalv* const jalv, int* argc, char*** argv) { - jalv->prog_name = argv[0]; + jalv->prog_name = (*argv)[0]; jalv->block_length = 4096; /* Should be set by backend */ jalv->midi_buf_size = 1024; /* Should be set by backend */ jalv->play_state = JALV_PAUSED; @@ -742,10 +742,10 @@ jalv_open(Jalv* const jalv, int argc, char** argv) jalv->control_in = (uint32_t)-1; #ifdef HAVE_SUIL - suil_init(&argc, &argv, SUIL_ARG_NONE); + suil_init(argc, argv, SUIL_ARG_NONE); #endif - if (jalv_init(&argc, &argv, &jalv->opts)) { + if (jalv_init(argc, argv, &jalv->opts)) { jalv_close(jalv); return -1; } @@ -913,8 +913,8 @@ jalv_open(Jalv* const jalv, int argc, char** argv) return -2; } plugin_uri = lilv_node_duplicate(lilv_state_get_plugin_uri(state)); - } else if (argc > 1) { - plugin_uri = lilv_new_uri(world, argv[argc - 1]); + } else if (*argc > 1) { + plugin_uri = lilv_new_uri(world, (*argv)[*argc - 1]); } if (!plugin_uri) { @@ -1249,7 +1249,7 @@ main(int argc, char** argv) Jalv jalv; memset(&jalv, '\0', sizeof(Jalv)); - if (jalv_open(&jalv, argc, argv)) { + if (jalv_open(&jalv, &argc, &argv)) { return EXIT_FAILURE; } diff --git a/src/jalv_internal.h b/src/jalv_internal.h index 0fa8bd0..3fd7b05 100644 --- a/src/jalv_internal.h +++ b/src/jalv_internal.h @@ -341,7 +341,7 @@ struct Jalv { }; int -jalv_open(Jalv* jalv, int argc, char** argv); +jalv_open(Jalv* jalv, int* argc, char*** argv); int jalv_init(int* argc, char*** argv, JalvOptions* opts); |