gegl r3033 - in trunk/gegl: graph operation process

[martinn svn gnome org]

Author: martinn
Date: Sat Apr 11 14:50:11 2009
New Revision: 3033
URL: http://svn.gnome.org/viewvc/gegl?rev=3033&view=rev

Log:
Remove gegl_pad_get_internal_connected_to()

Remove gegl_pad_get_internal_connected_to(), it only hosts ugly graph
proxynop special-case code.

Modified:
   trunk/gegl/graph/gegl-pad.c
   trunk/gegl/graph/gegl-pad.h
   trunk/gegl/operation/gegl-operation.c
   trunk/gegl/operation/gegl-operations.c
   trunk/gegl/process/gegl-eval-visitor.c

Modified: trunk/gegl/graph/gegl-pad.c
==============================================================================
--- trunk/gegl/graph/gegl-pad.c	(original)
+++ trunk/gegl/graph/gegl-pad.c	Sat Apr 11 14:50:11 2009
@@ -227,37 +227,6 @@
   return pad;
 }
 
-GeglPad *
-gegl_pad_get_internal_connected_to (GeglPad *self)
-{
-  GeglPad *pad = gegl_pad_get_connected_to (self);
-
-  g_assert (GEGL_IS_PAD (self));
-
-  if (!pad && gegl_node_get_name (self->node) &&
-      !strcmp (gegl_node_get_name (self->node), "proxynop-input"))
-    {
-      GeglNode *graph = GEGL_NODE (g_object_get_data (G_OBJECT (self->node), "graph"));
-      g_assert (graph);
-
-      /* FIXME: is this check still needed when gegl_pad_get_name is used in the else
-       * clause? (removed once and reintroduced, the hello-world demo using
-       * aux input of a layer apparently fails without it.)
-       */
-      if (g_object_get_data (G_OBJECT (self->node), "is-aux"))
-        {
-          pad = gegl_node_get_pad (graph, "aux");
-        }
-      else
-        {
-          pad = gegl_node_get_pad (graph, gegl_pad_get_name (self));
-        }
-      if (pad)
-        pad = gegl_pad_get_connected_to (pad);
-    }
-  return pad;
-}
-
 void
 gegl_pad_set_node (GeglPad  *self,
                    GeglNode *node)

Modified: trunk/gegl/graph/gegl-pad.h
==============================================================================
--- trunk/gegl/graph/gegl-pad.h	(original)
+++ trunk/gegl/graph/gegl-pad.h	Sat Apr 11 14:50:11 2009
@@ -69,7 +69,6 @@
 gboolean         gegl_pad_is_output                 (GeglPad        *self);
 gboolean         gegl_pad_is_input                  (GeglPad        *self);
 GeglPad        * gegl_pad_get_connected_to          (GeglPad        *self);
-GeglPad        * gegl_pad_get_internal_connected_to (GeglPad        *self);
 GeglConnection * gegl_pad_connect                   (GeglPad        *sink,
                                                      GeglPad        *source);
 void             gegl_pad_disconnect                (GeglPad        *sink,

Modified: trunk/gegl/operation/gegl-operation.c
==============================================================================
--- trunk/gegl/operation/gegl-operation.c	(original)
+++ trunk/gegl/operation/gegl-operation.c	Sat Apr 11 14:50:11 2009
@@ -259,7 +259,7 @@
   if (!pad)
     return NULL;
 
-  pad = gegl_pad_get_internal_connected_to (pad);
+  pad = gegl_pad_get_connected_to (pad);
 
   if (!pad)
     return NULL;

Modified: trunk/gegl/operation/gegl-operations.c
==============================================================================
--- trunk/gegl/operation/gegl-operations.c	(original)
+++ trunk/gegl/operation/gegl-operations.c	Sat Apr 11 14:50:11 2009
@@ -146,7 +146,7 @@
     GeglPad *pad = gegl_node_get_pad (operation->node, input_pad_name);
     if (!pad)
       return;
-    pad = gegl_pad_get_internal_connected_to (pad);
+    pad = gegl_pad_get_connected_to (pad);
     if (!pad)
       return;
     child = gegl_pad_get_node (pad);

Modified: trunk/gegl/process/gegl-eval-visitor.c
==============================================================================
--- trunk/gegl/process/gegl-eval-visitor.c	(original)
+++ trunk/gegl/process/gegl-eval-visitor.c	Sat Apr 11 14:50:11 2009
@@ -105,7 +105,7 @@
     }
   else if (gegl_pad_is_input (pad))
     {
-      GeglPad *source_pad = gegl_pad_get_internal_connected_to (pad);
+      GeglPad *source_pad = gegl_pad_get_connected_to (pad);
 
       /* the work needed to be done on input pads is to set the
        * data from the corresponding output pad it is connected to