diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/jack.c | 45 | ||||
| -rw-r--r-- | src/jalv.c | 5 | ||||
| -rw-r--r-- | src/jalv_console.c | 7 | ||||
| -rw-r--r-- | src/jalv_gtk.c | 2 | ||||
| -rw-r--r-- | src/jalv_internal.h | 1 |
5 files changed, 0 insertions, 60 deletions
@@ -29,9 +29,6 @@ #include <jack/transport.h> #include <jack/types.h> -#ifdef JALV_JACK_SESSION -# include <jack/session.h> -#endif #ifdef HAVE_JACK_METADATA # include <jack/metadata.h> #endif @@ -309,34 +306,6 @@ jack_latency_cb(jack_latency_callback_mode_t mode, void* data) } } -#ifdef JALV_JACK_SESSION -static void -jack_session_cb(jack_session_event_t* event, void* arg) -{ - Jalv* const jalv = (Jalv*)arg; - - #define MAX_CMD_LEN 256 - event->command_line = (char*)malloc(MAX_CMD_LEN); - snprintf(event->command_line, MAX_CMD_LEN, "%s -u %s -l \"${SESSION_DIR}\"", - jalv->prog_name, - event->client_uuid); - - switch (event->type) { - case JackSessionSave: - case JackSessionSaveTemplate: - jalv_save(jalv, event->session_dir); - break; - case JackSessionSaveAndQuit: - jalv_save(jalv, event->session_dir); - jalv_close_ui(jalv); - break; - } - - jack_session_reply(jalv->backend->client, event); - jack_session_event_free(event); -} -#endif /* JALV_JACK_SESSION */ - static jack_client_t* jack_create_client(Jalv* jalv) { @@ -360,17 +329,6 @@ jack_create_client(Jalv* jalv) } /* Connect to JACK */ -#ifdef JALV_JACK_SESSION - if (jalv->opts.uuid) { - client = jack_client_open( - jack_name, - (jack_options_t)(JackSessionID | - (jalv->opts.name_exact ? JackUseExactName : 0)), - NULL, - jalv->opts.uuid); - } -#endif - if (!client) { client = jack_client_open( jack_name, @@ -410,9 +368,6 @@ jalv_backend_init(Jalv* jalv) jack_set_buffer_size_callback(client, &jack_buffer_size_cb, arg); jack_on_shutdown(client, &jack_shutdown_cb, arg); jack_set_latency_callback(client, &jack_latency_cb, arg); -#ifdef JALV_JACK_SESSION - jack_set_session_callback(client, &jack_session_cb, arg); -#endif if (jalv->backend) { /* Internal JACK client, jalv->backend->is_internal_client was already @@ -821,10 +821,6 @@ jalv_open(Jalv* const jalv, int* argc, char*** argv) return -1; } - if (jalv->opts.uuid) { - printf("UUID: %s\n", jalv->opts.uuid); - } - jalv->symap = symap_new(); zix_sem_init(&jalv->symap_lock, 1); zix_sem_init(&jalv->work_lock, 1); @@ -1310,7 +1306,6 @@ jalv_close(Jalv* const jalv) free(jalv->feature_list); free(jalv->opts.name); - free(jalv->opts.uuid); free(jalv->opts.load); free(jalv->opts.controls); diff --git a/src/jalv_console.c b/src/jalv_console.c index fb4c23f..f376333 100644 --- a/src/jalv_console.c +++ b/src/jalv_console.c @@ -50,7 +50,6 @@ print_usage(const char* name, bool error) fprintf(os, " -p Print control output changes to stdout\n"); fprintf(os, " -s Show plugin UI if possible\n"); fprintf(os, " -t Print trace messages from plugin\n"); - fprintf(os, " -u UUID UUID for Jack session restoration\n"); fprintf(os, " -x Exact JACK client name (exit if taken)\n"); return error ? 1 : 0; } @@ -86,12 +85,6 @@ jalv_init(int* argc, char*** argv, JalvOptions* opts) return 1; } opts->ui_uri = jalv_strdup((*argv)[a]); - } else if ((*argv)[a][1] == 'u') { - if (++a == *argc) { - fprintf(stderr, "Missing argument for -u\n"); - return 1; - } - opts->uuid = jalv_strdup((*argv)[a]); } else if ((*argv)[a][1] == 'l') { if (++a == *argc) { fprintf(stderr, "Missing argument for -l\n"); diff --git a/src/jalv_gtk.c b/src/jalv_gtk.c index 7e456e7..2cdaf23 100644 --- a/src/jalv_gtk.c +++ b/src/jalv_gtk.c @@ -107,8 +107,6 @@ int jalv_init(int* argc, char*** argv, JalvOptions* opts) { GOptionEntry entries[] = { - { "uuid", 'u', 0, G_OPTION_ARG_STRING, &opts->uuid, - "UUID for Jack session restoration", "UUID" }, { "load", 'l', 0, G_OPTION_ARG_STRING, &opts->load, "Load state from save directory", "DIR" }, { "preset", 'p', 0, G_OPTION_ARG_STRING, &opts->preset, diff --git a/src/jalv_internal.h b/src/jalv_internal.h index 0932460..5bc511f 100644 --- a/src/jalv_internal.h +++ b/src/jalv_internal.h @@ -169,7 +169,6 @@ typedef struct { typedef struct { char* name; ///< Client name int name_exact; ///< Exit if name is taken - char* uuid; ///< Session UUID char* load; ///< Path for state to load char* preset; ///< URI of preset to load char** controls; ///< Control values |