Commit c43dd936 authored by Øyvind Kolås's avatar Øyvind Kolås

%s/gegl_node_output/gegl_node_get_output_proxy/

%s/gegl_node_input/gegl_node_get_input_proxy/
* bin/editor-optype.c: (chain_in_operation):
* bin/export.c: (get_input_rect):
* bin/gegl-store.c: (gegl_store_set_gegl):
* bin/gegl-tree-editor.c: (tree_editor_get_active):
* bin/gegl.c: (main):
* gegl/gegl-graph.c: (gegl_node_get_input_proxy),
(gegl_node_get_output_proxy):
* gegl/gegl-graph.h:
* gegl/gegl-node.c: (gegl_node_get_depends_on),
(gegl_node_get_valist), (gegl_node_set_property),
(gegl_node_get_property):
* gegl/gegl-operation.c: (get_defined_region),
(get_affected_region), (calc_source_regions):
* gegl/gegl-xml.c: (start_element), (end_element), (gegl_to_xml):
* gegl/gegl.h:
* operations/file-io/load.c: (attach):
* operations/meta/dropshadow.c: (attach):
* operations/meta/layer.c: (attach):
* operations/meta/tonemap.c: (attach):
* operations/meta/unsharp-mask.c: (attach):
* operations/workshop/dog.c: (attach):

