Merge with trunk R2978.

git-svn-id: svn://localhost/ardour2/branches/3.0@2988 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2008-02-02 03:57:35 +00:00
parent 85ea9028b5
commit 9f63ab9931
92 changed files with 4426 additions and 668 deletions

View file

@ -368,10 +368,10 @@ gnome_canvas_waveview_init (GnomeCanvasWaveView *waveview)
waveview->screen_width = gdk_screen_width ();
waveview->reload_cache_in_render = FALSE;
waveview->wave_color = RGBA_TO_UINT(44,35,126,255);
waveview->clip_color = RGBA_TO_UINT(44,0,0,100);
waveview->zero_color = RGBA_TO_UINT(44,0,128,100);
waveview->fill_color = RGBA_TO_UINT(44,35,126,128);
waveview->wave_color = 0;
waveview->clip_color = 0;
waveview->zero_color = 0;
waveview->fill_color = 0;
}
static void