allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Couple of fixes to route / mixer strip ordering which should hopefully stop the random re-ordering on startup.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5026 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington
2009-05-01 20:30:57 +00:00
parent c4656b5c09
commit 918371d52a
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gtk2_ardour/editor_route_list.cc
View File

@@ -339,14 +339,13 @@ Editor::redisplay_route_list ()
TreeModel::Children rows = route_display_model->children();
TreeModel::Children::iterator i;
uint32_t position;
uint32_t order;
int n;
if (no_route_list_redisplay) {
return;
}
for (n = 0, order = 0, position = 0, i = rows.begin(); i != rows.end(); ++i) {
for (n = 0, position = 0, i = rows.begin(); i != rows.end(); ++i) {
TimeAxisView *tv = (*i)[route_display_columns.tv];
boost::shared_ptr<Route> route = (*i)[route_display_columns.route];
@@ -361,7 +360,7 @@ Editor::redisplay_route_list ()
to tracks.
*/
route->set_order_key (_order_key, order);
route->set_order_key (_order_key, n);
}
bool visible = (*i)[route_display_columns.visible];

2
gtk2_ardour/time_axis_view_item.cc
View File

@@ -136,7 +136,7 @@ TimeAxisViewItem::init (const string& it_name, double spu, Gdk::Color& base_colo
frame_position = start ;
item_duration = duration ;
name_connected = false;
// why? fill_opacity = 60;
fill_opacity = 60;
position_locked = false ;
max_item_duration = ARDOUR::max_frames;
min_item_duration = 0 ;

4
libs/ardour/route.cc
View File

@@ -155,7 +155,7 @@ long
Route::order_key (const char* name) const
{
OrderKeys::const_iterator i;
for (i = order_keys.begin(); i != order_keys.end(); ++i) {
if (!strcmp (name, i->first)) {
return i->second;
@@ -196,8 +196,8 @@ Route::sync_order_keys (const char* base)
++i;
} else {
/* key exists - use it and reset all others (actually, itself included) */
i = order_keys.begin();
key = i->second;
i = order_keys.begin();
}
for (; i != order_keys.end(); ++i) {