diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-10 19:29:22 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-10 19:29:22 +0000 |
commit | dc9fb4a033c64d9e91fc25bbc40abda8d9ee4eba (patch) | |
tree | 35757eb8c241ba202df78acc3a23f0ccb686b914 | |
parent | c6d983bda5418fe3ba11a53768a756f22a6bde39 (diff) |
rename images used for fades to indicate that they are fades, not xfades (new images for xfades to come)
git-svn-id: svn://localhost/ardour2/branches/3.0@12244 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r-- | gtk2_ardour/crossfade_edit.cc | 32 | ||||
-rw-r--r-- | gtk2_ardour/editor.cc | 34 | ||||
-rw-r--r-- | gtk2_ardour/icons/fadein-S1.png (renamed from gtk2_ardour/icons/crossfade-in-S1.png) | bin | 922 -> 922 bytes | |||
-rw-r--r-- | gtk2_ardour/icons/fadein-S2.png (renamed from gtk2_ardour/icons/crossfade-in-S2.png) | bin | 913 -> 913 bytes | |||
-rw-r--r-- | gtk2_ardour/icons/fadein-constant-power.png (renamed from gtk2_ardour/icons/crossfade-in-constant-power.png) | bin | 962 -> 962 bytes | |||
-rw-r--r-- | gtk2_ardour/icons/fadein-fast-cut.png (renamed from gtk2_ardour/icons/crossfade-in-fast-cut.png) | bin | 893 -> 893 bytes | |||
-rw-r--r-- | gtk2_ardour/icons/fadein-linear.png (renamed from gtk2_ardour/icons/crossfade-in-linear.png) | bin | 959 -> 959 bytes | |||
-rw-r--r-- | gtk2_ardour/icons/fadein-long-cut.png (renamed from gtk2_ardour/icons/crossfade-in-long-cut.png) | bin | 735 -> 735 bytes | |||
-rw-r--r-- | gtk2_ardour/icons/fadein-short-cut.png (renamed from gtk2_ardour/icons/crossfade-in-short-cut.png) | bin | 904 -> 904 bytes | |||
-rw-r--r-- | gtk2_ardour/icons/fadein-slow-cut.png (renamed from gtk2_ardour/icons/crossfade-in-slow-cut.png) | bin | 988 -> 988 bytes | |||
-rw-r--r-- | gtk2_ardour/icons/fadeout-S1.png (renamed from gtk2_ardour/icons/crossfade-out-S1.png) | bin | 1581 -> 1581 bytes | |||
-rw-r--r-- | gtk2_ardour/icons/fadeout-S2.png (renamed from gtk2_ardour/icons/crossfade-out-S2.png) | bin | 1647 -> 1647 bytes | |||
-rw-r--r-- | gtk2_ardour/icons/fadeout-constant-power.png (renamed from gtk2_ardour/icons/crossfade-out-constant-power.png) | bin | 1012 -> 1012 bytes | |||
-rw-r--r-- | gtk2_ardour/icons/fadeout-fast-cut.png (renamed from gtk2_ardour/icons/crossfade-out-fast-cut.png) | bin | 1684 -> 1684 bytes | |||
-rw-r--r-- | gtk2_ardour/icons/fadeout-linear.png (renamed from gtk2_ardour/icons/crossfade-out-linear.png) | bin | 1599 -> 1599 bytes | |||
-rw-r--r-- | gtk2_ardour/icons/fadeout-long-cut.png (renamed from gtk2_ardour/icons/crossfade-out-long-cut.png) | bin | 1511 -> 1511 bytes | |||
-rw-r--r-- | gtk2_ardour/icons/fadeout-short-cut.png (renamed from gtk2_ardour/icons/crossfade-out-short-cut.png) | bin | 1238 -> 1238 bytes | |||
-rw-r--r-- | gtk2_ardour/icons/fadeout-slow-cut.png (renamed from gtk2_ardour/icons/crossfade-out-slow-cut.png) | bin | 1607 -> 1607 bytes |
18 files changed, 33 insertions, 33 deletions
diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc index 65031917c7..3f6610d49d 100644 --- a/gtk2_ardour/crossfade_edit.cc +++ b/gtk2_ardour/crossfade_edit.cc @@ -889,7 +889,7 @@ CrossfadeEditor::build_presets () /* FADE IN */ - p = new Preset ("Linear (-6dB)", "crossfade-in-linear"); + p = new Preset ("Linear (-6dB)", "fadein-linear"); p->push_back (PresetPoint (0, 0)); p->push_back (PresetPoint (0.000000, 0.000000)); p->push_back (PresetPoint (0.166667, 0.166366)); @@ -900,7 +900,7 @@ CrossfadeEditor::build_presets () p->push_back (PresetPoint (1.000000, 1.000000)); fade_in_presets->push_back (p); - p = new Preset ("S(1)-curve", "crossfade-in-S1"); + p = new Preset ("S(1)-curve", "fadein-S1"); p->push_back (PresetPoint (0, 0)); p->push_back (PresetPoint (0.1, 0.01)); p->push_back (PresetPoint (0.2, 0.03)); @@ -909,7 +909,7 @@ CrossfadeEditor::build_presets () p->push_back (PresetPoint (1, 1)); fade_in_presets->push_back (p); - p = new Preset ("S(2)-curve", "crossfade-in-S2"); + p = new Preset ("S(2)-curve", "fadein-S2"); p->push_back (PresetPoint (0.0, 0.0)); p->push_back (PresetPoint (0.055, 0.222)); p->push_back (PresetPoint (0.163, 0.35)); @@ -918,7 +918,7 @@ CrossfadeEditor::build_presets () p->push_back (PresetPoint (1.0, 1.0)); fade_in_presets->push_back (p); - p = new Preset ("Constant Power (-3dB)", "crossfade-in-constant-power"); + p = new Preset ("Constant Power (-3dB)", "fadein-constant-power"); p->push_back (PresetPoint (0.000000, 0.000000)); p->push_back (PresetPoint (0.166667, 0.282192)); @@ -932,7 +932,7 @@ CrossfadeEditor::build_presets () if (!Profile->get_sae()) { - p = new Preset ("Short cut", "crossfade-in-short-cut"); + p = new Preset ("Short cut", "fadein-short-cut"); p->push_back (PresetPoint (0, 0)); p->push_back (PresetPoint (0.389401, 0.0333333)); p->push_back (PresetPoint (0.629032, 0.0861111)); @@ -942,7 +942,7 @@ CrossfadeEditor::build_presets () p->push_back (PresetPoint (1, 1)); fade_in_presets->push_back (p); - p = new Preset ("Slow cut", "crossfade-in-slow-cut"); + p = new Preset ("Slow cut", "fadein-slow-cut"); p->push_back (PresetPoint (0, 0)); p->push_back (PresetPoint (0.304147, 0.0694444)); p->push_back (PresetPoint (0.529954, 0.152778)); @@ -952,7 +952,7 @@ CrossfadeEditor::build_presets () p->push_back (PresetPoint (1, 1)); fade_in_presets->push_back (p); - p = new Preset ("Fast cut", "crossfade-in-fast-cut"); + p = new Preset ("Fast cut", "fadein-fast-cut"); p->push_back (PresetPoint (0, 0)); p->push_back (PresetPoint (0.0737327, 0.308333)); p->push_back (PresetPoint (0.246544, 0.658333)); @@ -962,7 +962,7 @@ CrossfadeEditor::build_presets () p->push_back (PresetPoint (1, 1)); fade_in_presets->push_back (p); - p = new Preset ("Long cut", "crossfade-in-long-cut"); + p = new Preset ("Long cut", "fadein-long-cut"); p->push_back (PresetPoint (0, 0)); p->push_back (PresetPoint (0.0207373, 0.197222)); p->push_back (PresetPoint (0.0645161, 0.525)); @@ -977,7 +977,7 @@ CrossfadeEditor::build_presets () /* FADE OUT */ // p = new Preset ("regout.xpm"); - p = new Preset ("Linear (-6dB cut)", "crossfade-out-linear"); + p = new Preset ("Linear (-6dB cut)", "fadeout-linear"); p->push_back (PresetPoint (0, 1)); p->push_back (PresetPoint (0.000000, 1.000000)); p->push_back (PresetPoint (0.166667, 0.833033)); @@ -988,7 +988,7 @@ CrossfadeEditor::build_presets () p->push_back (PresetPoint (1.000000, 0.000000)); fade_out_presets->push_back (p); - p = new Preset ("S(1)-Curve", "crossfade-out-S1"); + p = new Preset ("S(1)-Curve", "fadeout-S1"); p->push_back (PresetPoint (0, 1)); p->push_back (PresetPoint (0.1, 0.99)); p->push_back (PresetPoint (0.2, 0.97)); @@ -997,7 +997,7 @@ CrossfadeEditor::build_presets () p->push_back (PresetPoint (1, 0)); fade_out_presets->push_back (p); - p = new Preset ("S(2)-Curve", "crossfade-out-S2"); + p = new Preset ("S(2)-Curve", "fadeout-S2"); p->push_back (PresetPoint (0.0, 1.0)); p->push_back (PresetPoint (0.163, 0.678)); p->push_back (PresetPoint (0.055, 0.783)); @@ -1007,7 +1007,7 @@ CrossfadeEditor::build_presets () fade_out_presets->push_back (p); // p = new Preset ("linout.xpm"); - p = new Preset ("Constant Power (-3dB cut)", "crossfade-out-constant-power"); + p = new Preset ("Constant Power (-3dB cut)", "fadeout-constant-power"); p->push_back (PresetPoint (0.000000, 1.000000)); p->push_back (PresetPoint (0.166667, 0.948859)); p->push_back (PresetPoint (0.333333, 0.851507)); @@ -1019,7 +1019,7 @@ CrossfadeEditor::build_presets () if (!Profile->get_sae()) { // p = new Preset ("hiout.xpm"); - p = new Preset ("Short cut", "crossfade-out-short-cut"); + p = new Preset ("Short cut", "fadeout-short-cut"); p->push_back (PresetPoint (0, 1)); p->push_back (PresetPoint (0.305556, 1)); p->push_back (PresetPoint (0.548611, 0.991736)); @@ -1029,7 +1029,7 @@ CrossfadeEditor::build_presets () p->push_back (PresetPoint (1, 0)); fade_out_presets->push_back (p); - p = new Preset ("Slow cut", "crossfade-out-slow-cut"); + p = new Preset ("Slow cut", "fadeout-slow-cut"); p->push_back (PresetPoint (0, 1)); p->push_back (PresetPoint (0.228111, 0.988889)); p->push_back (PresetPoint (0.347926, 0.972222)); @@ -1039,7 +1039,7 @@ CrossfadeEditor::build_presets () p->push_back (PresetPoint (1, 0)); fade_out_presets->push_back (p); - p = new Preset ("Fast cut", "crossfade-out-fast-cut"); + p = new Preset ("Fast cut", "fadeout-fast-cut"); p->push_back (PresetPoint (0, 1)); p->push_back (PresetPoint (0.080645, 0.730556)); p->push_back (PresetPoint (0.277778, 0.289256)); @@ -1049,7 +1049,7 @@ CrossfadeEditor::build_presets () fade_out_presets->push_back (p); // p = new Preset ("loout.xpm"); - p = new Preset ("Long cut", "crossfade-out-long-cut"); + p = new Preset ("Long cut", "fadeout-long-cut"); p->push_back (PresetPoint (0, 1)); p->push_back (PresetPoint (0.023041, 0.697222)); p->push_back (PresetPoint (0.0553, 0.483333)); diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 4a358ff114..6dfe47230f 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -5344,23 +5344,23 @@ Editor::update_region_layering_order_editor () void Editor::setup_fade_images () { - _fade_in_images[FadeLinear] = new Gtk::Image (get_icon_path (X_("crossfade-in-linear"))); - _fade_in_images[FadeFast] = new Gtk::Image (get_icon_path (X_("crossfade-in-short-cut"))); - _fade_in_images[FadeLogB] = new Gtk::Image (get_icon_path (X_("crossfade-in-slow-cut"))); - _fade_in_images[FadeLogA] = new Gtk::Image (get_icon_path (X_("crossfade-in-fast-cut"))); - _fade_in_images[FadeSlow] = new Gtk::Image (get_icon_path (X_("crossfade-in-long-cut"))); - - _fade_out_images[FadeLinear] = new Gtk::Image (get_icon_path (X_("crossfade-out-linear"))); - _fade_out_images[FadeFast] = new Gtk::Image (get_icon_path (X_("crossfade-out-short-cut"))); - _fade_out_images[FadeLogB] = new Gtk::Image (get_icon_path (X_("crossfade-out-slow-cut"))); - _fade_out_images[FadeLogA] = new Gtk::Image (get_icon_path (X_("crossfade-out-fast-cut"))); - _fade_out_images[FadeSlow] = new Gtk::Image (get_icon_path (X_("crossfade-out-long-cut"))); - - _xfade_images[FadeLinear] = new Gtk::Image (get_icon_path (X_("crossfade-out-linear"))); - _xfade_images[FadeFast] = new Gtk::Image (get_icon_path (X_("crossfade-out-short-cut"))); - _xfade_images[FadeLogB] = new Gtk::Image (get_icon_path (X_("crossfade-out-slow-cut"))); - _xfade_images[FadeLogA] = new Gtk::Image (get_icon_path (X_("crossfade-out-fast-cut"))); - _xfade_images[FadeSlow] = new Gtk::Image (get_icon_path (X_("crossfade-out-long-cut"))); + _fade_in_images[FadeLinear] = new Gtk::Image (get_icon_path (X_("fadein-linear"))); + _fade_in_images[FadeFast] = new Gtk::Image (get_icon_path (X_("fadein-short-cut"))); + _fade_in_images[FadeLogB] = new Gtk::Image (get_icon_path (X_("fadein-slow-cut"))); + _fade_in_images[FadeLogA] = new Gtk::Image (get_icon_path (X_("fadein-fast-cut"))); + _fade_in_images[FadeSlow] = new Gtk::Image (get_icon_path (X_("fadein-long-cut"))); + + _fade_out_images[FadeLinear] = new Gtk::Image (get_icon_path (X_("fadeout-linear"))); + _fade_out_images[FadeFast] = new Gtk::Image (get_icon_path (X_("fadeout-short-cut"))); + _fade_out_images[FadeLogB] = new Gtk::Image (get_icon_path (X_("fadeout-slow-cut"))); + _fade_out_images[FadeLogA] = new Gtk::Image (get_icon_path (X_("fadeout-fast-cut"))); + _fade_out_images[FadeSlow] = new Gtk::Image (get_icon_path (X_("fadeout-long-cut"))); + + _xfade_images[FadeLinear] = new Gtk::Image (get_icon_path (X_("fadeout-linear"))); + _xfade_images[FadeFast] = new Gtk::Image (get_icon_path (X_("fadeout-short-cut"))); + _xfade_images[FadeLogB] = new Gtk::Image (get_icon_path (X_("fadeout-slow-cut"))); + _xfade_images[FadeLogA] = new Gtk::Image (get_icon_path (X_("fadeout-fast-cut"))); + _xfade_images[FadeSlow] = new Gtk::Image (get_icon_path (X_("fadeout-long-cut"))); } diff --git a/gtk2_ardour/icons/crossfade-in-S1.png b/gtk2_ardour/icons/fadein-S1.png Binary files differindex 09d62795ee..09d62795ee 100644 --- a/gtk2_ardour/icons/crossfade-in-S1.png +++ b/gtk2_ardour/icons/fadein-S1.png diff --git a/gtk2_ardour/icons/crossfade-in-S2.png b/gtk2_ardour/icons/fadein-S2.png Binary files differindex d7aaf5f428..d7aaf5f428 100644 --- a/gtk2_ardour/icons/crossfade-in-S2.png +++ b/gtk2_ardour/icons/fadein-S2.png diff --git a/gtk2_ardour/icons/crossfade-in-constant-power.png b/gtk2_ardour/icons/fadein-constant-power.png Binary files differindex 13a0a05b7b..13a0a05b7b 100644 --- a/gtk2_ardour/icons/crossfade-in-constant-power.png +++ b/gtk2_ardour/icons/fadein-constant-power.png diff --git a/gtk2_ardour/icons/crossfade-in-fast-cut.png b/gtk2_ardour/icons/fadein-fast-cut.png Binary files differindex 3565ee26b3..3565ee26b3 100644 --- a/gtk2_ardour/icons/crossfade-in-fast-cut.png +++ b/gtk2_ardour/icons/fadein-fast-cut.png diff --git a/gtk2_ardour/icons/crossfade-in-linear.png b/gtk2_ardour/icons/fadein-linear.png Binary files differindex 7b8980aca7..7b8980aca7 100644 --- a/gtk2_ardour/icons/crossfade-in-linear.png +++ b/gtk2_ardour/icons/fadein-linear.png diff --git a/gtk2_ardour/icons/crossfade-in-long-cut.png b/gtk2_ardour/icons/fadein-long-cut.png Binary files differindex 578346afd6..578346afd6 100644 --- a/gtk2_ardour/icons/crossfade-in-long-cut.png +++ b/gtk2_ardour/icons/fadein-long-cut.png diff --git a/gtk2_ardour/icons/crossfade-in-short-cut.png b/gtk2_ardour/icons/fadein-short-cut.png Binary files differindex 465698f57a..465698f57a 100644 --- a/gtk2_ardour/icons/crossfade-in-short-cut.png +++ b/gtk2_ardour/icons/fadein-short-cut.png diff --git a/gtk2_ardour/icons/crossfade-in-slow-cut.png b/gtk2_ardour/icons/fadein-slow-cut.png Binary files differindex 8080e3a9bb..8080e3a9bb 100644 --- a/gtk2_ardour/icons/crossfade-in-slow-cut.png +++ b/gtk2_ardour/icons/fadein-slow-cut.png diff --git a/gtk2_ardour/icons/crossfade-out-S1.png b/gtk2_ardour/icons/fadeout-S1.png Binary files differindex 6313690a37..6313690a37 100644 --- a/gtk2_ardour/icons/crossfade-out-S1.png +++ b/gtk2_ardour/icons/fadeout-S1.png diff --git a/gtk2_ardour/icons/crossfade-out-S2.png b/gtk2_ardour/icons/fadeout-S2.png Binary files differindex 35efbea137..35efbea137 100644 --- a/gtk2_ardour/icons/crossfade-out-S2.png +++ b/gtk2_ardour/icons/fadeout-S2.png diff --git a/gtk2_ardour/icons/crossfade-out-constant-power.png b/gtk2_ardour/icons/fadeout-constant-power.png Binary files differindex 359f37096c..359f37096c 100644 --- a/gtk2_ardour/icons/crossfade-out-constant-power.png +++ b/gtk2_ardour/icons/fadeout-constant-power.png diff --git a/gtk2_ardour/icons/crossfade-out-fast-cut.png b/gtk2_ardour/icons/fadeout-fast-cut.png Binary files differindex 39d00c0916..39d00c0916 100644 --- a/gtk2_ardour/icons/crossfade-out-fast-cut.png +++ b/gtk2_ardour/icons/fadeout-fast-cut.png diff --git a/gtk2_ardour/icons/crossfade-out-linear.png b/gtk2_ardour/icons/fadeout-linear.png Binary files differindex a9fb6a345f..a9fb6a345f 100644 --- a/gtk2_ardour/icons/crossfade-out-linear.png +++ b/gtk2_ardour/icons/fadeout-linear.png diff --git a/gtk2_ardour/icons/crossfade-out-long-cut.png b/gtk2_ardour/icons/fadeout-long-cut.png Binary files differindex 66c9bb545e..66c9bb545e 100644 --- a/gtk2_ardour/icons/crossfade-out-long-cut.png +++ b/gtk2_ardour/icons/fadeout-long-cut.png diff --git a/gtk2_ardour/icons/crossfade-out-short-cut.png b/gtk2_ardour/icons/fadeout-short-cut.png Binary files differindex 43c6a570b0..43c6a570b0 100644 --- a/gtk2_ardour/icons/crossfade-out-short-cut.png +++ b/gtk2_ardour/icons/fadeout-short-cut.png diff --git a/gtk2_ardour/icons/crossfade-out-slow-cut.png b/gtk2_ardour/icons/fadeout-slow-cut.png Binary files differindex b740ad2c22..b740ad2c22 100644 --- a/gtk2_ardour/icons/crossfade-out-slow-cut.png +++ b/gtk2_ardour/icons/fadeout-slow-cut.png |