svn path=/trunk/; revision=1123
parent 7ee6bd48
2007-01-04 Øyvind Kolås <pippin@gimp.org>
%s/gegl_node_output/gegl_node_get_output_proxy/
%s/gegl_node_input/gegl_node_get_input_proxy/
* bin/editor-optype.c: (chain_in_operation):
* bin/export.c: (get_input_rect):
* bin/gegl-store.c: (gegl_store_set_gegl):
* bin/gegl-tree-editor.c: (tree_editor_get_active):
* bin/gegl.c: (main):
* gegl/gegl-graph.c: (gegl_node_get_input_proxy),
(gegl_node_get_output_proxy):
* gegl/gegl-graph.h:
* gegl/gegl-node.c: (gegl_node_get_depends_on),
(gegl_node_get_valist), (gegl_node_set_property),
(gegl_node_get_property):
* gegl/gegl-operation.c: (get_defined_region),
(get_affected_region), (calc_source_regions):
* gegl/gegl-xml.c: (start_element), (end_element), (gegl_to_xml):
* gegl/gegl.h:
* operations/file-io/load.c: (attach):
* operations/meta/dropshadow.c: (attach):
* operations/meta/layer.c: (attach):
* operations/meta/tonemap.c: (attach):
* operations/meta/unsharp-mask.c: (attach):
* operations/workshop/dog.c: (attach):
2007-01-04 Øyvind Kolås <pippin@gimp.org>
Merged GeglGraph class into GeglNode class. (more API cleanup to
......
......@@ -66,7 +66,7 @@ chain_in_operation (const gchar *op_type)
GeglNode *iter;
GeglNode *new;
proxy = gegl_node_output (editor.gegl, "output");
proxy = gegl_node_get_output_proxy (editor.gegl, "output");
iter = gegl_node_get_connected_to (proxy, "input");
new = gegl_node_new_node (editor.gegl, "operation", op_type, NULL);
if (iter)
......
......@@ -40,7 +40,7 @@ static void button_defined_clicked (GtkButton *button,
static GeglRectangle get_input_rect (void)
{
GeglNode *iter = gegl_node_output (editor.gegl, "output");
GeglNode *iter = gegl_node_get_output_proxy (editor.gegl, "output");
gegl_node_get_bounding_box (editor.gegl); /* to trigger defined setting for all */
while (iter &&
gegl_node_get_connected_to (iter, "input")){
......
......@@ -861,5 +861,5 @@ gegl_store_set_gegl (GeglStore *gegl_store,
{
g_return_if_fail (IS_GEGL_STORE (gegl_store));
gegl_store->gegl = gegl;
gegl_store->root = gegl_node_output (gegl, "output");
gegl_store->root = gegl_node_get_output_proxy (gegl, "output");
}
......@@ -139,7 +139,7 @@ tree_editor_get_active (GtkWidget *tree_editor)
if (!gtk_tree_selection_get_selected (tree_selection, &model, &iter))
{
GeglNode *proxy = gegl_node_output (editor.gegl, "output");
GeglNode *proxy = gegl_node_get_output_proxy (editor.gegl, "output");
return gegl_node_get_connected_to (proxy, "input");
}
......
......@@ -41,7 +41,7 @@
/*FIXME: this should be in gegl.h*/
GeglNode * gegl_node_output (GeglNode *graph,
GeglNode * gegl_node_get_output_proxy (GeglNode *graph,
const gchar *name);
......@@ -142,7 +142,7 @@ main (gint argc,
GeglNode *iter;
gchar **operation = o->rest;
proxy = gegl_node_output (gegl, "output");
proxy = gegl_node_get_output_proxy (gegl, "output");
iter = gegl_node_get_connected_to (proxy, "input");
while (*operation)
......@@ -189,7 +189,7 @@ main (gint argc,
"operation", "png-save",
"path", o->output,
NULL);
gegl_node_connect_from (output, "input", gegl_node_output (gegl, "output"), "output");
gegl_node_connect_from (output, "input", gegl_node_get_output_proxy (gegl, "output"), "output");
gegl_node_process (output);
g_object_unref (gegl);
......
......@@ -202,14 +202,14 @@ gegl_node_get_pad_proxy (GeglNode *graph,
}
GeglNode *
gegl_node_input (GeglNode *node,
gegl_node_get_input_proxy (GeglNode *node,
const gchar *name)
{
return gegl_node_get_pad_proxy (node, name, TRUE);
}
GeglNode *
gegl_node_output (GeglNode *node,
gegl_node_get_output_proxy (GeglNode *node,
const gchar *name)
{
return gegl_node_get_pad_proxy (node, name, FALSE);
......
......@@ -44,9 +44,9 @@ GeglNode * gegl_node_new_node (GeglNode *self,
...) G_GNUC_NULL_TERMINATED;
GeglNode * gegl_node_create_node (GeglNode *self,
const gchar *operation);
GeglNode * gegl_node_input (GeglNode *graph,
GeglNode * gegl_node_get_input_proxy (GeglNode *graph,
const gchar *name);
GeglNode * gegl_node_output (GeglNode *graph,
GeglNode * gegl_node_get_output_proxy (GeglNode *graph,
const gchar *name);
G_END_DECLS
......
......@@ -772,7 +772,7 @@ gegl_node_get_depends_on (GeglNode *self)
if (source_node->is_graph)
{
GeglNode *proxy = gegl_node_output (source_node, "output");
GeglNode *proxy = gegl_node_get_output_proxy (source_node, "output");
if (! g_list_find (depends_on, proxy))
depends_on = g_list_append (depends_on, proxy);
......@@ -1167,7 +1167,7 @@ gegl_node_get_valist (GeglNode *self,
{
pspec = g_object_class_find_property (
G_OBJECT_GET_CLASS (G_OBJECT (
gegl_node_output (self, "output")->operation)), property_name);
gegl_node_get_output_proxy (self, "output")->operation)), property_name);
if (!pspec)
{
pspec = g_object_class_find_property (
......@@ -1237,7 +1237,7 @@ gegl_node_set_property (GeglNode *self,
{
g_warning ("set_property for graph,. hmm");
/* FIXME: should this really be "input")? is_graph doesn't seem to be used,.. */
g_object_set_property (G_OBJECT (gegl_node_input (self, "input")->operation),
g_object_set_property (G_OBJECT (gegl_node_get_input_proxy (self, "input")->operation),
property_name, value);
}
else
......@@ -1269,7 +1269,7 @@ gegl_node_get_property (GeglNode *self,
!strcmp (property_name, "output"))
{
g_warning ("Eeek");
g_object_get_property (G_OBJECT (gegl_node_output (self, "output")->operation),
g_object_get_property (G_OBJECT (gegl_node_get_output_proxy (self, "output")->operation),
property_name, value);
}
else
......
......@@ -253,7 +253,7 @@ get_defined_region (GeglOperation *self)
if (self->node->is_graph)
{
return gegl_operation_get_defined_region (
gegl_node_output (self->node, "output")->operation);
gegl_node_get_output_proxy (self->node, "output")->operation);
}
g_warning ("Op '%s' has no defined_region method",
G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS(self)));
......@@ -268,7 +268,7 @@ get_affected_region (GeglOperation *self,
if (self->node->is_graph)
{
return gegl_operation_get_affected_region (
gegl_node_output (self->node, "output")->operation,
gegl_node_get_output_proxy (self->node, "output")->operation,
input_pad,
region);
}
......@@ -282,7 +282,7 @@ calc_source_regions (GeglOperation *self,
if (self->node->is_graph)
{
return gegl_operation_calc_source_regions (
gegl_node_output (self->node, "output")->operation,
gegl_node_get_output_proxy (self->node, "output")->operation,
context_id);
}
......
......@@ -96,10 +96,10 @@ static void start_element (GMarkupParseContext *context,
pd->state=STATE_TREE_NORMAL;
pd->parent = g_list_prepend (pd->parent, new);
gegl_node_output (new, "output"); /* creates the pad if it doesn't exist */
gegl_node_get_output_proxy (new, "output"); /* creates the pad if it doesn't exist */
if (pd->iter)
gegl_node_connect_from (pd->iter, "input", new, "output");
pd->iter = gegl_node_output (new, "output");
pd->iter = gegl_node_get_output_proxy (new, "output");
}
else if (!strcmp (element_name, "graph"))
{
......@@ -236,8 +236,8 @@ static void end_element (GMarkupParseContext *context,
if (gegl_node_get_pad (pd->iter, "input"))
{
gegl_node_connect_from (pd->iter, "input",
gegl_node_input (GEGL_NODE (pd->parent->data), "input"), "output");
pd->iter = gegl_node_input (GEGL_NODE (pd->parent->data), "input");
gegl_node_get_input_proxy (GEGL_NODE (pd->parent->data), "input"), "output");
pd->iter = gegl_node_get_input_proxy (GEGL_NODE (pd->parent->data), "input");
}
else
{
......@@ -586,7 +586,7 @@ gegl_to_xml (GeglNode *gegl)
ss->clones = g_hash_table_new (NULL, NULL);
ss->terse = TRUE;
gegl = gegl_node_output (gegl, "output");
gegl = gegl_node_get_output_proxy (gegl, "output");
g_string_append (ss->buf, "<?xml version='1.0' encoding='UTF-8'?>\n");
g_string_append (ss->buf, "<gegl>\n");
......
......@@ -149,11 +149,11 @@ const gchar * gegl_node_get_operation (GeglNode *node);
/* aquire the attached ghost output pad of a Graph node,
* create it if it does not exist */
GeglNode * gegl_node_output (GeglNode *graph,
GeglNode * gegl_node_get_output_proxy (GeglNode *graph,
const gchar *name);
/* aquire the attached ghost input pad of a Graph node,
* create it if it does not exist */
GeglNode * gegl_node_input (GeglNode *graph,
GeglNode * gegl_node_get_input_proxy (GeglNode *graph,
const gchar *name);
/* create a geglgraph from parsed XML data */
......
......@@ -157,7 +157,7 @@ static void attach (GeglOperation *operation)
priv->self = GEGL_OPERATION (self)->node;
priv->output = gegl_node_output (priv->self, "output");
priv->output = gegl_node_get_output_proxy (priv->self, "output");
priv->load = gegl_node_new_node (priv->self,
"operation", "text",
......
......@@ -67,8 +67,8 @@ static void attach (GeglOperation *operation)
if (!priv->over)
{
GeglNode *gegl = priv->self;
priv->input = gegl_node_input (gegl, "input");
priv->output = gegl_node_output (gegl, "output");
priv->input = gegl_node_get_input_proxy (gegl, "input");
priv->output = gegl_node_get_output_proxy (gegl, "output");
priv->over = gegl_node_new_node (gegl, "operation", "over", NULL);
priv->translate = gegl_node_new_node (gegl, "operation", "translate", NULL);
priv->opacity = gegl_node_new_node (gegl, "operation", "opacity", NULL);
......
......@@ -129,9 +129,9 @@ static void attach (GeglOperation *operation)
priv->self = GEGL_OPERATION (self)->node;
gegl = priv->self;
priv->input = gegl_node_input (gegl, "input");
priv->aux = gegl_node_input (gegl, "aux");
priv->output = gegl_node_output (gegl, "output");
priv->input = gegl_node_get_input_proxy (gegl, "input");
priv->aux = gegl_node_get_input_proxy (gegl, "aux");
priv->output = gegl_node_get_output_proxy (gegl, "output");
priv->composite_op = gegl_node_new_node (gegl,
"operation", self->composite_op,
......
......@@ -64,8 +64,8 @@ static void attach (GeglOperation *operation)
GeglNode *gegl;
gegl = operation->node;
priv->input = gegl_node_input (gegl, "input");
priv->output = gegl_node_output (gegl, "output");
priv->input = gegl_node_get_input_proxy (gegl, "input");
priv->output = gegl_node_get_output_proxy (gegl, "output");
priv->min = gegl_node_new_node (gegl,
"operation", "box-min",
......
......@@ -60,8 +60,8 @@ static void attach (GeglOperation *operation)
GeglNode *gegl;
gegl = operation->node;
priv->input = gegl_node_input (gegl, "input");
priv->output = gegl_node_output (gegl, "output");
priv->input = gegl_node_get_input_proxy (gegl, "input");
priv->output = gegl_node_get_output_proxy (gegl, "output");
priv->add = gegl_node_new_node (gegl,
"operation", "add",
NULL);
......
......@@ -60,8 +60,8 @@ static void attach (GeglOperation *operation)
GeglNode *gegl;
gegl = operation->node;
priv->input = gegl_node_input (gegl, "input");
priv->output = gegl_node_output (gegl, "output");
priv->input = gegl_node_get_input_proxy (gegl, "input");
priv->output = gegl_node_get_output_proxy (gegl, "output");
priv->subtract = gegl_node_new_node (gegl,
"operation", "subtract",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment