Merged from trunk R743

git-svn-id: svn://localhost/ardour2/branches/midi@744 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2006-08-02 00:22:16 +00:00
parent 0565c75ce8
commit e51e31dca2
35 changed files with 378 additions and 298 deletions

View file

@ -139,9 +139,8 @@ protected:
bool rec_active;
bool use_rec_regions;
/* XXX why are these different? */
Gdk::Color region_color;
uint32_t stream_base_color;
Gdk::Color region_color; ///< Contained region color
uint32_t stream_base_color; ///< Background color
vector<sigc::connection> playlist_connections;
sigc::connection playlist_change_connection;