diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-08 16:07:28 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-08 16:07:28 +0000 |
commit | 3be16e8afbd891c0bfe7227158384ed0d127597f (patch) | |
tree | 73a8f761fc13cbd0613d3923a34748bb9aa761d2 /gtk2_ardour/option_editor.cc | |
parent | a9bb336fc44ab4937978f5a0308e440ed632ea50 (diff) |
partial patch/partial by-hand merge of 2.X commits 3169&3170 to 3.X codebase
git-svn-id: svn://localhost/ardour2/branches/3.0@4300 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/option_editor.cc')
-rw-r--r-- | gtk2_ardour/option_editor.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index ca598a363f..c261aba649 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -1117,7 +1117,8 @@ OptionEditor::setup_click_editor () click_emphasis_path_entry.set_sensitive (true); click_io_selector = new IOSelector (*session, session->click_io(), false); - click_gpm = new GainMeter (session->click_io(), *session); + click_gpm = new GainMeter (*session); + click_gpm->set_io (session->click_io()); click_hpacker.pack_start (*click_io_selector, false, false); click_hpacker.pack_start (*click_gpm, false, false); @@ -1173,7 +1174,8 @@ void OptionEditor::connect_audition_editor () { auditioner_io_selector = new IOSelector (*session, session->the_auditioner(), false); - auditioner_gpm = new GainMeter (session->the_auditioner(), *session); + auditioner_gpm = new GainMeter (*session); + auditioner_gpm->set_io (session->the_auditioner()); audition_hpacker.pack_start (*auditioner_io_selector, false, false); audition_hpacker.pack_start (*auditioner_gpm, false, false); |