diff --git a/daemon/cmd_load_studio.c b/daemon/cmd_load_studio.c index 74d61bfd..d42489a6 100644 --- a/daemon/cmd_load_studio.c +++ b/daemon/cmd_load_studio.c @@ -839,7 +839,7 @@ static bool run(void * command_context) ASSERT(cmd_ptr->command.state == LADISH_COMMAND_STATE_PENDING); - if (!studio_compose_filename(cmd_ptr->studio_name, &path, NULL)) + if (!ladish_studio_compose_filename(cmd_ptr->studio_name, &path, NULL)) { log_error("failed to compose path of studio \%s\" file", cmd_ptr->studio_name); return false; @@ -939,7 +939,7 @@ static bool run(void * command_context) ladish_graph_dump(g_studio.jack_graph); ladish_graph_dump(g_studio.studio_graph); - if (!studio_publish()) + if (!ladish_studio_publish()) { log_error("studio_publish() failed."); return false; diff --git a/daemon/cmd_new_app.c b/daemon/cmd_new_app.c index 9c448dd0..3653ad87 100644 --- a/daemon/cmd_new_app.c +++ b/daemon/cmd_new_app.c @@ -134,7 +134,7 @@ static bool run(void * context) return false; } - if (studio_is_started()) + if (ladish_studio_is_started()) { if (!ladish_app_supervisor_run(supervisor, app)) { diff --git a/daemon/cmd_new_studio.c b/daemon/cmd_new_studio.c index 6a5691b1..5d43deb3 100644 --- a/daemon/cmd_new_studio.c +++ b/daemon/cmd_new_studio.c @@ -2,7 +2,7 @@ /* * LADI Session Handler (ladish) * - * Copyright (C) 2009 Nedko Arnaudov + * Copyright (C) 2009, 2010 Nedko Arnaudov * ************************************************************************** * This file contains implementation of the "new studio" command @@ -45,13 +45,13 @@ static bool run(void * context) g_studio.name = cmd_ptr->studio_name; cmd_ptr->studio_name = NULL; } - else if (!studio_name_generate(&g_studio.name)) + else if (!ladish_studio_name_generate(&g_studio.name)) { log_error("studio_name_generate() failed."); return false; } - if (!studio_publish()) + if (!ladish_studio_publish()) { log_error("studio_publish() failed."); free(g_studio.name); diff --git a/daemon/cmd_rename_studio.c b/daemon/cmd_rename_studio.c index 37740f38..39aad1df 100644 --- a/daemon/cmd_rename_studio.c +++ b/daemon/cmd_rename_studio.c @@ -2,7 +2,7 @@ /* * LADI Session Handler (ladish) * - * Copyright (C) 2009 Nedko Arnaudov + * Copyright (C) 2009, 2010 Nedko Arnaudov * ************************************************************************** * This file contains implementation of the "rename studio" command @@ -48,7 +48,7 @@ static bool run(void * context) free(g_studio.name); g_studio.name = cmd_ptr->studio_name; cmd_ptr->studio_name = NULL; - emit_studio_renamed(); + ladish_studio_emit_renamed(); cmd_ptr->command.state = LADISH_COMMAND_STATE_DONE; return true; } diff --git a/daemon/cmd_save_studio.c b/daemon/cmd_save_studio.c index 35951567..98e76181 100644 --- a/daemon/cmd_save_studio.c +++ b/daemon/cmd_save_studio.c @@ -707,14 +707,14 @@ static bool run(void * command_context) save_apps(); - if (!studio_is_started()) + if (!ladish_studio_is_started()) { log_error("Cannot save not-started studio"); ladish_notify_simple(LADISH_NOTIFY_URGENCY_HIGH, "Cannot save not-started studio", NULL); goto exit; } - if (!studio_compose_filename(cmd_ptr->studio_name, &filename, &bak_filename)) + if (!ladish_studio_compose_filename(cmd_ptr->studio_name, &filename, &bak_filename)) { log_error("failed to compose studio filename"); goto exit; @@ -937,7 +937,7 @@ static bool run(void * command_context) free(g_studio.name); g_studio.name = cmd_ptr->studio_name; cmd_ptr->studio_name = NULL; - emit_studio_renamed(); + ladish_studio_emit_renamed(); } close: diff --git a/daemon/cmd_start_studio.c b/daemon/cmd_start_studio.c index 70e8ab2a..62769f41 100644 --- a/daemon/cmd_start_studio.c +++ b/daemon/cmd_start_studio.c @@ -48,7 +48,7 @@ static bool run(void * context) switch (cmd_ptr->command.state) { case LADISH_COMMAND_STATE_PENDING: - if (studio_is_started()) + if (ladish_studio_is_started()) { log_info("Ignoring start request because studio is already started."); /* nothing to do, studio is already running */ @@ -111,7 +111,7 @@ static bool run(void * context) ASSERT(jack_server_started); - on_event_jack_started(); /* fetch configuration and announce start */ + ladish_studio_on_event_jack_started(); /* fetch configuration and announce start */ cmd_ptr->command.state = LADISH_COMMAND_STATE_DONE; return true; diff --git a/daemon/cmd_stop_studio.c b/daemon/cmd_stop_studio.c index fd3bc1f6..a5cbc79c 100644 --- a/daemon/cmd_stop_studio.c +++ b/daemon/cmd_stop_studio.c @@ -53,7 +53,7 @@ static bool run(void * context) switch (cmd_ptr->command.state) { case LADISH_COMMAND_STATE_PENDING: - if (!studio_is_started()) + if (!ladish_studio_is_started()) { log_info("Ignoring stop request because studio is already stopped."); /* nothing to do, studio is not running */ @@ -64,7 +64,7 @@ static bool run(void * context) ladish_graph_dump(g_studio.jack_graph); ladish_graph_dump(g_studio.studio_graph); - studio_stop_app_supervisors(); + ladish_studio_stop_app_supervisors(); cmd_ptr->command.state = LADISH_COMMAND_STATE_WAITING; cmd_ptr->stop_state = STOP_STATE_WAITING_FOR_JACK_CLIENTS_DISAPPEAR; @@ -150,7 +150,7 @@ static bool run(void * context) ladish_graph_dump(g_studio.studio_graph); - on_event_jack_stopped(); + ladish_studio_on_event_jack_stopped(); cmd_ptr->command.state = LADISH_COMMAND_STATE_DONE; return true; diff --git a/daemon/cmd_unload_studio.c b/daemon/cmd_unload_studio.c index 9537c176..5e2fb979 100644 --- a/daemon/cmd_unload_studio.c +++ b/daemon/cmd_unload_studio.c @@ -40,9 +40,9 @@ static bool run(void * context) ladish_graph_clear(g_studio.studio_graph); ladish_graph_clear(g_studio.jack_graph); - studio_remove_all_rooms(); + ladish_studio_remove_all_rooms(); - jack_conf_clear(); + ladish_studio_jack_conf_clear(); g_studio.modified = false; g_studio.persisted = false; diff --git a/daemon/control.c b/daemon/control.c index 04fb1c5c..7043998f 100644 --- a/daemon/control.c +++ b/daemon/control.c @@ -312,7 +312,7 @@ static void ladish_is_studio_loaded(struct dbus_method_call * call_ptr) DBusMessageIter iter; dbus_bool_t is_loaded; - is_loaded = studio_is_loaded(); + is_loaded = ladish_studio_is_loaded(); call_ptr->reply = dbus_message_new_method_return(call_ptr->message); if (call_ptr->reply == NULL) @@ -393,7 +393,7 @@ static void ladish_get_studio_list(struct dbus_method_call * call_ptr) goto fail_unref; } - if (!studios_iterate(call_ptr, &array_iter, get_studio_list_callback)) + if (!ladish_studios_iterate(call_ptr, &array_iter, get_studio_list_callback)) { dbus_message_iter_close_container(&iter, &array_iter); if (call_ptr->reply == NULL) @@ -452,7 +452,7 @@ static void ladish_delete_studio(struct dbus_method_call * call_ptr) return; } - if (studio_delete(call_ptr, name)) + if (ladish_studio_delete(call_ptr, name)) { method_return_new_void(call_ptr); } diff --git a/daemon/main.c b/daemon/main.c index b2196162..869e350a 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -269,7 +269,7 @@ int main(int argc, char ** argv, char ** envp) goto exit; } - loader_init(studio_on_child_exit); + loader_init(ladish_studio_on_child_exit); if (!room_templates_init()) { @@ -309,7 +309,7 @@ int main(int argc, char ** argv, char ** envp) goto uninit_a2j; } - if (!studio_init()) + if (!ladish_studio_init()) { goto uninit_jmcore; } @@ -320,7 +320,7 @@ int main(int argc, char ** argv, char ** envp) { dbus_connection_read_write_dispatch(g_dbus_connection, 50); loader_run(); - studio_run(); + ladish_studio_run(); } emit_clean_exit(); @@ -330,7 +330,7 @@ int main(int argc, char ** argv, char ** envp) log_debug("Finished, cleaning up"); - studio_uninit(); + ladish_studio_uninit(); uninit_jmcore: jmcore_proxy_uninit(); diff --git a/daemon/studio.c b/daemon/studio.c index 90c7bafc..46b0a2a9 100644 --- a/daemon/studio.c +++ b/daemon/studio.c @@ -48,7 +48,7 @@ char * g_studios_dir; struct studio g_studio; -bool studio_name_generate(char ** name_ptr) +bool ladish_studio_name_generate(char ** name_ptr) { time_t now; char timestamp_str[26]; @@ -70,8 +70,7 @@ bool studio_name_generate(char ** name_ptr) return true; } -bool -studio_publish(void) +bool ladish_studio_publish(void) { dbus_object_path object; @@ -107,22 +106,22 @@ studio_publish(void) return true; } -void emit_studio_started(void) +void ladish_studio_emit_started(void) { dbus_signal_emit(g_dbus_connection, STUDIO_OBJECT_PATH, IFACE_STUDIO, "StudioStarted", ""); } -void emit_studio_crashed(void) +void ladish_studio_emit_crashed(void) { dbus_signal_emit(g_dbus_connection, STUDIO_OBJECT_PATH, IFACE_STUDIO, "StudioCrashed", ""); } -void emit_studio_stopped(void) +void ladish_studio_emit_stopped(void) { dbus_signal_emit(g_dbus_connection, STUDIO_OBJECT_PATH, IFACE_STUDIO, "StudioStopped", ""); } -static bool fill_room_info(DBusMessageIter * iter_ptr, ladish_room_handle room) +static bool ladish_studio_fill_room_info(DBusMessageIter * iter_ptr, ladish_room_handle room) { DBusMessageIter dict_iter; const char * name; @@ -185,7 +184,7 @@ static bool fill_room_info(DBusMessageIter * iter_ptr, ladish_room_handle room) return true; } -static void emit_room_appeared(ladish_room_handle room) +static void ladish_studio_emit_room_appeared(ladish_room_handle room) { DBusMessage * message_ptr; DBusMessageIter iter; @@ -199,7 +198,7 @@ static void emit_room_appeared(ladish_room_handle room) dbus_message_iter_init_append(message_ptr, &iter); - if (fill_room_info(&iter, room)) + if (ladish_studio_fill_room_info(&iter, room)) { dbus_signal_send(g_dbus_connection, message_ptr); } @@ -207,7 +206,7 @@ static void emit_room_appeared(ladish_room_handle room) dbus_message_unref(message_ptr); } -static void emit_room_disappeared(ladish_room_handle room) +static void ladish_studio_emit_room_disappeared(ladish_room_handle room) { DBusMessage * message_ptr; DBusMessageIter iter; @@ -221,7 +220,7 @@ static void emit_room_disappeared(ladish_room_handle room) dbus_message_iter_init_append(message_ptr, &iter); - if (fill_room_info(&iter, room)) + if (ladish_studio_fill_room_info(&iter, room)) { dbus_signal_send(g_dbus_connection, message_ptr); } @@ -230,7 +229,7 @@ static void emit_room_disappeared(ladish_room_handle room) } bool -set_graph_connection_handlers( +ladish_studio_set_graph_connection_handlers( void * context, ladish_graph_handle graph, ladish_app_supervisor_handle app_supervisor) @@ -239,9 +238,9 @@ set_graph_connection_handlers( return true; /* iterate all graphs */ } -void on_event_jack_started(void) +void ladish_studio_on_event_jack_started(void) { - if (!studio_fetch_jack_settings()) + if (!ladish_studio_fetch_jack_settings()) { log_error("studio_fetch_jack_settings() failed."); @@ -263,7 +262,7 @@ void on_event_jack_started(void) } else { - studio_iterate_virtual_graphs(g_studio.virtualizer, set_graph_connection_handlers); + ladish_studio_iterate_virtual_graphs(g_studio.virtualizer, ladish_studio_set_graph_connection_handlers); } if (!graph_proxy_activate(g_studio.jack_graph_proxy)) @@ -274,11 +273,11 @@ void on_event_jack_started(void) ladish_app_supervisor_autorun(g_studio.app_supervisor); - emit_studio_started(); + ladish_studio_emit_started(); ladish_notify_simple(LADISH_NOTIFY_URGENCY_NORMAL, "Studio started", NULL); } -static void on_jack_stopped_internal(void) +static void ladish_studio_on_jack_stopped_internal(void) { if (g_studio.virtualizer) { @@ -293,28 +292,28 @@ static void on_jack_stopped_internal(void) } } -void on_event_jack_stopped(void) +void ladish_studio_on_event_jack_stopped(void) { - emit_studio_stopped(); - on_jack_stopped_internal(); + ladish_studio_emit_stopped(); + ladish_studio_on_jack_stopped_internal(); ladish_notify_simple(LADISH_NOTIFY_URGENCY_NORMAL, "Studio stopped", NULL); } -void handle_unexpected_jack_server_stop(void) +void ladish_studio_handle_unexpected_jack_server_stop(void) { - emit_studio_crashed(); - on_jack_stopped_internal(); + ladish_studio_emit_crashed(); + ladish_studio_on_jack_stopped_internal(); /* TODO: if user wants, restart jack server and reconnect all jack apps to it */ } -static bool hide_vgraph_non_virtual(void * context, ladish_graph_handle graph, ladish_app_supervisor_handle app_supervisor) +static bool ladish_studio_hide_vgraph_non_virtual(void * context, ladish_graph_handle graph, ladish_app_supervisor_handle app_supervisor) { ladish_graph_hide_non_virtual(graph); return true; /* iterate all vgraphs */ } -void studio_run(void) +void ladish_studio_run(void) { bool state; @@ -336,7 +335,7 @@ void studio_run(void) if (g_studio.dbus_object == NULL) { ASSERT(g_studio.name == NULL); - if (!studio_name_generate(&g_studio.name)) + if (!ladish_studio_name_generate(&g_studio.name)) { log_error("studio_name_generate() failed."); return; @@ -344,10 +343,10 @@ void studio_run(void) g_studio.automatic = true; - studio_publish(); + ladish_studio_publish(); } - on_event_jack_started(); + ladish_studio_on_event_jack_started(); } else { @@ -359,7 +358,7 @@ void studio_run(void) log_info("Unloading automatic studio."); ladish_command_unload_studio(NULL, &g_studio.cmd_queue); - on_event_jack_stopped(); + ladish_studio_on_event_jack_stopped(); return; } @@ -370,7 +369,7 @@ void studio_run(void) "Studio crashed", "JACK stopped unexpectedly.\n\n" "Save your work, then unload and reload the studio."); - handle_unexpected_jack_server_stop(); + ladish_studio_handle_unexpected_jack_server_stop(); } } @@ -390,34 +389,34 @@ void studio_run(void) "Save your work, then unload and reload the studio."); ladish_environment_reset_stealth(&g_studio.env_store, ladish_environment_jack_server_started); - studio_iterate_virtual_graphs(NULL, hide_vgraph_non_virtual); + ladish_studio_iterate_virtual_graphs(NULL, ladish_studio_hide_vgraph_non_virtual); - handle_unexpected_jack_server_stop(); + ladish_studio_handle_unexpected_jack_server_stop(); } } ladish_environment_assert_consumed(&g_studio.env_store); } -static void on_jack_server_started(void) +static void ladish_studio_on_jack_server_started(void) { log_info("JACK server start detected."); ladish_environment_set(&g_studio.env_store, ladish_environment_jack_server_started); } -static void on_jack_server_stopped(void) +static void ladish_studio_on_jack_server_stopped(void) { log_info("JACK server stop detected."); ladish_environment_reset(&g_studio.env_store, ladish_environment_jack_server_started); } -static void on_jack_server_appeared(void) +static void ladish_studio_on_jack_server_appeared(void) { log_info("JACK controller appeared."); ladish_environment_set(&g_studio.env_store, ladish_environment_jack_server_present); } -static void on_jack_server_disappeared(void) +static void ladish_studio_on_jack_server_disappeared(void) { log_info("JACK controller disappeared."); ladish_environment_reset(&g_studio.env_store, ladish_environment_jack_server_present); @@ -440,7 +439,7 @@ void ladish_on_app_renamed(void * context, const char * old_name, const char * n } } -bool studio_init(void) +bool ladish_studio_init(void) { log_info("studio object construct"); @@ -497,10 +496,10 @@ bool studio_init(void) ladish_environment_init(&g_studio.env_store); if (!jack_proxy_init( - on_jack_server_started, - on_jack_server_stopped, - on_jack_server_appeared, - on_jack_server_disappeared)) + ladish_studio_on_jack_server_started, + ladish_studio_on_jack_server_stopped, + ladish_studio_on_jack_server_appeared, + ladish_studio_on_jack_server_disappeared)) { log_error("jack_proxy_init() failed."); goto app_supervisor_destroy; @@ -520,7 +519,7 @@ fail: return false; } -void studio_uninit(void) +void ladish_studio_uninit(void) { log_info("studio_uninit()"); @@ -546,7 +545,7 @@ struct on_child_exit_context static bool -studio_on_child_exit_callback( +ladish_studio_on_child_exit_callback( void * context, ladish_graph_handle graph, ladish_app_supervisor_handle app_supervisor) @@ -559,14 +558,14 @@ studio_on_child_exit_callback( #undef child_exit_context_ptr -void studio_on_child_exit(pid_t pid) +void ladish_studio_on_child_exit(pid_t pid) { struct on_child_exit_context context; context.pid = pid; context.found = false; - studio_iterate_virtual_graphs(&context, studio_on_child_exit_callback); + ladish_studio_iterate_virtual_graphs(&context, ladish_studio_on_child_exit_callback); if (!context.found) { @@ -574,17 +573,17 @@ void studio_on_child_exit(pid_t pid) } } -bool studio_is_loaded(void) +bool ladish_studio_is_loaded(void) { return g_studio.dbus_object != NULL; } -bool studio_is_started(void) +bool ladish_studio_is_started(void) { return ladish_environment_get(&g_studio.env_store, ladish_environment_jack_server_started); } -bool studio_compose_filename(const char * name, char ** filename_ptr_ptr, char ** backup_filename_ptr_ptr) +bool ladish_studio_compose_filename(const char * name, char ** filename_ptr_ptr, char ** backup_filename_ptr_ptr) { size_t len_dir; char * p; @@ -668,11 +667,11 @@ ladish_app_supervisor_handle ladish_studio_find_app_supervisor(const char * opat ctx.opath = opath; ctx.supervisor = NULL; - studio_iterate_virtual_graphs(&ctx, ladish_studio_app_supervisor_match); + ladish_studio_iterate_virtual_graphs(&ctx, ladish_studio_app_supervisor_match); return ctx.supervisor; } -bool studios_iterate(void * call_ptr, void * context, bool (* callback)(void * call_ptr, void * context, const char * studio, uint32_t modtime)) +bool ladish_studios_iterate(void * call_ptr, void * context, bool (* callback)(void * call_ptr, void * context, const char * studio, uint32_t modtime)) { DIR * dir; struct dirent * dentry; @@ -741,7 +740,7 @@ bool studios_iterate(void * call_ptr, void * context, bool (* callback)(void * c return true; } -bool studio_delete(void * call_ptr, const char * studio_name) +bool ladish_studio_delete(void * call_ptr, const char * studio_name) { char * filename; char * bak_filename; @@ -750,7 +749,7 @@ bool studio_delete(void * call_ptr, const char * studio_name) ret = false; - if (!studio_compose_filename(studio_name, &filename, &bak_filename)) + if (!ladish_studio_compose_filename(studio_name, &filename, &bak_filename)) { lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "failed to compose studio filename"); goto exit; @@ -784,7 +783,7 @@ exit: } bool -studio_iterate_virtual_graphs( +ladish_studio_iterate_virtual_graphs( void * context, bool (* callback)( void * context, @@ -817,28 +816,28 @@ studio_iterate_virtual_graphs( return true; } -static bool studio_stop_app_supervisor(void * context, ladish_graph_handle graph, ladish_app_supervisor_handle app_supervisor) +static bool ladish_studio_stop_app_supervisor(void * context, ladish_graph_handle graph, ladish_app_supervisor_handle app_supervisor) { ladish_app_supervisor_stop(app_supervisor); return true; /* iterate all supervisors */ } -void studio_stop_app_supervisors(void) +void ladish_studio_stop_app_supervisors(void) { - studio_iterate_virtual_graphs(NULL, studio_stop_app_supervisor); + ladish_studio_iterate_virtual_graphs(NULL, ladish_studio_stop_app_supervisor); } -void emit_studio_renamed() +void ladish_studio_emit_renamed(void) { dbus_signal_emit(g_dbus_connection, STUDIO_OBJECT_PATH, IFACE_STUDIO, "StudioRenamed", "s", &g_studio.name); } -static void ladish_get_studio_name(struct dbus_method_call * call_ptr) +static void ladish_studio_dbus_get_name(struct dbus_method_call * call_ptr) { method_return_new_single(call_ptr, DBUS_TYPE_STRING, &g_studio.name); } -static void ladish_rename_studio(struct dbus_method_call * call_ptr) +static void ladish_studio_dbus_rename(struct dbus_method_call * call_ptr) { const char * new_name; char * new_name_dup; @@ -863,25 +862,20 @@ static void ladish_rename_studio(struct dbus_method_call * call_ptr) g_studio.name = new_name_dup; method_return_new_void(call_ptr); - emit_studio_renamed(); + ladish_studio_emit_renamed(); } -static bool ladish_save_studio_internal(struct dbus_method_call * call_ptr, const char * new_studio_name) -{ - return ladish_command_save_studio(call_ptr, &g_studio.cmd_queue, new_studio_name); -} - -static void ladish_save_studio(struct dbus_method_call * call_ptr) +static void ladish_studio_dbus_save(struct dbus_method_call * call_ptr) { log_info("Save studio request"); - if (ladish_save_studio_internal(call_ptr, g_studio.name)) + if (ladish_command_save_studio(call_ptr, &g_studio.cmd_queue, g_studio.name)) { method_return_new_void(call_ptr); } } -static void ladish_save_as_studio(struct dbus_method_call * call_ptr) +static void ladish_studio_dbus_save_as(struct dbus_method_call * call_ptr) { const char * new_name; @@ -894,13 +888,13 @@ static void ladish_save_as_studio(struct dbus_method_call * call_ptr) return; } - if (ladish_save_studio_internal(call_ptr, new_name)) + if (ladish_command_save_studio(call_ptr, &g_studio.cmd_queue, new_name)) { method_return_new_void(call_ptr); } } -static void ladish_unload_studio(struct dbus_method_call * call_ptr) +static void ladish_studio_dbus_unload(struct dbus_method_call * call_ptr) { log_info("Unload studio request"); @@ -910,7 +904,7 @@ static void ladish_unload_studio(struct dbus_method_call * call_ptr) } } -static void ladish_stop_studio(struct dbus_method_call * call_ptr) +static void ladish_studio_dbus_stop(struct dbus_method_call * call_ptr) { log_info("Stop studio request"); @@ -922,7 +916,7 @@ static void ladish_stop_studio(struct dbus_method_call * call_ptr) } } -static void ladish_start_studio(struct dbus_method_call * call_ptr) +static void ladish_studio_dbus_start(struct dbus_method_call * call_ptr) { log_info("Start studio request"); @@ -934,7 +928,7 @@ static void ladish_start_studio(struct dbus_method_call * call_ptr) } } -static void ladish_studio_is_started(struct dbus_method_call * call_ptr) +static void ladish_studio_dbus_is_started(struct dbus_method_call * call_ptr) { dbus_bool_t started; @@ -953,7 +947,7 @@ struct add_room_ports_context static bool -add_room_ports( +ladish_studio_add_room_ports( void * context, ladish_port_handle port_handle, const char * port_name, @@ -1024,7 +1018,7 @@ add_room_ports( #undef add_room_ports_context_ptr -static void ladish_studio_create_room(struct dbus_method_call * call_ptr) +static void ladish_studio_dbus_create_room(struct dbus_method_call * call_ptr) { const char * room_name; const char * template_name; @@ -1086,7 +1080,7 @@ static void ladish_studio_create_room(struct dbus_method_call * call_ptr) context.room_client = room_client; context.room_graph = room_graph; - if (!ladish_room_iterate_link_ports(room, &context, add_room_ports)) + if (!ladish_room_iterate_link_ports(room, &context, ladish_studio_add_room_ports)) { lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "Creation of studio room link ports failed."); goto fail_remove_room_client; @@ -1094,7 +1088,7 @@ static void ladish_studio_create_room(struct dbus_method_call * call_ptr) list_add_tail(ladish_room_get_list_node(room), &g_studio.rooms); - emit_room_appeared(room); + ladish_studio_emit_room_appeared(room); method_return_new_void(call_ptr); return; @@ -1111,7 +1105,7 @@ fail: return; } -static void ladish_studio_get_room_list(struct dbus_method_call * call_ptr) +static void ladish_studio_dbus_get_room_list(struct dbus_method_call * call_ptr) { DBusMessageIter iter, array_iter; DBusMessageIter struct_iter; @@ -1138,7 +1132,7 @@ static void ladish_studio_get_room_list(struct dbus_method_call * call_ptr) if (!dbus_message_iter_open_container(&array_iter, DBUS_TYPE_STRUCT, NULL, &struct_iter)) goto fail_unref; - if (!fill_room_info(&struct_iter, room)) + if (!ladish_studio_fill_room_info(&struct_iter, room)) goto fail_unref; if (!dbus_message_iter_close_container(&array_iter, &struct_iter)) @@ -1160,7 +1154,7 @@ fail: log_error("Ran out of memory trying to construct method return"); } -static void ladish_studio_delete_room(struct dbus_method_call * call_ptr) +static void ladish_studio_dbus_delete_room(struct dbus_method_call * call_ptr) { const char * name; struct list_head * node_ptr; @@ -1196,7 +1190,7 @@ static void ladish_studio_delete_room(struct dbus_method_call * call_ptr) } list_del(node_ptr); - emit_room_disappeared(room); + ladish_studio_emit_room_disappeared(room); ladish_room_get_uuid(room, room_uuid); room_client = ladish_graph_find_client_by_uuid(g_studio.studio_graph, room_uuid); @@ -1214,7 +1208,7 @@ static void ladish_studio_delete_room(struct dbus_method_call * call_ptr) return; } -void studio_remove_all_rooms(void) +void ladish_studio_remove_all_rooms(void) { struct list_head * node_ptr; ladish_room_handle room; @@ -1224,7 +1218,7 @@ void studio_remove_all_rooms(void) node_ptr = g_studio.rooms.next; list_del(node_ptr); room = ladish_room_from_list_node(node_ptr); - emit_room_disappeared(room); + ladish_studio_emit_room_disappeared(room); ladish_room_destroy(room); } } @@ -1271,17 +1265,17 @@ METHOD_ARGS_BEGIN(DeleteRoom, "Delete studio room") METHOD_ARGS_END METHODS_BEGIN - METHOD_DESCRIBE(GetName, ladish_get_studio_name) - METHOD_DESCRIBE(Rename, ladish_rename_studio) - METHOD_DESCRIBE(Save, ladish_save_studio) - METHOD_DESCRIBE(SaveAs, ladish_save_as_studio) - METHOD_DESCRIBE(Unload, ladish_unload_studio) - METHOD_DESCRIBE(Start, ladish_start_studio) - METHOD_DESCRIBE(Stop, ladish_stop_studio) - METHOD_DESCRIBE(IsStarted, ladish_studio_is_started) - METHOD_DESCRIBE(CreateRoom, ladish_studio_create_room) - METHOD_DESCRIBE(GetRoomList, ladish_studio_get_room_list) - METHOD_DESCRIBE(DeleteRoom, ladish_studio_delete_room) + METHOD_DESCRIBE(GetName, ladish_studio_dbus_get_name) + METHOD_DESCRIBE(Rename, ladish_studio_dbus_rename) + METHOD_DESCRIBE(Save, ladish_studio_dbus_save) + METHOD_DESCRIBE(SaveAs, ladish_studio_dbus_save_as) + METHOD_DESCRIBE(Unload, ladish_studio_dbus_unload) + METHOD_DESCRIBE(Start, ladish_studio_dbus_start) + METHOD_DESCRIBE(Stop, ladish_studio_dbus_stop) + METHOD_DESCRIBE(IsStarted, ladish_studio_dbus_is_started) + METHOD_DESCRIBE(CreateRoom, ladish_studio_dbus_create_room) + METHOD_DESCRIBE(GetRoomList, ladish_studio_dbus_get_room_list) + METHOD_DESCRIBE(DeleteRoom, ladish_studio_dbus_delete_room) METHODS_END SIGNAL_ARGS_BEGIN(StudioRenamed, "Studio name changed") diff --git a/daemon/studio.h b/daemon/studio.h index 8f934cdf..81a7cc20 100644 --- a/daemon/studio.h +++ b/daemon/studio.h @@ -30,26 +30,26 @@ #include "app_supervisor.h" #include "graph.h" -bool studio_init(void); -void studio_uninit(void); -void studio_run(void); -bool studio_is_loaded(void); -bool studio_is_started(void); +bool ladish_studio_init(void); +void ladish_studio_uninit(void); +void ladish_studio_run(void); +bool ladish_studio_is_loaded(void); +bool ladish_studio_is_started(void); -bool studios_iterate(void * call_ptr, void * context, bool (* callback)(void * call_ptr, void * context, const char * studio, uint32_t modtime)); -bool studio_delete(void * call_ptr, const char * studio_name); +bool ladish_studios_iterate(void * call_ptr, void * context, bool (* callback)(void * call_ptr, void * context, const char * studio, uint32_t modtime)); +bool ladish_studio_delete(void * call_ptr, const char * studio_name); -void studio_on_child_exit(pid_t pid); +void ladish_studio_on_child_exit(pid_t pid); bool -studio_iterate_virtual_graphs( +ladish_studio_iterate_virtual_graphs( void * context, bool (* callback)( void * context, ladish_graph_handle graph, ladish_app_supervisor_handle app_supervisor)); -void studio_stop_app_supervisors(void); +void ladish_studio_stop_app_supervisors(void); ladish_app_supervisor_handle ladish_studio_find_app_supervisor(const char * opath); struct ladish_cqueue * ladish_studio_get_cmd_queue(void); diff --git a/daemon/studio_internal.h b/daemon/studio_internal.h index 98b5100f..41d9221e 100644 --- a/daemon/studio_internal.h +++ b/daemon/studio_internal.h @@ -186,16 +186,16 @@ extern struct studio g_studio; extern const struct dbus_interface_descriptor g_interface_studio; -void jack_conf_clear(void); -bool studio_fetch_jack_settings(void); -bool studio_compose_filename(const char * name, char ** filename_ptr_ptr, char ** backup_filename_ptr_ptr); -bool studio_publish(void); -bool studio_name_generate(char ** name_ptr); -void emit_studio_started(void); -void emit_studio_stopped(void); -void emit_studio_renamed(void); -void on_event_jack_started(void); -void on_event_jack_stopped(void); -void studio_remove_all_rooms(void); +void ladish_studio_jack_conf_clear(void); +bool ladish_studio_fetch_jack_settings(void); +bool ladish_studio_compose_filename(const char * name, char ** filename_ptr_ptr, char ** backup_filename_ptr_ptr); +bool ladish_studio_publish(void); +bool ladish_studio_name_generate(char ** name_ptr); +void ladish_studio_emit_started(void); +void ladish_studio_emit_stopped(void); +void ladish_studio_emit_renamed(void); +void ladish_studio_on_event_jack_started(void); +void ladish_studio_on_event_jack_stopped(void); +void ladish_studio_remove_all_rooms(void); #endif /* #ifndef STUDIO_INTERNAL_H__B4CB73EC_8E89_401A_9E49_F0AEEF361D09__INCLUDED */ diff --git a/daemon/studio_jack_conf.c b/daemon/studio_jack_conf.c index e8e32ee6..3127af4b 100644 --- a/daemon/studio_jack_conf.c +++ b/daemon/studio_jack_conf.c @@ -2,7 +2,7 @@ /* * LADI Session Handler (ladish) * - * Copyright (C) 2009 Nedko Arnaudov + * Copyright (C) 2009, 2010 Nedko Arnaudov * ************************************************************************** * This file contains implementation of the studio functionality @@ -36,8 +36,9 @@ #include "studio_internal.h" +static bool -jack_conf_container_create( +ladish_studio_jack_conf_container_create( struct jack_conf_container ** container_ptr_ptr, const char * name) { @@ -70,8 +71,9 @@ fail: return false; } +static bool -jack_conf_parameter_create( +ladish_studio_jack_conf_parameter_create( struct jack_conf_parameter ** parameter_ptr_ptr, const char * name) { @@ -101,8 +103,9 @@ fail: return false; } +static void -jack_conf_parameter_destroy( +ladish_studio_jack_conf_parameter_destroy( struct jack_conf_parameter * parameter_ptr) { #if 0 @@ -140,8 +143,9 @@ jack_conf_parameter_destroy( free(parameter_ptr); } +static void -jack_conf_container_destroy( +ladish_studio_jack_conf_container_destroy( struct jack_conf_container * container_ptr) { struct list_head * node_ptr; @@ -154,7 +158,7 @@ jack_conf_container_destroy( { node_ptr = container_ptr->children.next; list_del(node_ptr); - jack_conf_container_destroy(list_entry(node_ptr, struct jack_conf_container, siblings)); + ladish_studio_jack_conf_container_destroy(list_entry(node_ptr, struct jack_conf_container, siblings)); } } else @@ -163,7 +167,7 @@ jack_conf_container_destroy( { node_ptr = container_ptr->children.next; list_del(node_ptr); - jack_conf_parameter_destroy(list_entry(node_ptr, struct jack_conf_parameter, siblings)); + ladish_studio_jack_conf_parameter_destroy(list_entry(node_ptr, struct jack_conf_parameter, siblings)); } } @@ -175,7 +179,7 @@ jack_conf_container_destroy( static bool -conf_callback( +ladish_studio_jack_conf_callback( void * context, bool leaf, const char * address, @@ -240,7 +244,7 @@ conf_callback( parent_ptr->children_leafs = true; } - if (!jack_conf_parameter_create(¶meter_ptr, child)) + if (!ladish_studio_jack_conf_parameter_create(¶meter_ptr, child)) { log_error("jack_conf_parameter_create() failed"); return false; @@ -286,7 +290,7 @@ conf_callback( } else { - jack_conf_parameter_destroy(parameter_ptr); + ladish_studio_jack_conf_parameter_destroy(parameter_ptr); } } else @@ -299,7 +303,7 @@ conf_callback( return false; } - if (!jack_conf_container_create(&container_ptr, child)) + if (!ladish_studio_jack_conf_container_create(&container_ptr, child)) { log_error("jack_conf_container_create() failed"); return false; @@ -318,7 +322,7 @@ conf_callback( context_ptr->parent_ptr = container_ptr; - if (!jack_proxy_read_conf_container(context_ptr->address, context, conf_callback)) + if (!jack_proxy_read_conf_container(context_ptr->address, context, ladish_studio_jack_conf_callback)) { log_error("cannot read container %s", path); return false; @@ -334,7 +338,7 @@ conf_callback( #undef context_ptr -void jack_conf_clear(void) +void ladish_studio_jack_conf_clear(void) { struct list_head * node_ptr; @@ -343,23 +347,23 @@ void jack_conf_clear(void) { node_ptr = g_studio.jack_conf.next; list_del(node_ptr); - jack_conf_container_destroy(list_entry(node_ptr, struct jack_conf_container, siblings)); + ladish_studio_jack_conf_container_destroy(list_entry(node_ptr, struct jack_conf_container, siblings)); } g_studio.jack_conf_valid = false; } -bool studio_fetch_jack_settings(void) +bool ladish_studio_fetch_jack_settings(void) { struct conf_callback_context context; - jack_conf_clear(); + ladish_studio_jack_conf_clear(); context.address[0] = 0; context.container_ptr = &g_studio.jack_conf; context.parent_ptr = NULL; - if (!jack_proxy_read_conf_container(context.address, &context, conf_callback)) + if (!jack_proxy_read_conf_container(context.address, &context, ladish_studio_jack_conf_callback)) { log_error("jack_proxy_read_conf_container() failed."); return false; diff --git a/daemon/virtualizer.c b/daemon/virtualizer.c index 14a89274..b0310a11 100644 --- a/daemon/virtualizer.c +++ b/daemon/virtualizer.c @@ -108,7 +108,7 @@ char * get_app_name(struct virtualizer * virtualizer_ptr, uint64_t client_id, pi context.app_name = NULL; context.graph = NULL; - studio_iterate_virtual_graphs(&context, get_app_name_from_supervisor); + ladish_studio_iterate_virtual_graphs(&context, get_app_name_from_supervisor); if (context.app_name != NULL) { @@ -174,7 +174,7 @@ static ladish_graph_handle find_link_port_vgraph_by_uuid(struct virtualizer * vi context.graph = NULL; context.port = NULL; - studio_iterate_virtual_graphs(&context, find_link_port_vgraph_callback_by_uuid); + ladish_studio_iterate_virtual_graphs(&context, find_link_port_vgraph_callback_by_uuid); if (port_ptr != NULL && context.graph != NULL) { @@ -192,7 +192,7 @@ static ladish_graph_handle find_link_port_vgraph_by_jack_id(struct virtualizer * context.graph = NULL; context.port = NULL; - studio_iterate_virtual_graphs(&context, find_link_port_vgraph_callback_by_jack_id); + ladish_studio_iterate_virtual_graphs(&context, find_link_port_vgraph_callback_by_jack_id); if (port_ptr != NULL && context.graph != NULL) {