mp4chaps Lua script: don't clutter global environment

[ardour.git] / gtk2_ardour / region_editor.cc

diff --git a/gtk2_ardour/region_editor.cc b/gtk2_ardour/region_editor.cc
index 16888fb6880d2d7160d60eeda70aeb240abc58a6..bb0199678ee5be339300217553dbb86f4a983a64 100644 (file)
--- a/gtk2_ardour/region_editor.cc
+++ b/gtk2_ardour/region_editor.cc
@@ -20,10 +20,13 @@
 #include <cmath>
 
 #include <gtkmm/listviewtext.h>
+#include <gtkmm/stock.h>
 
 #include "pbd/memento_command.h"
 #include "pbd/stateful_diff_command.h"
 
+#include "widgets/tooltips.h"
+
 #include "ardour/region.h"
 #include "ardour/session.h"
 #include "ardour/source.h"
@@ -35,7 +38,7 @@
 #include "region_editor.h"
 #include "public_editor.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
@@ -44,30 +47,30 @@ using namespace Gtkmm2ext;
 
 RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
        : ArdourDialog (_("Region"))
-        , _table (9, 2)
-        , _table_row (0)
-        , _region (r)
-        , name_label (_("Name:"))
-        , audition_button (_("Audition"))
-        , _clock_group (new ClockGroup)
-        , position_clock (X_("regionposition"), true, "", true, false)
-        , end_clock (X_("regionend"), true, "", true, false)
-        , length_clock (X_("regionlength"), true, "", true, false, true)
-        , sync_offset_relative_clock (X_("regionsyncoffsetrelative"), true, "", true, false)
-        , sync_offset_absolute_clock (X_("regionsyncoffsetabsolute"), true, "", true, false)
-          /* XXX cannot file start yet */
-        , start_clock (X_("regionstart"), true, "", false, false)
-        , _sources (1)
+       , _table (9, 2)
+       , _table_row (0)
+       , _region (r)
+       , name_label (_("Name:"))
+       , audition_button (_("Audition"))
+       , _clock_group (new ClockGroup)
+       , position_clock (X_("regionposition"), true, "", true, false)
+       , end_clock (X_("regionend"), true, "", true, false)
+       , length_clock (X_("regionlength"), true, "", true, false, true)
+       , sync_offset_relative_clock (X_("regionsyncoffsetrelative"), true, "", true, false)
+       , sync_offset_absolute_clock (X_("regionsyncoffsetabsolute"), true, "", true, false)
+         /* XXX cannot file start yet */
+       , start_clock (X_("regionstart"), true, "", false, false)
+       , _sources (1)
 {
        set_session (s);
 
-        _clock_group->set_clock_mode (ARDOUR_UI::instance()->secondary_clock->mode());
-        _clock_group->add (position_clock);
-        _clock_group->add (end_clock);
-        _clock_group->add (length_clock);
-        _clock_group->add (sync_offset_relative_clock);
-        _clock_group->add (sync_offset_absolute_clock);
-        _clock_group->add (start_clock);
+       _clock_group->set_clock_mode (ARDOUR_UI::instance()->secondary_clock->mode());
+       _clock_group->add (position_clock);
+       _clock_group->add (end_clock);
+       _clock_group->add (length_clock);
+       _clock_group->add (sync_offset_relative_clock);
+       _clock_group->add (sync_offset_absolute_clock);
+       _clock_group->add (start_clock);
 
        position_clock.set_session (_session);
        end_clock.set_session (_session);
@@ -76,7 +79,7 @@ RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
        sync_offset_absolute_clock.set_session (_session);
        start_clock.set_session (_session);
 
-       ARDOUR_UI::instance()->set_tip (audition_button, _("audition this region"));
+       ArdourWidgets::set_tooltip (audition_button, _("audition this region"));
 
        audition_button.unset_flags (Gtk::CAN_FOCUS);
 
@@ -196,7 +199,7 @@ RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
 
 RegionEditor::~RegionEditor ()
 {
-        delete _clock_group;
+       delete _clock_group;
 }
 
 void
@@ -270,33 +273,41 @@ RegionEditor::connect_editor_events ()
 void
 RegionEditor::position_clock_changed ()
 {
-       PublicEditor::instance().begin_reversible_command (_("change region start position"));
-
+       bool in_command = false;
        boost::shared_ptr<Playlist> pl = _region->playlist();
 
        if (pl) {
+               PublicEditor::instance().begin_reversible_command (_("change region start position"));
+               in_command = true;
+
                _region->clear_changes ();
                _region->set_position (position_clock.current_time());
                _session->add_command(new StatefulDiffCommand (_region));
        }
 
-       PublicEditor::instance().commit_reversible_command ();
+       if (in_command) {
+               PublicEditor::instance().commit_reversible_command ();
+       }
 }
 
 void
 RegionEditor::end_clock_changed ()
 {
-       PublicEditor::instance().begin_reversible_command (_("change region end position"));
-
+       bool in_command = false;
        boost::shared_ptr<Playlist> pl = _region->playlist();
 
        if (pl) {
-                _region->clear_changes ();
+               PublicEditor::instance().begin_reversible_command (_("change region end position"));
+               in_command = true;
+
+               _region->clear_changes ();
                _region->trim_end (end_clock.current_time());
                _session->add_command(new StatefulDiffCommand (_region));
        }
 
-       PublicEditor::instance().commit_reversible_command ();
+       if (in_command) {
+               PublicEditor::instance().commit_reversible_command ();
+       }
 
        end_clock.set (_region->position() + _region->length() - 1, true);
 }
@@ -305,18 +316,21 @@ void
 RegionEditor::length_clock_changed ()
 {
        framecnt_t frames = length_clock.current_time();
-
-       PublicEditor::instance().begin_reversible_command (_("change region length"));
-
+       bool in_command = false;
        boost::shared_ptr<Playlist> pl = _region->playlist();
 
        if (pl) {
-                _region->clear_changes ();
+               PublicEditor::instance().begin_reversible_command (_("change region length"));
+               in_command = true;
+
+               _region->clear_changes ();
                _region->trim_end (_region->position() + frames - 1);
                _session->add_command(new StatefulDiffCommand (_region));
        }
 
-       PublicEditor::instance().commit_reversible_command ();
+       if (in_command) {
+               PublicEditor::instance().commit_reversible_command ();
+       }
 
        length_clock.set (_region->length());
 }
@@ -402,7 +416,7 @@ RegionEditor::sync_offset_absolute_clock_changed ()
 {
        PublicEditor::instance().begin_reversible_command (_("change region sync point"));
 
-        _region->clear_changes ();
+       _region->clear_changes ();
        _region->set_sync_position (sync_offset_absolute_clock.current_time());
        _session->add_command (new StatefulDiffCommand (_region));
 
@@ -414,7 +428,7 @@ RegionEditor::sync_offset_relative_clock_changed ()
 {
        PublicEditor::instance().begin_reversible_command (_("change region sync point"));
 
-        _region->clear_changes ();
+       _region->clear_changes ();
        _region->set_sync_position (sync_offset_relative_clock.current_time() + _region->position ());
        _session->add_command (new StatefulDiffCommand (_region));