LADI
/
ladish
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dbus/ -> cdbus/

This commit is contained in:
Nedko Arnaudov 2011-11-09 02:45:13 +02:00
parent 4202100444
commit a0738fe6e7
17 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
dbus/helpers.c → cdbus/helpers.c
View File

0
dbus/helpers.h → cdbus/helpers.h
View File

0
dbus/interface.c → cdbus/interface.c
View File

0
dbus/interface.h → cdbus/interface.h
View File

0
dbus/method.c → cdbus/method.c
View File

0
dbus/method.h → cdbus/method.h
View File

0
dbus/object_path.c → cdbus/object_path.c
View File

0
dbus/object_path.h → cdbus/object_path.h
View File

0
dbus/signal.c → cdbus/signal.c
View File

0
dbus/signal.h → cdbus/signal.h
View File

2
conf.c
View File

@ -33,7 +33,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include "dbus/helpers.h" #include "cdbus/helpers.h"
#include "dbus_constants.h" #include "dbus_constants.h"
#include "common/catdup.h" #include "common/catdup.h"
#include "common/dirhelpers.h" #include "common/dirhelpers.h"

4
daemon/common.h
View File

@ -2,7 +2,7 @@
/* /*
* LADI Session Handler (ladish) * LADI Session Handler (ladish)
* *
* Copyright (C) 2009,2010 Nedko Arnaudov <nedko@arnaudov.name> * Copyright (C) 2009,2010,2011 Nedko Arnaudov <nedko@arnaudov.name>
* *
************************************************************************** **************************************************************************
* This file contains stuff that is needed almost everywhere in the ladishd * This file contains stuff that is needed almost everywhere in the ladishd
@ -32,7 +32,7 @@
#include <errno.h> #include <errno.h>
#include <uuid/uuid.h> #include <uuid/uuid.h>
#include "../dbus/helpers.h" #include "../cdbus/helpers.h"
/* ~/BASE_DIR is where studio, room and project xml files are stored */ /* ~/BASE_DIR is where studio, room and project xml files are stored */
#define BASE_DIR "/." BASE_NAME #define BASE_DIR "/." BASE_NAME

2
gui/dbus.c
View File

@ -25,7 +25,7 @@
*/ */
#include "internal.h" #include "internal.h"
#include "../dbus/helpers.h" #include "../cdbus/helpers.h"
#include <dbus/dbus-glib-lowlevel.h> #include <dbus/dbus-glib-lowlevel.h>
void dbus_init(void) void dbus_init(void)

2
jmcore.c
View File

@ -31,7 +31,7 @@
#include <jack/jack.h> #include <jack/jack.h>
#include <jack/midiport.h> #include <jack/midiport.h>
#include "dbus/helpers.h" #include "cdbus/helpers.h"
#include "dbus_constants.h" #include "dbus_constants.h"
extern const struct cdbus_interface_descriptor g_interface; extern const struct cdbus_interface_descriptor g_interface;

2
lash_compat/liblash/lash.c
View File

@ -41,7 +41,7 @@
#include "../../common/dirhelpers.h" #include "../../common/dirhelpers.h"
#include "../../common/file.h" #include "../../common/file.h"
#include "../../log.h" #include "../../log.h"
#include "../../dbus/helpers.h" #include "../../cdbus/helpers.h"
#include "../../dbus_constants.h" #include "../../dbus_constants.h"
#define LASH_CONFIG_SUBDIR "/.ladish_lash_dict/" #define LASH_CONFIG_SUBDIR "/.ladish_lash_dict/"

4
proxies/common.h
View File

