patchbay -> graph_iface

This commit is contained in:
Nedko Arnaudov 2009-09-03 06:10:52 +03:00
parent f4bf5df38e
commit 4c114d563a
4 changed files with 8 additions and 8 deletions

View File

@ -26,10 +26,10 @@
*/
#include "common.h"
#include "patchbay.h"
#include "graph_iface.h"
#include "../dbus/error.h"
#define impl_ptr ((struct patchbay_implementator *)call_ptr->context)
#define impl_ptr ((struct graph_implementator *)call_ptr->context)
static void get_all_ports(method_call_t * call_ptr)
{

View File

@ -27,7 +27,7 @@
#ifndef PATCHBAY_H__30334B9A_8847_4E8C_AFF9_73DB13406C8E__INCLUDED
#define PATCHBAY_H__30334B9A_8847_4E8C_AFF9_73DB13406C8E__INCLUDED
struct patchbay_implementator
struct graph_implementator
{
void * this;

View File

@ -35,7 +35,7 @@
#include "../jack_proxy.h"
#include "../graph_proxy.h"
#include "patchbay.h"
#include "graph_iface.h"
#include "../dbus_constants.h"
#include "control.h"
#include "../catdup.h"
@ -52,7 +52,7 @@ extern const interface_t g_interface_studio;
struct studio
{
/* this must be first member of struct studio because object_path_new() assumes all interfaces have same context */
struct patchbay_implementator patchbay_impl;
struct graph_implementator graph_impl;
struct list_head all_connections; /* All connections (studio guts and all rooms). Including superconnections. */
struct list_head all_ports; /* All ports (studio guts and all rooms) */
@ -758,8 +758,8 @@ bool studio_init(void)
return false;
}
g_studio.patchbay_impl.this = &g_studio;
g_studio.patchbay_impl.get_graph_version = studio_get_graph_version;
g_studio.graph_impl.this = &g_studio;
g_studio.graph_impl.get_graph_version = studio_get_graph_version;
INIT_LIST_HEAD(&g_studio.all_connections);
INIT_LIST_HEAD(&g_studio.all_ports);

View File

@ -199,7 +199,7 @@ def build(bld):
'procfs.c',
'control.c',
'studio.c',
'patchbay.c',
'graph_iface.c',
]:
daemon.source.append(os.path.join("daemon", source))