Fix region/track naming on MIDI import (remove ugly/unnecessary %a %b etc suffix).

[ardour.git] / gtk2_ardour / audio_region_editor.cc

diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc
index 9c98fb3bab89795eb342d9baa8ec74d2b11089f9..ff84a44488d1e1a11fae065e1c00968e30c6da1a 100644 (file)
--- a/gtk2_ardour/audio_region_editor.cc
+++ b/gtk2_ardour/audio_region_editor.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <pbd/memento_command.h>
@@ -25,6 +24,7 @@
 #include <ardour/utils.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/stop_signal.h>
+#include <gtkmm2ext/window_title.h>
 #include <cmath>
 
 #include "audio_region_editor.h"
@@ -39,6 +39,7 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace sigc;
 using namespace std;
+using namespace Gtkmm2ext;
 
 AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr<AudioRegion> r, AudioRegionView& rv)
        : RegionEditor (s),
@@ -47,10 +48,10 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr<AudioRegion>
          name_label (_("NAME:")),
          audition_button (_("play")),
          time_table (3, 2),
-         start_clock ("AudioRegionEditorClock", true),
-         end_clock ("AudioRegionEditorClock", true),
-         length_clock ("AudioRegionEditorClock", true, true),
-         sync_offset_clock ("AudioRegionEditorClock", true, true)
+         start_clock (X_("regionstart"), true, X_("AudioRegionEditorClock"), true),
+         end_clock (X_("regionend"), true, X_("AudioRegionEditorClock"), true),
+         length_clock (X_("regionlength"), true, X_("AudioRegionEditorClock"), true, true),
+         sync_offset_clock (X_("regionsyncoffset"), true, X_("AudioRegionEditorClock"), true, true)
 
 {
        start_clock.set_session (&_session);
@@ -119,17 +120,16 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr<AudioRegion>
 
        signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), static_cast<Window *> (this)));
 
-       string title = _("ardour: region ");
-       title += _region->name();
-       set_title (title);
+       WindowTitle title(string_compose (_("Region %1"), _region->name()));
+       title += Glib::get_application_name();
+
+       set_title (title.get_string());
 
        show_all();
 
        name_changed ();
        bounds_changed (Change (StartChanged|LengthChanged|PositionChanged));
 
-       XMLNode *node  = _region->extra_xml ("GUI");
-
        _region->StateChanged.connect (mem_fun(*this, &AudioRegionEditor::region_changed));
        
        spin_arrow_grab = false;
@@ -203,7 +203,7 @@ AudioRegionEditor::start_clock_changed ()
 {
        _session.begin_reversible_command (_("change region start position"));
 
-       Playlist* const pl = _region->playlist();
+       boost::shared_ptr<Playlist> pl = _region->playlist();
 
        if (pl) {
                XMLNode &before = pl->get_state();
@@ -220,8 +220,8 @@ AudioRegionEditor::end_clock_changed ()
 {
        _session.begin_reversible_command (_("change region end position"));
 
-       Playlist* const pl = _region->playlist();
-
+       boost::shared_ptr<Playlist> pl = _region->playlist();
+       
        if (pl) {
                XMLNode &before = pl->get_state();
                _region->trim_end (end_clock.current_time(), this);
@@ -241,7 +241,7 @@ AudioRegionEditor::length_clock_changed ()
        
        _session.begin_reversible_command (_("change region length"));
        
-       Playlist* const pl = _region->playlist();
+       boost::shared_ptr<Playlist> pl = _region->playlist();
 
        if (pl) {
                XMLNode &before = pl->get_state();