Index: gui/app_supervisor_proxy.c =================================================================== --- gui/app_supervisor_proxy.c (revision 67a1dd501331bba8bcb39ddb141685879f82c944) +++ gui/app_supervisor_proxy.c (revision 67a1dd501331bba8bcb39ddb141685879f82c944) @@ -0,0 +1,101 @@ +/* -*- Mode: C ; c-basic-offset: 2 -*- */ +/* + * LADI Session Handler (ladish) + * + * Copyright (C) 2009 Nedko Arnaudov + * + ************************************************************************** + * This file contains implementation of code that interfaces + * app supervisor object through D-Bus + ************************************************************************** + * + * LADI Session Handler is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * LADI Session Handler is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LADI Session Handler. If not, see + * or write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "app_supervisor_proxy.h" +#include "../dbus/helpers.h" +#include "../dbus_constants.h" + +struct ladish_app_supervisor_proxy +{ + char * service; + char * object; + uint64_t version; +}; + +bool ladish_app_supervisor_proxy_create(const char * service, const char * object, ladish_app_supervisor_proxy_handle * handle_ptr) +{ + struct ladish_app_supervisor_proxy * proxy_ptr; + + proxy_ptr = malloc(sizeof(struct ladish_app_supervisor_proxy)); + if (proxy_ptr == NULL) + { + log_error("malloc() failed to allocate struct proxy"); + goto fail; + } + + proxy_ptr->service = strdup(service); + if (proxy_ptr->service == NULL) + { + log_error("strdup() failed too duplicate service name '%s'", service); + goto free_proxy; + } + + proxy_ptr->object = strdup(object); + if (proxy_ptr->object == NULL) + { + log_error("strdup() failed too duplicate object name '%s'", object); + goto free_service; + } + + proxy_ptr->version = 0; + + *handle_ptr = (ladish_app_supervisor_proxy_handle)proxy_ptr; + + return true; + +free_service: + free(proxy_ptr->service); + +free_proxy: + free(proxy_ptr); + +fail: + return false; +} + +#define proxy_ptr ((struct ladish_app_supervisor_proxy *)proxy) + +void ladish_app_supervisor_proxy_destroy(ladish_app_supervisor_proxy_handle proxy) +{ + free(proxy_ptr->object); + free(proxy_ptr->service); + free(proxy_ptr); +} + +bool ladish_app_supervisor_proxy_run_custom(ladish_app_supervisor_proxy_handle proxy, const char * command, const char * name, bool run_in_terminal) +{ + dbus_bool_t terminal; + if (!dbus_call(proxy_ptr->service, proxy_ptr->object, IFACE_APP_SUPERVISOR, "RunCustom", "bss", &terminal, &command, &name, "")) + { + log_error("RunCustom() failed."); + return false; + } + + return true; +} + +#undef proxy_ptr Index: gui/app_supervisor_proxy.h =================================================================== --- gui/app_supervisor_proxy.h (revision 67a1dd501331bba8bcb39ddb141685879f82c944) +++ gui/app_supervisor_proxy.h (revision 67a1dd501331bba8bcb39ddb141685879f82c944) @@ -0,0 +1,38 @@ +/* -*- Mode: C ; c-basic-offset: 2 -*- */ +/* + * LADI Session Handler (ladish) + * + * Copyright (C) 2009 Nedko Arnaudov + * + ************************************************************************** + * This file contains interface to app supervisor object that is backed through D-Bus + ************************************************************************** + * + * LADI Session Handler is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * LADI Session Handler is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LADI Session Handler. If not, see + * or write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef APP_SUPERVISOR_PROXY_H__A48C609D_0AB6_4C91_A9B0_BC7F1B7E4CB4__INCLUDED +#define APP_SUPERVISOR_PROXY_H__A48C609D_0AB6_4C91_A9B0_BC7F1B7E4CB4__INCLUDED + +#include "common.h" + +typedef struct ladish_app_supervisor_proxy_tag { int unused; } * ladish_app_supervisor_proxy_handle; + +bool ladish_app_supervisor_proxy_create(const char * service, const char * object, ladish_app_supervisor_proxy_handle * proxy_ptr); +void ladish_app_supervisor_proxy_destroy(ladish_app_supervisor_proxy_handle proxy); +bool ladish_app_supervisor_proxy_run_custom(ladish_app_supervisor_proxy_handle proxy, const char * command, const char * name, bool run_in_terminal); + +#endif /* #ifndef APP_SUPERVISOR_PROXY_H__A48C609D_0AB6_4C91_A9B0_BC7F1B7E4CB4__INCLUDED */ Index: gui/graph_view.c =================================================================== --- gui/graph_view.c (revision 57a7eb7a0c44d4df3639bc2e11583651e30260da) +++ gui/graph_view.c (revision 67a1dd501331bba8bcb39ddb141685879f82c944) @@ -29,4 +29,5 @@ #include "glade.h" #include "world_tree.h" +#include "app_supervisor_proxy.h" struct graph_view @@ -37,4 +38,5 @@ graph_proxy_handle graph; GtkWidget * canvas_widget; + ladish_app_supervisor_proxy_handle app_supervisor; }; @@ -57,4 +59,5 @@ const char * object, bool graph_dict_supported, + bool app_supervisor_supported, bool force_activate, graph_view_handle * handle_ptr) @@ -76,7 +79,19 @@ } + if (app_supervisor_supported) + { + if (!ladish_app_supervisor_proxy_create(service, object, &view_ptr->app_supervisor)) + { + goto free_name; + } + } + else + { + view_ptr->app_supervisor = NULL; + } + if (!graph_proxy_create(service, object, graph_dict_supported, &view_ptr->graph)) { - goto free_name; + goto free_app_supervisor; } @@ -114,4 +129,9 @@ destroy_graph: graph_proxy_destroy(view_ptr->graph); +free_app_supervisor: + if (view_ptr->app_supervisor != NULL) + { + ladish_app_supervisor_proxy_destroy(view_ptr->app_supervisor); + } free_name: free(view_ptr->name); @@ -178,4 +198,10 @@ graph_canvas_destroy(view_ptr->graph_canvas); graph_proxy_destroy(view_ptr->graph); + + if (view_ptr->app_supervisor != NULL) + { + ladish_app_supervisor_proxy_destroy(view_ptr->app_supervisor); + } + free(view_ptr->name); free(view_ptr); @@ -226,2 +252,7 @@ return graph_canvas_get_canvas(g_current_view->graph_canvas); } + +bool app_run_custom(graph_view_handle view, const char * command, const char * name, bool run_in_terminal) +{ + return ladish_app_supervisor_proxy_run_custom(view_ptr->app_supervisor, command, name, run_in_terminal); +} Index: gui/graph_view.h =================================================================== --- gui/graph_view.h (revision fa47499b454a50cef9048365b685617fd72dd26c) +++ gui/graph_view.h (revision 67a1dd501331bba8bcb39ddb141685879f82c944) @@ -40,4 +40,5 @@ const char * object, bool graph_dict_supported, + bool app_supervisor_supported, bool force_activate, graph_view_handle * handle_ptr); @@ -49,4 +50,6 @@ canvas_handle get_current_canvas(); +bool app_run_custom(graph_view_handle view, const char * command, const char * name, bool run_in_terminal); + /* not very good place for this prototype, because it is not implemented in graph_view.c */ void set_main_window_title(graph_view_handle view); Index: gui/main.c =================================================================== --- gui/main.c (revision 94c197fe3390887d8841edc20b9c2a0b16c76ad0) +++ gui/main.c (revision 67a1dd501331bba8bcb39ddb141685879f82c944) @@ -42,4 +42,5 @@ #include "../studio_proxy.h" #include "ask_dialog.h" +#include "app_supervisor_proxy.h" GtkWidget * g_main_win; @@ -247,4 +248,8 @@ { log_info("'%s':'%s' %s", gtk_entry_get_text(name_entry), gtk_entry_get_text(command_entry), gtk_toggle_button_get_active(terminal_button) ? "terminal" : "shell"); + if (!app_run_custom(g_studio_view, gtk_entry_get_text(command_entry), gtk_entry_get_text(name_entry), gtk_toggle_button_get_active(terminal_button))) + { + error_message_box("Execution failed. I know you want to know more for the reson but currently you can only check the log file."); + } } @@ -491,5 +496,5 @@ } - if (!create_view(name, SERVICE_NAME, STUDIO_OBJECT_PATH, true, false, &g_studio_view)) + if (!create_view(name, SERVICE_NAME, STUDIO_OBJECT_PATH, true, true, false, &g_studio_view)) { log_error("create_view() failed for studio"); @@ -579,5 +584,5 @@ #if defined(SHOW_RAW_JACK) - if (!create_view("Raw JACK", JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, false, true, &g_jack_view)) + if (!create_view("Raw JACK", JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, false, false, true, &g_jack_view)) { log_error("create_view() failed for jack"); Index: wscript =================================================================== --- wscript (revision e46ea7b77b55888a7c473519bf8bedd0be3d946d) +++ wscript (revision 67a1dd501331bba8bcb39ddb141685879f82c944) @@ -297,4 +297,5 @@ 'glade.c', 'control_proxy.c', + 'app_supervisor_proxy.c', 'ask_dialog.c', ]: