From dc9fb4a033c64d9e91fc25bbc40abda8d9ee4eba Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 10 May 2012 19:29:22 +0000 Subject: [PATCH] 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 --- gtk2_ardour/crossfade_edit.cc | 32 +++++++++--------- gtk2_ardour/editor.cc | 30 ++++++++-------- .../{crossfade-in-S1.png => fadein-S1.png} | Bin .../{crossfade-in-S2.png => fadein-S2.png} | Bin ...nt-power.png => fadein-constant-power.png} | Bin ...de-in-fast-cut.png => fadein-fast-cut.png} | Bin ...ssfade-in-linear.png => fadein-linear.png} | Bin ...de-in-long-cut.png => fadein-long-cut.png} | Bin ...-in-short-cut.png => fadein-short-cut.png} | Bin ...de-in-slow-cut.png => fadein-slow-cut.png} | Bin .../{crossfade-out-S1.png => fadeout-S1.png} | Bin .../{crossfade-out-S2.png => fadeout-S2.png} | Bin ...t-power.png => fadeout-constant-power.png} | Bin ...-out-fast-cut.png => fadeout-fast-cut.png} | Bin ...fade-out-linear.png => fadeout-linear.png} | Bin ...-out-long-cut.png => fadeout-long-cut.png} | Bin ...ut-short-cut.png => fadeout-short-cut.png} | Bin ...-out-slow-cut.png => fadeout-slow-cut.png} | Bin 18 files changed, 31 insertions(+), 31 deletions(-) rename gtk2_ardour/icons/{crossfade-in-S1.png => fadein-S1.png} (100%) rename gtk2_ardour/icons/{crossfade-in-S2.png => fadein-S2.png} (100%) rename gtk2_ardour/icons/{crossfade-in-constant-power.png => fadein-constant-power.png} (100%) rename gtk2_ardour/icons/{crossfade-in-fast-cut.png => fadein-fast-cut.png} (100%) rename gtk2_ardour/icons/{crossfade-in-linear.png => fadein-linear.png} (100%) rename gtk2_ardour/icons/{crossfade-in-long-cut.png => fadein-long-cut.png} (100%) rename gtk2_ardour/icons/{crossfade-in-short-cut.png => fadein-short-cut.png} (100%) rename gtk2_ardour/icons/{crossfade-in-slow-cut.png => fadein-slow-cut.png} (100%) rename gtk2_ardour/icons/{crossfade-out-S1.png => fadeout-S1.png} (100%) rename gtk2_ardour/icons/{crossfade-out-S2.png => fadeout-S2.png} (100%) rename gtk2_ardour/icons/{crossfade-out-constant-power.png => fadeout-constant-power.png} (100%) rename gtk2_ardour/icons/{crossfade-out-fast-cut.png => fadeout-fast-cut.png} (100%) rename gtk2_ardour/icons/{crossfade-out-linear.png => fadeout-linear.png} (100%) rename gtk2_ardour/icons/{crossfade-out-long-cut.png => fadeout-long-cut.png} (100%) rename gtk2_ardour/icons/{crossfade-out-short-cut.png => fadeout-short-cut.png} (100%) rename gtk2_ardour/icons/{crossfade-out-slow-cut.png => fadeout-slow-cut.png} (100%) 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_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_("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"))); + _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_("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"))); + _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 similarity index 100% rename from gtk2_ardour/icons/crossfade-in-S1.png rename to gtk2_ardour/icons/fadein-S1.png diff --git a/gtk2_ardour/icons/crossfade-in-S2.png b/gtk2_ardour/icons/fadein-S2.png similarity index 100% rename from gtk2_ardour/icons/crossfade-in-S2.png rename to 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 similarity index 100% rename from gtk2_ardour/icons/crossfade-in-constant-power.png rename to 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 similarity index 100% rename from gtk2_ardour/icons/crossfade-in-fast-cut.png rename to gtk2_ardour/icons/fadein-fast-cut.png diff --git a/gtk2_ardour/icons/crossfade-in-linear.png b/gtk2_ardour/icons/fadein-linear.png similarity index 100% rename from gtk2_ardour/icons/crossfade-in-linear.png rename to 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 similarity index 100% rename from gtk2_ardour/icons/crossfade-in-long-cut.png rename to 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 similarity index 100% rename from gtk2_ardour/icons/crossfade-in-short-cut.png rename to 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 similarity index 100% rename from gtk2_ardour/icons/crossfade-in-slow-cut.png rename to gtk2_ardour/icons/fadein-slow-cut.png diff --git a/gtk2_ardour/icons/crossfade-out-S1.png b/gtk2_ardour/icons/fadeout-S1.png similarity index 100% rename from gtk2_ardour/icons/crossfade-out-S1.png rename to gtk2_ardour/icons/fadeout-S1.png diff --git a/gtk2_ardour/icons/crossfade-out-S2.png b/gtk2_ardour/icons/fadeout-S2.png similarity index 100% rename from gtk2_ardour/icons/crossfade-out-S2.png rename to 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 similarity index 100% rename from gtk2_ardour/icons/crossfade-out-constant-power.png rename to 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 similarity index 100% rename from gtk2_ardour/icons/crossfade-out-fast-cut.png rename to gtk2_ardour/icons/fadeout-fast-cut.png diff --git a/gtk2_ardour/icons/crossfade-out-linear.png b/gtk2_ardour/icons/fadeout-linear.png similarity index 100% rename from gtk2_ardour/icons/crossfade-out-linear.png rename to 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 similarity index 100% rename from gtk2_ardour/icons/crossfade-out-long-cut.png rename to 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 similarity index 100% rename from gtk2_ardour/icons/crossfade-out-short-cut.png rename to 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 similarity index 100% rename from gtk2_ardour/icons/crossfade-out-slow-cut.png rename to gtk2_ardour/icons/fadeout-slow-cut.png