graph: remove scheduler2

Move graph code into graph.h
This commit is contained in:
Wim Taymans 2019-01-08 11:56:44 +01:00
parent b0f4be5fbc
commit d12148cfba
10 changed files with 44 additions and 158 deletions

View file

@ -50,7 +50,6 @@ static struct spa_log *logger;
#define spa_debug(f,...) spa_log_trace(logger, f, __VA_ARGS__)
#include <spa/graph/graph.h>
#include <spa/graph/graph-scheduler2.h>
#include <spa/debug/pod.h>
#include <spa/debug/types.h>
@ -80,7 +79,6 @@ struct data {
struct spa_graph graph;
struct spa_graph_state graph_state;
struct spa_graph_data graph_data;
struct spa_graph_node source_node;
struct spa_graph_port source_out;
struct spa_graph_port sink_in;
@ -252,8 +250,6 @@ int main(int argc, char *argv[])
data.monitor = iface;
spa_graph_init(&data.graph, &data.graph_state);
spa_graph_data_init(&data.graph_data, &data.graph);
spa_graph_set_callbacks(&data.graph, &spa_graph_impl_default, &data.graph_data);
spa_monitor_set_callbacks(data.monitor, &monitor_callbacks, &data);

View file

@ -49,7 +49,6 @@ static SPA_LOG_IMPL(default_log);
#define spa_debug(f,...) spa_log_trace(&default_log.log, f, __VA_ARGS__)
#include <spa/graph/graph.h>
#include <spa/graph/graph-scheduler2.h>
#include <spa/debug/pod.h>
@ -70,7 +69,6 @@ struct data {
struct spa_graph graph;
struct spa_graph_state graph_state;
struct spa_graph_data graph_data;
struct spa_graph_node source_node;
struct spa_graph_state source_state;
struct spa_graph_port source_out;
@ -517,8 +515,6 @@ int main(int argc, char *argv[])
const char *str;
spa_graph_init(&data.graph, &data.graph_state);
spa_graph_data_init(&data.graph_data, &data.graph);
spa_graph_set_callbacks(&data.graph, &spa_graph_impl_default, &data.graph_data);
data.log = &default_log.log;
data.data_loop.version = SPA_VERSION_LOOP;

View file

@ -44,7 +44,6 @@ static SPA_LOG_IMPL(default_log);
#define spa_debug(f,...) spa_log_trace(&default_log.log, f, __VA_ARGS__)
#include <spa/graph/graph.h>
#include <spa/graph/graph-scheduler2.h>
#include <spa/debug/pod.h>
#include <spa/debug/types.h>
@ -66,7 +65,6 @@ struct data {
struct spa_graph graph;
struct spa_graph_state graph_state;
struct spa_graph_data graph_data;
struct spa_graph_node source_node;
struct spa_graph_state source_state;
struct spa_graph_port source_out;
@ -515,8 +513,6 @@ int main(int argc, char *argv[])
const char *str;
spa_graph_init(&data.graph, &data.graph_state);
spa_graph_data_init(&data.graph_data, &data.graph);
spa_graph_set_callbacks(&data.graph, &spa_graph_impl_default, &data.graph_data);
data.log = &default_log.log;
data.data_loop.version = SPA_VERSION_LOOP;

View file

@ -38,7 +38,6 @@
#include <spa/param/props.h>
#include <spa/param/audio/format-utils.h>
#include <spa/graph/graph.h>
#include <spa/graph/graph-scheduler2.h>
static SPA_LOG_IMPL(default_log);

View file

@ -51,7 +51,6 @@ static SPA_LOG_IMPL(default_log);
#define spa_debug(...) spa_log_trace(&default_log.log,__VA_ARGS__)
#include <spa/graph/graph.h>
#include <spa/graph/graph-scheduler2.h>
struct buffer {
struct spa_buffer buffer;
@ -70,7 +69,6 @@ struct data {
struct spa_graph graph;
struct spa_graph_state graph_state;
struct spa_graph_data graph_data;
struct spa_graph_node source1_node;
struct spa_graph_state source1_state;
struct spa_graph_port source1_out;
@ -674,8 +672,6 @@ int main(int argc, char *argv[])
data.data_loop.invoke = do_invoke;
spa_graph_init(&data.graph, &data.graph_state);
spa_graph_data_init(&data.graph_data, &data.graph);
spa_graph_set_callbacks(&data.graph, &spa_graph_impl_default, &data.graph_data);
if ((str = getenv("SPA_DEBUG")))
data.log->level = atoi(str);

View file

@ -39,7 +39,6 @@
#include <spa/param/props.h>
#include <spa/param/audio/format-utils.h>
#include <spa/graph/graph.h>
#include <spa/graph/graph-scheduler2.h>
#define MODE_SYNC_PUSH (1<<0)
#define MODE_SYNC_PULL (1<<1)
@ -71,7 +70,6 @@ struct data {
struct spa_graph graph;
struct spa_graph_state graph_state;
struct spa_graph_data graph_data;
struct spa_graph_node source_node;
struct spa_graph_state source_state;
struct spa_graph_port source_out;
@ -507,8 +505,6 @@ int main(int argc, char *argv[])
const char *str;
spa_graph_init(&data.graph, &data.graph_state);
spa_graph_data_init(&data.graph_data, &data.graph);
spa_graph_set_callbacks(&data.graph, &spa_graph_impl_default, &data.graph_data);
data.log = &default_log.log;
data.data_loop.version = SPA_VERSION_LOOP;