diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-23 08:47:57 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-23 08:47:57 -0400 |
| commit | d135c4dc3a307d0be606f3afbbc8fd8c3ec56438 (patch) | |
| tree | dbedf6ddfe1c1b6557a885ad3b87455ba2213a12 /gtk2_ardour/engine_dialog.cc | |
| parent | fb313fb1741a04f270fff3703967df572ac4fc45 (diff) | |
| parent | 75271a17d8d4ed0003c4627e80a28feb68f5d9c9 (diff) | |
fix merge conflicts with master
Diffstat (limited to 'gtk2_ardour/engine_dialog.cc')
| -rw-r--r-- | gtk2_ardour/engine_dialog.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index b6306ae285..37c29f4187 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -822,7 +822,7 @@ EngineControl::EngineControl () set_popdown_strings (sample_rate_combo, s); if (desired.empty()) { - sample_rate_combo.set_active_text (s.front()); + sample_rate_combo.set_active_text (rate_as_string (backend->default_sample_rate())); } else { sample_rate_combo.set_active_text (desired); } @@ -859,7 +859,7 @@ EngineControl::EngineControl () buffer_size_combo.set_sensitive (true); set_popdown_strings (buffer_size_combo, s); - buffer_size_combo.set_active_text (s.front()); + buffer_size_combo.set_active_text (bufsize_as_string (backend->default_buffer_size())); show_buffer_duration (); } else { buffer_size_combo.set_sensitive (false); |