[SCM] calf/master: Merge commit 'origin/caching'

[js at users.alioth.debian.org]

+ Framework fix dssi crash bug in line_graph expose
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d6a3c1a63a147948535a50da009275278ad5e6a3
X-Git-Newrev: 34569260c452f0fa4c543155ebba174a42a343dc

The following commit has been merged in the master branch:
commit 21052cc0c57a62d7ca4ae75c0ad6900724383f49
Merge: bc365b48db7558a970d28a570ad1ba1743ba31e4 aeaf7af3101a43551e172f6c9cd38d323bb4ffff
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Sun Jan 25 20:26:48 2009 +0000

    Merge commit 'origin/caching'

diff --combined src/custom_ctl.cpp
index 035107d,c119ede..fb282a8
--- a/src/custom_ctl.cpp
+++ b/src/custom_ctl.cpp
@@@ -191,7 -191,7 +191,7 @@@ calf_line_graph_expose (GtkWidget *widg
  		    calf_line_graph_draw_grid( c, legend, vertical, pos, phase, sx, sy );
  		}
  	    }
- 	    grid_n_save = grid_n-1;
+ 	    grid_n_save = grid_n;
  
  	    gdk_cairo_set_source_color(c, &sc2);
  	    cairo_set_line_join(c, CAIRO_LINE_JOIN_MITER);
@@@ -257,20 -257,6 +257,20 @@@ void calf_line_graph_set_square(CalfLin
      g_assert(CALF_IS_LINE_GRAPH(graph));
      graph->is_square = is_square;
  }
 +
 +void calf_line_graph_update_if(CalfLineGraph *graph)
 +{
 +    g_assert(CALF_IS_LINE_GRAPH(graph));
 +    int generation = 0;
 +    if (graph->source)
 +    {
 +        int subgraph, dot, gridline;
 +        generation = graph->source->get_changed_offsets(graph->last_generation, subgraph, dot, gridline);
 +        if (subgraph == INT_MAX && dot == INT_MAX && gridline == INT_MAX)
 +            return;
 +        gtk_widget_queue_draw(GTK_WIDGET(graph));
 +    }
 +}
  
  static void
  calf_line_graph_size_request (GtkWidget *widget,

-- 
calf audio plugins packaging