[SCM] calf/master: Merge commit 'torbenh/master'

[js at users.alioth.debian.org]

Remove debug printfs
Fix size request, and square allocation
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 11d367dae18b2a5f273c87b9cbe1b45aeb906241
Merge: 4b6c37e37ff9ea9c0e1f328a6f4e4662d90ecf14 e037e222d2e237f0b332e4ed287e1a65425e93a3
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Sun Jan 25 01:05:44 2009 +0000

    Merge commit 'torbenh/master'
    
    Conflicts:
    
    	src/custom_ctl.cpp

diff --combined src/custom_ctl.cpp
index 323d112,9b3f710..05f1d5c
--- a/src/custom_ctl.cpp
+++ b/src/custom_ctl.cpp
@@@ -183,8 -183,6 +183,6 @@@ calf_line_graph_expose (GtkWidget *widg
  	    lg->source->get_changed_offsets( gen_index, cache_graph_index, cache_dot_index, cache_grid_index );
  	    lg->last_generation = gen_index;
  
- 	    printf( "oki... cache_graph_index = %d\n", cache_graph_index );
- 
  	    cairo_set_line_width(c, 1);
  	    for(int phase = 1; phase <= 2; phase++)
  	    {
@@@ -218,8 -216,6 +216,6 @@@
  	    graph_n = cache_graph_index;
  	    dot_n = cache_dot_index;
  	    calf_line_graph_copy_cache_to_window( lg, c );
- 
- 	    printf( "cache paint ... cache_graph_index = %d\n", cache_graph_index );
  	}
  
  
@@@ -228,7 -224,6 +224,6 @@@
          {
              for(int gn=grid_n_save; legend = std::string(), cairo_set_source_rgba(c, 1, 1, 1, 0.5), lg->source->get_gridline(lg->source_id, gn, pos, vertical, legend, &cimpl); gn++)
              {
-                 printf( "after cache:draw gridline %d\n", gn );
  		calf_line_graph_draw_grid( c, legend, vertical, pos, phase, sx, sy );
              }
          }
@@@ -238,7 -233,6 +233,6 @@@
          cairo_set_line_width(c, 1);
          for(int gn = graph_n; lg->source->get_graph(lg->source_id, gn, data, 2 * sx, &cimpl); gn++)
          {
- 	    //printf( "uncached graph draw = %d\n", gn );
  	    calf_line_graph_draw_graph( c, data, sx, sy );
          }
          gdk_cairo_set_source_color(c, &sc3);
@@@ -272,6 -266,8 +266,6 @@@ calf_line_graph_size_request (GtkWidge
      g_assert(CALF_IS_LINE_GRAPH(widget));
      
      // CalfLineGraph *lg = CALF_LINE_GRAPH(widget);
 -    //requisition->width = 40;
 -    //requisition->height = 40;
  }
  
  static void
@@@ -319,9 -315,11 +313,10 @@@ static voi
  calf_line_graph_init (CalfLineGraph *self)
  {
      GtkWidget *widget = GTK_WIDGET(self);
 -    //GTK_WIDGET_SET_FLAGS (widget, GTK_NO_WINDOW);
 -    //widget->requisition.width = 40;
 -    //widget->requisition.height = 40;
 +    widget->requisition.width = 40;
 +    widget->requisition.height = 40;
      self->cache_surface = NULL;
+     self->last_generation = 0;
  }
  
  GtkWidget *

-- 
calf audio plugins packaging