projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename 'libs/temporal/MSVCtimecode' to 'libs/temporal/MSVCtemporal'
[ardour.git]
/
gtk2_ardour
/
region_editor.cc
diff --git
a/gtk2_ardour/region_editor.cc
b/gtk2_ardour/region_editor.cc
index b4807508103bf4fc23fb3dff55b2bb27fee5d305..3d4181dd2bb0be6903ba7f8497bdf766111c41a1 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 <cmath>
#include <gtkmm/listviewtext.h>
+#include <gtkmm/stock.h>
#include "pbd/memento_command.h"
#include "pbd/stateful_diff_command.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"
#include "ardour/region.h"
#include "ardour/session.h"
#include "ardour/source.h"
@@
-34,7
+37,6
@@
#include "gui_thread.h"
#include "region_editor.h"
#include "public_editor.h"
#include "gui_thread.h"
#include "region_editor.h"
#include "public_editor.h"
-#include "tooltips.h"
#include "pbd/i18n.h"
#include "pbd/i18n.h"
@@
-42,7
+44,6
@@
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"))
@@
-78,7
+79,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);
- set_tooltip (audition_button, _("audition this region"));
+
ArdourWidgets::
set_tooltip (audition_button, _("audition this region"));
audition_button.unset_flags (Gtk::CAN_FOCUS);
audition_button.unset_flags (Gtk::CAN_FOCUS);
@@
-314,7
+315,7
@@
RegionEditor::end_clock_changed ()
void
RegionEditor::length_clock_changed ()
{
void
RegionEditor::length_clock_changed ()
{
-
framecnt_t fram
es = length_clock.current_time();
+
samplecnt_t sampl
es = length_clock.current_time();
bool in_command = false;
boost::shared_ptr<Playlist> pl = _region->playlist();
bool in_command = false;
boost::shared_ptr<Playlist> pl = _region->playlist();
@@
-323,7
+324,7
@@
RegionEditor::length_clock_changed ()
in_command = true;
_region->clear_changes ();
in_command = true;
_region->clear_changes ();
- _region->trim_end (_region->position() +
fram
es - 1);
+ _region->trim_end (_region->position() +
sampl
es - 1);
_session->add_command(new StatefulDiffCommand (_region));
}
_session->add_command(new StatefulDiffCommand (_region));
}
@@
-369,7
+370,7
@@
RegionEditor::bounds_changed (const PropertyChange& what_changed)
if (what_changed.contains (ARDOUR::Properties::sync_position) || what_changed.contains (ARDOUR::Properties::position)) {
int dir;
if (what_changed.contains (ARDOUR::Properties::sync_position) || what_changed.contains (ARDOUR::Properties::position)) {
int dir;
-
fram
eoffset_t off = _region->sync_offset (dir);
+
sampl
eoffset_t off = _region->sync_offset (dir);
if (dir == -1) {
off = -off;
}
if (dir == -1) {
off = -off;
}