projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use MTC instead of MIDI Timecode as the string for the external sync button. Fixes...
[ardour.git]
/
gtk2_ardour
/
crossfade_edit.cc
diff --git
a/gtk2_ardour/crossfade_edit.cc
b/gtk2_ardour/crossfade_edit.cc
index 78d3c74ab60b9efc2e89d9fc0f126af7f5769c67..0c8daafb045995826673acdb50616d103a4c61db 100644
(file)
--- a/
gtk2_ardour/crossfade_edit.cc
+++ b/
gtk2_ardour/crossfade_edit.cc
@@
-27,6
+27,7
@@
#include <libgnomecanvasmm/line.h>
#include <libgnomecanvasmm/line.h>
+#include "pbd/memento_command.h"
#include "ardour/automation_list.h"
#include "evoral/Curve.hpp"
#include "ardour/crossfade.h"
#include "ardour/automation_list.h"
#include "evoral/Curve.hpp"
#include "ardour/crossfade.h"
@@
-73,7
+74,7
@@
CrossfadeEditor::Half::Half ()
}
CrossfadeEditor::CrossfadeEditor (Session* s, boost::shared_ptr<Crossfade> xf, double my, double mxy)
}
CrossfadeEditor::CrossfadeEditor (Session* s, boost::shared_ptr<Crossfade> xf, double my, double mxy)
- : ArdourDialog (_("
ardour: x-fade edit
")),
+ : ArdourDialog (_("
Edit Crossfade
")),
xfade (xf),
clear_button (_("Clear")),
revert_button (_("Reset")),
xfade (xf),
clear_button (_("Clear")),
revert_button (_("Reset")),
@@
-100,7
+101,7
@@
CrossfadeEditor::CrossfadeEditor (Session* s, boost::shared_ptr<Crossfade> xf, d
{
set_session (s);
{
set_session (s);
- set_wmclass (X_("ardour_automationedit"),
"Ardour"
);
+ set_wmclass (X_("ardour_automationedit"),
PROGRAM_NAME
);
set_name ("CrossfadeEditWindow");
set_position (Gtk::WIN_POS_MOUSE);
set_name ("CrossfadeEditWindow");
set_position (Gtk::WIN_POS_MOUSE);
@@
-418,15
+419,16
@@
CrossfadeEditor::point_event (GdkEvent* event, Point* point)
if (point_grabbed) {
double new_x, new_y;
if (point_grabbed) {
double new_x, new_y;
- /* can't drag first or last points horizontally */
+ /* can't drag first or last points horizontally
or vertically
*/
if (point == fade[current].points.front() || point == fade[current].points.back()) {
new_x = point->x;
if (point == fade[current].points.front() || point == fade[current].points.back()) {
new_x = point->x;
+ new_y = point->y;
} else {
new_x = (event->motion.x - canvas_border)/effective_width();
} else {
new_x = (event->motion.x - canvas_border)/effective_width();
+ new_y = 1.0 - ((event->motion.y - canvas_border)/effective_height());
}
}
- new_y = 1.0 - ((event->motion.y - canvas_border)/effective_height());
point->move_to (x_coordinate (new_x), y_coordinate (new_y),
new_x, new_y);
redraw ();
point->move_to (x_coordinate (new_x), y_coordinate (new_y),
new_x, new_y);
redraw ();
@@
-502,17
+504,17
@@
CrossfadeEditor::add_control_point (double x, double y)
void
CrossfadeEditor::Point::move_to (double nx, double ny, double xfract, double yfract)
{
void
CrossfadeEditor::Point::move_to (double nx, double ny, double xfract, double yfract)
{
-
if ( xfract < 0.0 ) {
-
xfract = 0.0;
-
} else if ( xfract > 1.0 ) {
-
xfract = 1.0;
-
}
+ if ( xfract < 0.0 ) {
+ xfract = 0.0;
+ } else if ( xfract > 1.0 ) {
+ xfract = 1.0;
+ }
-
if ( yfract < 0.0 ) {
-
yfract = 0.0;
-
} else if ( yfract > 1.0 ) {
-
yfract = 1.0;
-
}
+ if ( yfract < 0.0 ) {
+ yfract = 0.0;
+ } else if ( yfract > 1.0 ) {
+ yfract = 1.0;
+ }
const double half_size = rint(size/2.0);
double x1 = nx - half_size;
const double half_size = rint(size/2.0);
double x1 = nx - half_size;
@@
-654,7
+656,7
@@
CrossfadeEditor::redraw ()
return;
}
return;
}
-
nframes
_t len = xfade->length ();
+
framecnt
_t len = xfade->length ();
fade[current].normative_curve.clear ();
fade[current].gain_curve.clear ();
fade[current].normative_curve.clear ();
fade[current].gain_curve.clear ();
@@
-783,7
+785,14
@@
CrossfadeEditor::apply_preset (Preset *preset)
void
CrossfadeEditor::apply ()
{
void
CrossfadeEditor::apply ()
{
+ _session->begin_reversible_command (_("Edit crossfade"));
+
+ XMLNode& before = xfade->get_state ();
+
_apply_to (xfade);
_apply_to (xfade);
+
+ _session->add_command (new MementoCommand<Crossfade> (*xfade.get(), &before, &xfade->get_state ()));
+ _session->commit_reversible_command ();
}
void
}
void
@@
-864,7
+873,7
@@
CrossfadeEditor::reset ()
set (xfade->fade_in(), In);
set (xfade->fade_out(), Out);
set (xfade->fade_in(), In);
set (xfade->fade_out(), Out);
-
curve_select_clicked (current);
+ curve_select_clicked (current);
}
void
}
void
@@
-1206,11
+1215,11
@@
void
CrossfadeEditor::audition (Audition which)
{
AudioPlaylist& pl (_session->the_auditioner()->prepare_playlist());
CrossfadeEditor::audition (Audition which)
{
AudioPlaylist& pl (_session->the_auditioner()->prepare_playlist());
-
nframes
_t preroll;
-
nframes
_t postroll;
-
nframes
_t left_start_offset;
-
nframes
_t right_length;
-
nframes
_t left_length;
+
framecnt
_t preroll;
+
framecnt
_t postroll;
+
framecnt
_t left_start_offset;
+
framecnt
_t right_length;
+
framecnt
_t left_length;
if (which != Right && preroll_button.get_active()) {
preroll = _session->frame_rate() * 2; //2 second hardcoded preroll for now
if (which != Right && preroll_button.get_active()) {
preroll = _session->frame_rate() * 2; //2 second hardcoded preroll for now