@ -2,7 +2,7 @@
/* /*
* LADI Session Handler (ladish) * LADI Session Handler (ladish)
* *
* Copyright (C) 2009 Nedko Arnaudov <nedko@arnaudov.name> * Copyright (C) 2009,2011 Nedko Arnaudov <nedko@arnaudov.name>
* *
************************************************************************** **************************************************************************
* This file contains stuff that is needed my almost every proxy * This file contains stuff that is needed my almost every proxy
@ -28,7 +28,7 @@
#define COMMON_H__0710E3D5_9B69_4C10_BDDB_80E0D92F44AF__INCLUDED #define COMMON_H__0710E3D5_9B69_4C10_BDDB_80E0D92F44AF__INCLUDED
#include "../common.h" #include "../common.h"
#include "../dbus/helpers.h" #include "../cdbus/helpers.h"
#include "../dbus_constants.h" #include "../dbus_constants.h"
#endif /* #ifndef COMMON_H__0710E3D5_9B69_4C10_BDDB_80E0D92F44AF__INCLUDED */ #endif /* #ifndef COMMON_H__0710E3D5_9B69_4C10_BDDB_80E0D92F44AF__INCLUDED */

12
wscript
View File

@ -401,7 +401,7 @@ def build(bld):
'interface.c', 'interface.c',
'helpers.c', 'helpers.c',
]: ]:
daemon.source.append(os.path.join("dbus", source)) daemon.source.append(os.path.join("cdbus", source))
for source in [ for source in [
'time.c', 'time.c',
@ -430,7 +430,7 @@ def build(bld):
'interface.c', 'interface.c',
'helpers.c', 'helpers.c',
]: ]:
jmcore.source.append(os.path.join("dbus", source)) jmcore.source.append(os.path.join("cdbus", source))
create_service_taskgen(bld, DBUS_NAME_BASE + '.jmcore.service', DBUS_NAME_BASE + ".jmcore", jmcore.target) create_service_taskgen(bld, DBUS_NAME_BASE + '.jmcore.service', DBUS_NAME_BASE + ".jmcore", jmcore.target)
@ -455,7 +455,7 @@ def build(bld):
'interface.c', 'interface.c',
'helpers.c', 'helpers.c',
]: ]:
ladiconfd.source.append(os.path.join("dbus", source)) ladiconfd.source.append(os.path.join("cdbus", source))
create_service_taskgen(bld, DBUS_NAME_BASE + '.conf.service', DBUS_NAME_BASE + ".conf", ladiconfd.target) create_service_taskgen(bld, DBUS_NAME_BASE + '.conf.service', DBUS_NAME_BASE + ".conf", ladiconfd.target)
@ -493,7 +493,7 @@ def build(bld):
'interface.c', 'interface.c',
'helpers.c', 'helpers.c',
]: ]:
liblash.source.append(os.path.join("dbus", source)) liblash.source.append(os.path.join("cdbus", source))
bld.install_files('${PREFIX}/include/lash', bld.path.ant_glob('lash_compat/liblash/lash/*.h')) bld.install_files('${PREFIX}/include/lash', bld.path.ant_glob('lash_compat/liblash/lash/*.h'))
@ -582,7 +582,7 @@ def build(bld):
'method.c', 'method.c',
'helpers.c', 'helpers.c',
]: ]:
gladish.source.append(os.path.join("dbus", source)) gladish.source.append(os.path.join("cdbus", source))
for source in [ for source in [
'catdup.c', 'catdup.c',
@ -634,7 +634,7 @@ def get_tags_dirs():
source_root = os.path.relpath(source_root) source_root = os.path.relpath(source_root)
paths = source_root paths = source_root
paths += " " + os.path.join(source_root, "common") paths += " " + os.path.join(source_root, "common")
paths += " " + os.path.join(source_root, "dbus") paths += " " + os.path.join(source_root, "cdbus")
paths += " " + os.path.join(source_root, "proxies") paths += " " + os.path.join(source_root, "proxies")
paths += " " + os.path.join(source_root, "daemon") paths += " " + os.path.join(source_root, "daemon")
paths += " " + os.path.join(source_root, "gui") paths += " " + os.path.join(source_root, "gui")