diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-30 17:40:47 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-30 17:40:47 +0000 |
| commit | 5c6c82bb797cc76e981d79c41b7a55fc87296fe0 (patch) | |
| tree | f3c10b40d69fa97b176d784d4eac35b66cf73d6a /gtk2_ardour | |
| parent | 53ba0cf2b056ef5b5505b88b8a346c455a8ebb62 (diff) | |
fix for mis-merge of region dialog gain patch (#2879), from colinf
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5987 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/audio_region_editor.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc index 76d8de9d05..b30b462841 100644 --- a/gtk2_ardour/audio_region_editor.cc +++ b/gtk2_ardour/audio_region_editor.cc @@ -54,7 +54,7 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr<AudioRegion> /* XXX cannot edit sync point or start yet */ sync_offset_clock (X_("regionsyncoffset"), true, X_("AudioRegionEditorClock"), false), start_clock (X_("regionstart"), true, X_("AudioRegionEditorClock"), false), - gain_adjustment(accurate_coefficient_to_dB(_region->scale_amplitude()), -40.0, +40.0, 0.1, 1.0, 0) + gain_adjustment(accurate_coefficient_to_dB(_region->scale_amplitude()), -40.0, +40.0, 0.1, 1.0, 0) { position_clock.set_session (&_session); end_clock.set_session (&_session); @@ -131,13 +131,6 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr<AudioRegion> gain_entry.configure (gain_adjustment, 0.0, 1); time_table.attach (gain_label, 0, 1, 6, 7, Gtk::FILL, Gtk::FILL); time_table.attach (gain_entry, 1, 2, 6, 7, Gtk::FILL, Gtk::FILL); - - gain_label.set_name ("AudioRegionEditorLabel"); - gain_label.set_text (_("Scale amplitude:")); - gain_label.set_alignment (1, 0.5); - gain_entry.configure (gain_adjustment, 0.0, 1); - time_table.attach (gain_label, 0, 1, 6, 7, Gtk::FILL, Gtk::FILL); - time_table.attach (gain_entry, 1, 2, 6, 7, Gtk::FILL, Gtk::FILL); lower_hbox.pack_start (time_table, true, true); lower_hbox.pack_start (sep1, false, false); |