[SCM] calf/master: Merge branch 'caching'

js at users.alioth.debian.org js at users.alioth.debian.org
Tue May 7 15:39:11 UTC 2013


+ Framework: include <limits.h> for INT_MAX
+ VU Meter: fix pixel off-by-ones
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 06033917e87c90c70daf7ee88b1fc26eb1826825
Merge: be02ac2de7c0a701d1e9a533dc9055d8c53302b6 b510dbee3acc885d08d0a85a65c28cf6b33da83f
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Sun Jan 25 13:31:03 2009 +0000

    Merge branch 'caching'

diff --combined src/custom_ctl.cpp
index 57961bf,2b599b6..035107d
--- a/src/custom_ctl.cpp
+++ b/src/custom_ctl.cpp
@@@ -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,
@@@ -441,7 -427,7 +441,7 @@@ calf_vumeter_expose (GtkWidget *widget
  	    cairo_line_to(cache_cr, x, oy );
  	    cairo_stroke(cache_cr);
  	}
- 	cairo_destroy( cache_cr );
+         cairo_destroy( cache_cr );
      }
  
      cairo_set_source_surface( c, vu->cache_surface, 0,0 );
@@@ -449,9 -435,9 +449,9 @@@
      cairo_set_source_rgba( c, 0,0,0, 0.5 );
  
      if( vu->mode == VU_MONOCHROME_REVERSE )
- 	cairo_rectangle( c, ox,oy, vu->value * (sx-ox), sy-oy );
+         cairo_rectangle( c, ox,oy, vu->value * (sx-ox) + 1, sy-oy+1 );
      else
- 	cairo_rectangle( c, vu->value * (sx-ox),oy, sx-ox, sy-oy );
+         cairo_rectangle( c, ox + vu->value * (sx-ox), oy, sx-ox+1, sy-oy+1 );
  
      cairo_fill( c );
  

-- 
calf audio plugins packaging



More information about the pkg-multimedia-commits mailing list