From b5565fd3981f4ed1384f38ae7cdd2c13a27de4fe Mon Sep 17 00:00:00 2001 From: Nedko Arnaudov Date: Sun, 13 Dec 2009 18:10:57 +0200 Subject: [PATCH] move proxy implementations to new /proxies directory --- daemon/main.c | 2 +- daemon/studio_internal.h | 2 +- daemon/virtualizer.c | 2 +- daemon/virtualizer.h | 2 +- gui/graph_canvas.h | 2 +- gui/graph_view.c | 1 - gui/graph_view.h | 2 +- gui/main.c | 10 +++---- {daemon => proxies}/a2j_proxy.c | 2 -- {daemon => proxies}/a2j_proxy.h | 2 ++ {gui => proxies}/app_supervisor_proxy.c | 2 -- {gui => proxies}/app_supervisor_proxy.h | 0 proxies/common.h | 34 ++++++++++++++++++++++++ {gui => proxies}/control_proxy.c | 2 -- {gui => proxies}/control_proxy.h | 1 - graph_proxy.c => proxies/graph_proxy.c | 7 ----- graph_proxy.h => proxies/graph_proxy.h | 0 jack_proxy.c => proxies/jack_proxy.c | 3 --- jack_proxy.h => proxies/jack_proxy.h | 0 studio_proxy.c => proxies/studio_proxy.c | 2 -- studio_proxy.h => proxies/studio_proxy.h | 2 ++ wscript | 24 +++++++++++------ 22 files changed, 65 insertions(+), 39 deletions(-) rename {daemon => proxies}/a2j_proxy.c (99%) rename {daemon => proxies}/a2j_proxy.h (98%) rename {gui => proxies}/app_supervisor_proxy.c (99%) rename {gui => proxies}/app_supervisor_proxy.h (100%) create mode 100644 proxies/common.h rename {gui => proxies}/control_proxy.c (98%) rename {gui => proxies}/control_proxy.h (98%) rename graph_proxy.c => proxies/graph_proxy.c (99%) rename graph_proxy.h => proxies/graph_proxy.h (100%) rename jack_proxy.c => proxies/jack_proxy.c (99%) rename jack_proxy.h => proxies/jack_proxy.h (100%) rename studio_proxy.c => proxies/studio_proxy.c (98%) rename studio_proxy.h => proxies/studio_proxy.h (98%) diff --git a/daemon/main.c b/daemon/main.c index 3776f9bb..90425960 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -41,7 +41,7 @@ #include "../dbus_constants.h" #include "../catdup.h" #include "dirhelpers.h" -#include "a2j_proxy.h" +#include "../proxies/a2j_proxy.h" bool g_quit; const char * g_dbus_unique_name; diff --git a/daemon/studio_internal.h b/daemon/studio_internal.h index 9326a0e0..04305202 100644 --- a/daemon/studio_internal.h +++ b/daemon/studio_internal.h @@ -28,7 +28,7 @@ #ifndef STUDIO_INTERNAL_H__B4CB73EC_8E89_401A_9E49_F0AEEF361D09__INCLUDED #define STUDIO_INTERNAL_H__B4CB73EC_8E89_401A_9E49_F0AEEF361D09__INCLUDED -#include "../jack_proxy.h" +#include "../../proxies/jack_proxy.h" #include "../dbus/error.h" #include "virtualizer.h" #include "app_supervisor.h" diff --git a/daemon/virtualizer.c b/daemon/virtualizer.c index 3823f7c4..e0ab30a1 100644 --- a/daemon/virtualizer.c +++ b/daemon/virtualizer.c @@ -26,7 +26,7 @@ #include "virtualizer.h" #include "../dbus_constants.h" -#include "a2j_proxy.h" +#include "../proxies/a2j_proxy.h" #include "procfs.h" #include "app_supervisor.h" #include "studio_internal.h" diff --git a/daemon/virtualizer.h b/daemon/virtualizer.h index 5e587952..2e474bdc 100644 --- a/daemon/virtualizer.h +++ b/daemon/virtualizer.h @@ -28,7 +28,7 @@ #define JACK_DISPATCH_H__C7566B66_081D_4D00_A702_7C18F7CC0735__INCLUDED #include "common.h" -#include "../graph_proxy.h" +#include "../proxies/graph_proxy.h" #include "graph.h" typedef struct ladish_virtualizer { int unused; } * ladish_virtualizer_handle; diff --git a/gui/graph_canvas.h b/gui/graph_canvas.h index 1d557d63..02d10a1e 100644 --- a/gui/graph_canvas.h +++ b/gui/graph_canvas.h @@ -27,7 +27,7 @@ #ifndef GRAPH_CANVAS_H__F145C6FA_633C_4E64_9117_ED301618B587__INCLUDED #define GRAPH_CANVAS_H__F145C6FA_633C_4E64_9117_ED301618B587__INCLUDED -#include "../graph_proxy.h" +#include "../proxies/graph_proxy.h" #include "canvas.h" typedef struct graph_canvas_tag { int unused; } * graph_canvas_handle; diff --git a/gui/graph_view.c b/gui/graph_view.c index 7b951c11..f9dde988 100644 --- a/gui/graph_view.c +++ b/gui/graph_view.c @@ -28,7 +28,6 @@ #include "graph_view.h" #include "glade.h" #include "world_tree.h" -#include "app_supervisor_proxy.h" struct graph_view { diff --git a/gui/graph_view.h b/gui/graph_view.h index a05c2d44..6db32b66 100644 --- a/gui/graph_view.h +++ b/gui/graph_view.h @@ -28,7 +28,7 @@ #define GRAPH_VIEW_H__05B5CE46_5239_43F1_9F31_79F13EBF0DFA__INCLUDED #include "graph_canvas.h" -#include "app_supervisor_proxy.h" +#include "../proxies/app_supervisor_proxy.h" typedef struct graph_view_tag { int unused; } * graph_view_handle; diff --git a/gui/main.c b/gui/main.c index db76ae5a..48ab5143 100644 --- a/gui/main.c +++ b/gui/main.c @@ -32,16 +32,16 @@ #include "glade.h" #include "canvas.h" #include "graph_canvas.h" -#include "../jack_proxy.h" -#include "dbus_helpers.h" -#include "control_proxy.h" +#include "../proxies/jack_proxy.h" +#include "../proxies/control_proxy.h" #include "../dbus_constants.h" #include "world_tree.h" #include "graph_view.h" #include "../catdup.h" -#include "../studio_proxy.h" +#include "../proxies/studio_proxy.h" #include "ask_dialog.h" -#include "app_supervisor_proxy.h" +#include "../proxies/app_supervisor_proxy.h" +#include "dbus_helpers.h" GtkWidget * g_main_win; diff --git a/daemon/a2j_proxy.c b/proxies/a2j_proxy.c similarity index 99% rename from daemon/a2j_proxy.c rename to proxies/a2j_proxy.c index 1eb45f75..55947826 100644 --- a/daemon/a2j_proxy.c +++ b/proxies/a2j_proxy.c @@ -24,9 +24,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "common.h" #include "a2j_proxy.h" -#include "../dbus/helpers.h" #define A2J_SERVICE "org.gna.home.a2jmidid" #define A2J_OBJECT "/" diff --git a/daemon/a2j_proxy.h b/proxies/a2j_proxy.h similarity index 98% rename from daemon/a2j_proxy.h rename to proxies/a2j_proxy.h index 2496b38a..bdae99b4 100644 --- a/daemon/a2j_proxy.h +++ b/proxies/a2j_proxy.h @@ -27,6 +27,8 @@ #ifndef A2J_PROXY_HPP__24525CB1_8AED_4697_8C56_5C57473839CC__INCLUDED #define A2J_PROXY_HPP__24525CB1_8AED_4697_8C56_5C57473839CC__INCLUDED +#include "common.h" + typedef struct a2j_proxy_tag { int unused; } * a2j_proxy_handle; bool a2j_proxy_init(void); diff --git a/gui/app_supervisor_proxy.c b/proxies/app_supervisor_proxy.c similarity index 99% rename from gui/app_supervisor_proxy.c rename to proxies/app_supervisor_proxy.c index 8a3f5871..f51e03be 100644 --- a/gui/app_supervisor_proxy.c +++ b/proxies/app_supervisor_proxy.c @@ -26,8 +26,6 @@ */ #include "app_supervisor_proxy.h" -#include "../dbus/helpers.h" -#include "../dbus_constants.h" struct ladish_app_supervisor_proxy { diff --git a/gui/app_supervisor_proxy.h b/proxies/app_supervisor_proxy.h similarity index 100% rename from gui/app_supervisor_proxy.h rename to proxies/app_supervisor_proxy.h diff --git a/proxies/common.h b/proxies/common.h new file mode 100644 index 00000000..b8e996d6 --- /dev/null +++ b/proxies/common.h @@ -0,0 +1,34 @@ +/* -*- Mode: C ; c-basic-offset: 2 -*- */ +/* + * LADI Session Handler (ladish) + * + * Copyright (C) 2009 Nedko Arnaudov + * + ************************************************************************** + * This file contains stuff that is needed my almost every proxy + ************************************************************************** + * + * 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 COMMON_H__0710E3D5_9B69_4C10_BDDB_80E0D92F44AF__INCLUDED +#define COMMON_H__0710E3D5_9B69_4C10_BDDB_80E0D92F44AF__INCLUDED + +#include "../common.h" +#include "../dbus/helpers.h" +#include "../dbus_constants.h" + +#endif /* #ifndef COMMON_H__0710E3D5_9B69_4C10_BDDB_80E0D92F44AF__INCLUDED */ diff --git a/gui/control_proxy.c b/proxies/control_proxy.c similarity index 98% rename from gui/control_proxy.c rename to proxies/control_proxy.c index 79b88e1d..ead21463 100644 --- a/gui/control_proxy.c +++ b/proxies/control_proxy.c @@ -26,8 +26,6 @@ */ #include "control_proxy.h" -#include "../dbus/helpers.h" -#include "../dbus_constants.h" static void on_studio_appeared(void * context, DBusMessage * message_ptr) { diff --git a/gui/control_proxy.h b/proxies/control_proxy.h similarity index 98% rename from gui/control_proxy.h rename to proxies/control_proxy.h index 44ea41c4..da7a6f22 100644 --- a/gui/control_proxy.h +++ b/proxies/control_proxy.h @@ -29,7 +29,6 @@ #define CONTROL_PROXY_H__8BC89E98_FE1B_4831_8B89_1A48F676E019__INCLUDED #include "common.h" -#include "../common/klist.h" bool control_proxy_init(void); void control_proxy_uninit(void); diff --git a/graph_proxy.c b/proxies/graph_proxy.c similarity index 99% rename from graph_proxy.c rename to proxies/graph_proxy.c index 43c461a5..20b408b0 100644 --- a/graph_proxy.c +++ b/proxies/graph_proxy.c @@ -24,14 +24,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include -#include - -#include "common.h" #include "graph_proxy.h" -#include "common/klist.h" -#include "dbus/helpers.h" -#include "dbus_constants.h" struct monitor { diff --git a/graph_proxy.h b/proxies/graph_proxy.h similarity index 100% rename from graph_proxy.h rename to proxies/graph_proxy.h diff --git a/jack_proxy.c b/proxies/jack_proxy.c similarity index 99% rename from jack_proxy.c rename to proxies/jack_proxy.c index f50432ab..1020be4b 100644 --- a/jack_proxy.c +++ b/proxies/jack_proxy.c @@ -26,10 +26,7 @@ //#define LADISH_DEBUG -#include "common.h" #include "jack_proxy.h" -#include "dbus/helpers.h" -#include "dbus_constants.h" jack_proxy_callback_server_started g_on_server_started; jack_proxy_callback_server_stopped g_on_server_stopped; diff --git a/jack_proxy.h b/proxies/jack_proxy.h similarity index 100% rename from jack_proxy.h rename to proxies/jack_proxy.h diff --git a/studio_proxy.c b/proxies/studio_proxy.c similarity index 98% rename from studio_proxy.c rename to proxies/studio_proxy.c index ea6a21b5..b5732e77 100644 --- a/studio_proxy.c +++ b/proxies/studio_proxy.c @@ -26,8 +26,6 @@ */ #include "common.h" -#include "dbus_constants.h" -#include "dbus/helpers.h" static void (* g_renamed_callback)(const char * new_studio_name) = NULL; static void (* g_started_callback)(void) = NULL; diff --git a/studio_proxy.h b/proxies/studio_proxy.h similarity index 98% rename from studio_proxy.h rename to proxies/studio_proxy.h index 1dc3002d..cec0cff2 100644 --- a/studio_proxy.h +++ b/proxies/studio_proxy.h @@ -28,6 +28,8 @@ #ifndef STUDIO_PROXY_H__2CEC623F_C998_4618_A947_D1A0016DF978__INCLUDED #define STUDIO_PROXY_H__2CEC623F_C998_4618_A947_D1A0016DF978__INCLUDED +#include "common.h" + bool studio_proxy_init(void); void studio_proxy_uninit(void); bool studio_proxy_get_name(char ** name); diff --git a/wscript b/wscript index 89844a8b..8262968a 100644 --- a/wscript +++ b/wscript @@ -199,8 +199,6 @@ def build(bld): daemon.env.append_value("LINKFLAGS", ["-lutil", "-ldl", "-Wl,-E"]) daemon.source = [ - 'jack_proxy.c', - 'graph_proxy.c', 'catdup.c', ] @@ -233,10 +231,16 @@ def build(bld): 'cmd_exit.c', 'cqueue.c', 'app_supervisor.c', - 'a2j_proxy.c', ]: daemon.source.append(os.path.join("daemon", source)) + for source in [ + 'jack_proxy.c', + 'graph_proxy.c', + 'a2j_proxy.c', + ]: + daemon.source.append(os.path.join("proxies", source)) + for source in [ 'signal.c', 'method.c', @@ -289,9 +293,6 @@ def build(bld): gladish.uselib = 'DBUS-1 DBUS-GLIB-1 LIBGLADE-2.0 FLOWCANVAS' gladish.source = [ - 'jack_proxy.c', - 'graph_proxy.c', - 'studio_proxy.c', 'catdup.c', ] @@ -309,12 +310,19 @@ def build(bld): 'canvas.cpp', 'graph_canvas.c', 'glade.c', - 'control_proxy.c', - 'app_supervisor_proxy.c', 'ask_dialog.c', ]: gladish.source.append(os.path.join("gui", source)) + for source in [ + 'jack_proxy.c', + 'graph_proxy.c', + 'studio_proxy.c', + 'control_proxy.c', + 'app_supervisor_proxy.c', + ]: + gladish.source.append(os.path.join("proxies", source)) + for source in [ 'method.c', 'helpers.c',