projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix compilation on OSX/PPC (old coreaudio)
[ardour.git]
/
gtk2_ardour
/
region_editor.cc
diff --git
a/gtk2_ardour/region_editor.cc
b/gtk2_ardour/region_editor.cc
old mode 100755
(executable)
new mode 100644
(file)
index
6955068
..
725e5c3
--- a/
gtk2_ardour/region_editor.cc
+++ b/
gtk2_ardour/region_editor.cc
@@
-17,24
+17,24
@@
*/
*/
+#include <cmath>
+
+#include <gtkmm/listviewtext.h>
+
#include "pbd/memento_command.h"
#include "pbd/stateful_diff_command.h"
#include "pbd/memento_command.h"
#include "pbd/stateful_diff_command.h"
-#include "ardour/session.h"
#include "ardour/region.h"
#include "ardour/region.h"
-#include "ardour/playlist.h"
-#include "ardour/utils.h"
-#include "ardour/dB.h"
+#include "ardour/session.h"
#include "ardour/source.h"
#include "ardour/source.h"
-#include "gtkmm2ext/utils.h"
-#include <gtkmm/listviewtext.h>
-#include <cmath>
#include "ardour_ui.h"
#include "clock_group.h"
#include "ardour_ui.h"
#include "clock_group.h"
+#include "main_clock.h"
#include "gui_thread.h"
#include "region_editor.h"
#include "gui_thread.h"
#include "region_editor.h"
-#include "utils.h"
+#include "public_editor.h"
+#include "tooltips.h"
#include "i18n.h"
#include "i18n.h"
@@
-42,6
+42,7
@@
using namespace ARDOUR;
using namespace PBD;
using namespace std;
using namespace Gtkmm2ext;
using namespace PBD;
using namespace std;
using namespace Gtkmm2ext;
+using namespace ARDOUR_UI_UTILS;
RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
: ArdourDialog (_("Region"))
RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
: ArdourDialog (_("Region"))
@@
-62,7
+63,7
@@
RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
{
set_session (s);
{
set_session (s);
- _clock_group->set_clock_mode (A
udioClock::Frames
);
+ _clock_group->set_clock_mode (A
RDOUR_UI::instance()->secondary_clock->mode()
);
_clock_group->add (position_clock);
_clock_group->add (end_clock);
_clock_group->add (length_clock);
_clock_group->add (position_clock);
_clock_group->add (end_clock);
_clock_group->add (length_clock);
@@
-77,7
+78,7
@@
RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
sync_offset_absolute_clock.set_session (_session);
start_clock.set_session (_session);
sync_offset_absolute_clock.set_session (_session);
start_clock.set_session (_session);
-
ARDOUR_UI::instance()->set_
tip (audition_button, _("audition this region"));
+
set_tool
tip (audition_button, _("audition this region"));
audition_button.unset_flags (Gtk::CAN_FOCUS);
audition_button.unset_flags (Gtk::CAN_FOCUS);
@@
-121,38
+122,38
@@
RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
Gtk::HBox* nb = Gtk::manage (new Gtk::HBox);
nb->set_spacing (6);
nb->pack_start (name_entry);
Gtk::HBox* nb = Gtk::manage (new Gtk::HBox);
nb->set_spacing (6);
nb->pack_start (name_entry);
- nb->pack_start (audition_button);
+ nb->pack_start (audition_button
, false, false
);
_table.attach (name_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
_table.attach (name_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
- _table.attach (*nb, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+ _table.attach (*nb, 1, 2, _table_row, _table_row + 1, Gtk::FILL
| Gtk::EXPAND
, Gtk::FILL);
++_table_row;
_table.attach (position_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
++_table_row;
_table.attach (position_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
- _table.attach (position_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+ _table.attach (position_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL
| Gtk::EXPAND
, Gtk::FILL);
++_table_row;
_table.attach (end_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
++_table_row;
_table.attach (end_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
- _table.attach (end_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+ _table.attach (end_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL
| Gtk::EXPAND
, Gtk::FILL);
++_table_row;
_table.attach (length_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
++_table_row;
_table.attach (length_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
- _table.attach (length_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+ _table.attach (length_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL
| Gtk::EXPAND
, Gtk::FILL);
++_table_row;
_table.attach (sync_relative_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
++_table_row;
_table.attach (sync_relative_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
- _table.attach (sync_offset_relative_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+ _table.attach (sync_offset_relative_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL
| Gtk::EXPAND
, Gtk::FILL);
++_table_row;
_table.attach (sync_absolute_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
++_table_row;
_table.attach (sync_absolute_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
- _table.attach (sync_offset_absolute_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+ _table.attach (sync_offset_absolute_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL
| Gtk::EXPAND
, Gtk::FILL);
++_table_row;
_table.attach (start_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
++_table_row;
_table.attach (start_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
- _table.attach (start_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+ _table.attach (start_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL
| Gtk::EXPAND
, Gtk::FILL);
++_table_row;
_table.attach (_sources_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
++_table_row;
_table.attach (_sources_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
- _table.attach (_sources, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+ _table.attach (_sources, 1, 2, _table_row, _table_row + 1, Gtk::FILL
| Gtk::EXPAND
, Gtk::FILL);
++_table_row;
get_vbox()->pack_start (_table, true, true);
++_table_row;
get_vbox()->pack_start (_table, true, true);
@@
-162,7
+163,6
@@
RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
set_name ("RegionEditorWindow");
add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
set_name ("RegionEditorWindow");
add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
- signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), static_cast<Window *> (this)));
signal_response().connect (sigc::mem_fun (*this, &RegionEditor::handle_response));
set_title (string_compose (_("Region '%1'"), _region->name()));
signal_response().connect (sigc::mem_fun (*this, &RegionEditor::handle_response));
set_title (string_compose (_("Region '%1'"), _region->name()));
@@
-189,7
+189,7
@@
RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
bounds_changed (change);
bounds_changed (change);
- _region->PropertyChanged.connect (state_connection, invalidator (*this),
ui_
bind (&RegionEditor::region_changed, this, _1), gui_context());
+ _region->PropertyChanged.connect (state_connection, invalidator (*this),
boost::
bind (&RegionEditor::region_changed, this, _1), gui_context());
spin_arrow_grab = false;
spin_arrow_grab = false;
@@
-266,39
+266,47
@@
RegionEditor::connect_editor_events ()
audition_button.signal_toggled().connect (sigc::mem_fun(*this, &RegionEditor::audition_button_toggled));
audition_button.signal_toggled().connect (sigc::mem_fun(*this, &RegionEditor::audition_button_toggled));
- _session->AuditionActive.connect (audition_connection, invalidator (*this),
ui_
bind (&RegionEditor::audition_state_changed, this, _1), gui_context());
+ _session->AuditionActive.connect (audition_connection, invalidator (*this),
boost::
bind (&RegionEditor::audition_state_changed, this, _1), gui_context());
}
void
RegionEditor::position_clock_changed ()
{
}
void
RegionEditor::position_clock_changed ()
{
- _session->begin_reversible_command (_("change region start position"));
-
+ bool in_command = false;
boost::shared_ptr<Playlist> pl = _region->playlist();
if (pl) {
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));
}
_region->clear_changes ();
_region->set_position (position_clock.current_time());
_session->add_command(new StatefulDiffCommand (_region));
}
- _session->commit_reversible_command ();
+ if (in_command) {
+ PublicEditor::instance().commit_reversible_command ();
+ }
}
void
RegionEditor::end_clock_changed ()
{
}
void
RegionEditor::end_clock_changed ()
{
- _session->begin_reversible_command (_("change region end position"));
-
+ bool in_command = false;
boost::shared_ptr<Playlist> pl = _region->playlist();
if (pl) {
boost::shared_ptr<Playlist> pl = _region->playlist();
if (pl) {
+ 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));
}
_region->clear_changes ();
_region->trim_end (end_clock.current_time());
_session->add_command(new StatefulDiffCommand (_region));
}
- _session->commit_reversible_command ();
+ if (in_command) {
+ PublicEditor::instance().commit_reversible_command ();
+ }
end_clock.set (_region->position() + _region->length() - 1, true);
}
end_clock.set (_region->position() + _region->length() - 1, true);
}
@@
-307,18
+315,21
@@
void
RegionEditor::length_clock_changed ()
{
framecnt_t frames = length_clock.current_time();
RegionEditor::length_clock_changed ()
{
framecnt_t frames = length_clock.current_time();
-
- _session->begin_reversible_command (_("change region length"));
-
+ bool in_command = false;
boost::shared_ptr<Playlist> pl = _region->playlist();
if (pl) {
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));
}
_region->trim_end (_region->position() + frames - 1);
_session->add_command(new StatefulDiffCommand (_region));
}
- _session->commit_reversible_command ();
+ if (in_command) {
+ PublicEditor::instance().commit_reversible_command ();
+ }
length_clock.set (_region->length());
}
length_clock.set (_region->length());
}
@@
-402,25
+413,25
@@
RegionEditor::audition_state_changed (bool yn)
void
RegionEditor::sync_offset_absolute_clock_changed ()
{
void
RegionEditor::sync_offset_absolute_clock_changed ()
{
-
_session->
begin_reversible_command (_("change region sync point"));
+
PublicEditor::instance().
begin_reversible_command (_("change region sync point"));
_region->clear_changes ();
_region->set_sync_position (sync_offset_absolute_clock.current_time());
_session->add_command (new StatefulDiffCommand (_region));
_region->clear_changes ();
_region->set_sync_position (sync_offset_absolute_clock.current_time());
_session->add_command (new StatefulDiffCommand (_region));
-
_session->
commit_reversible_command ();
+
PublicEditor::instance().
commit_reversible_command ();
}
void
RegionEditor::sync_offset_relative_clock_changed ()
{
}
void
RegionEditor::sync_offset_relative_clock_changed ()
{
-
_session->
begin_reversible_command (_("change region sync point"));
+
PublicEditor::instance().
begin_reversible_command (_("change region sync point"));
_region->clear_changes ();
_region->set_sync_position (sync_offset_relative_clock.current_time() + _region->position ());
_session->add_command (new StatefulDiffCommand (_region));
_region->clear_changes ();
_region->set_sync_position (sync_offset_relative_clock.current_time() + _region->position ());
_session->add_command (new StatefulDiffCommand (_region));
-
_session->
commit_reversible_command ();
+
PublicEditor::instance().
commit_reversible_command ();
}
bool
}
bool