projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vtl: use ArdourImage
[ardour.git]
/
gtk2_ardour
/
editor_ops.cc
diff --git
a/gtk2_ardour/editor_ops.cc
b/gtk2_ardour/editor_ops.cc
index 9eb0a4c2bd0eda175a0b9fe386a3eacf31102046..157a034ea51a4f9edf801ee5b6a4937c823f8b22 100644
(file)
--- a/
gtk2_ardour/editor_ops.cc
+++ b/
gtk2_ardour/editor_ops.cc
@@
-1146,7
+1146,7
@@
void
Editor::scroll_playhead (bool forward)
{
framepos_t pos = playhead_cursor->current_frame ();
Editor::scroll_playhead (bool forward)
{
framepos_t pos = playhead_cursor->current_frame ();
- framecnt_t delta = (framecnt_t) floor (current_page_
fram
es() / 0.8);
+ framecnt_t delta = (framecnt_t) floor (current_page_
sampl
es() / 0.8);
if (forward) {
if (pos == max_framepos) {
if (forward) {
if (pos == max_framepos) {
@@
-1211,7
+1211,7
@@
Editor::cursor_align (bool playhead_to_edit)
void
Editor::scroll_backward (float pages)
{
void
Editor::scroll_backward (float pages)
{
- framepos_t const one_page = (framepos_t) rint (_visible_canvas_width *
fram
es_per_pixel);
+ framepos_t const one_page = (framepos_t) rint (_visible_canvas_width *
sampl
es_per_pixel);
framepos_t const cnt = (framepos_t) floor (pages * one_page);
framepos_t frame;
framepos_t const cnt = (framepos_t) floor (pages * one_page);
framepos_t frame;
@@
-1227,7
+1227,7
@@
Editor::scroll_backward (float pages)
void
Editor::scroll_forward (float pages)
{
void
Editor::scroll_forward (float pages)
{
- framepos_t const one_page = (framepos_t) rint (_visible_canvas_width *
fram
es_per_pixel);
+ framepos_t const one_page = (framepos_t) rint (_visible_canvas_width *
sampl
es_per_pixel);
framepos_t const cnt = (framepos_t) floor (pages * one_page);
framepos_t frame;
framepos_t const cnt = (framepos_t) floor (pages * one_page);
framepos_t frame;
@@
-1331,7
+1331,7
@@
Editor::tav_zoom_smooth (bool coarser, bool force_all)
}
bool
}
bool
-Editor::clamp_
fram
es_per_pixel (double& fpp) const
+Editor::clamp_
sampl
es_per_pixel (double& fpp) const
{
bool clamped = false;
{
bool clamped = false;
@@
-1353,7
+1353,7
@@
Editor::temporal_zoom_step (bool coarser)
{
ENSURE_GUI_THREAD (*this, &Editor::temporal_zoom_step, coarser)
{
ENSURE_GUI_THREAD (*this, &Editor::temporal_zoom_step, coarser)
- double nfpp =
fram
es_per_pixel;
+ double nfpp =
sampl
es_per_pixel;
if (coarser) {
nfpp = min (9e6, nfpp * 1.61803399);
if (coarser) {
nfpp = min (9e6, nfpp * 1.61803399);
@@
-1371,7
+1371,7
@@
Editor::temporal_zoom (double fpp)
return;
}
return;
}
- framepos_t current_page = current_page_
fram
es();
+ framepos_t current_page = current_page_
sampl
es();
framepos_t current_leftmost = leftmost_frame;
framepos_t current_rightmost;
framepos_t current_center;
framepos_t current_leftmost = leftmost_frame;
framepos_t current_rightmost;
framepos_t current_center;
@@
-1383,8
+1383,8
@@
Editor::temporal_zoom (double fpp)
double nfpp;
double l;
double nfpp;
double l;
- clamp_
fram
es_per_pixel (fpp);
- if (fpp ==
fram
es_per_pixel) {
+ clamp_
sampl
es_per_pixel (fpp);
+ if (fpp ==
sampl
es_per_pixel) {
return;
}
return;
}
@@
-1660,7
+1660,7
@@
Editor::temporal_zoom_to_frame (bool coarser, framepos_t frame)
double range_before = frame - leftmost_frame;
double new_fpp;
double range_before = frame - leftmost_frame;
double new_fpp;
- new_fpp =
fram
es_per_pixel;
+ new_fpp =
sampl
es_per_pixel;
if (coarser) {
new_fpp *= 1.61803399;
if (coarser) {
new_fpp *= 1.61803399;
@@
-1670,7
+1670,7
@@
Editor::temporal_zoom_to_frame (bool coarser, framepos_t frame)
range_before /= 1.61803399;
}
range_before /= 1.61803399;
}
- if (new_fpp ==
fram
es_per_pixel) {
+ if (new_fpp ==
sampl
es_per_pixel) {
return;
}
return;
}
@@
-1964,22
+1964,19
@@
Editor::unhide_ranges ()
void
Editor::insert_region_list_drag (boost::shared_ptr<Region> region, int x, int y)
{
void
Editor::insert_region_list_drag (boost::shared_ptr<Region> region, int x, int y)
{
- double wx, wy;
double cx, cy;
framepos_t where;
RouteTimeAxisView *rtv = 0;
boost::shared_ptr<Playlist> playlist;
double cx, cy;
framepos_t where;
RouteTimeAxisView *rtv = 0;
boost::shared_ptr<Playlist> playlist;
- _track_canvas_viewport->window_to_canvas (x, y, wx, wy);
-
GdkEvent event;
event.type = GDK_BUTTON_RELEASE;
GdkEvent event;
event.type = GDK_BUTTON_RELEASE;
- event.button.x =
w
x;
- event.button.y =
w
y;
+ event.button.x = x;
+ event.button.y = y;
- where = event_frame (&event, &cx, &cy);
+ where =
window_
event_frame (&event, &cx, &cy);
- if (where < leftmost_frame || where > leftmost_frame + current_page_
fram
es()) {
+ if (where < leftmost_frame || where > leftmost_frame + current_page_
sampl
es()) {
/* clearly outside canvas area */
return;
}
/* clearly outside canvas area */
return;
}
@@
-2009,19
+2006,16
@@
Editor::insert_region_list_drag (boost::shared_ptr<Region> region, int x, int y)
void
Editor::insert_route_list_drag (boost::shared_ptr<Route> route, int x, int y)
{
void
Editor::insert_route_list_drag (boost::shared_ptr<Route> route, int x, int y)
{
- double wx, wy;
double cx, cy;
RouteTimeAxisView *dest_rtv = 0;
RouteTimeAxisView *source_rtv = 0;
double cx, cy;
RouteTimeAxisView *dest_rtv = 0;
RouteTimeAxisView *source_rtv = 0;
- _track_canvas_viewport->window_to_canvas (x, y, wx, wy);
-
GdkEvent event;
event.type = GDK_BUTTON_RELEASE;
GdkEvent event;
event.type = GDK_BUTTON_RELEASE;
- event.button.x =
w
x;
- event.button.y =
w
y;
+ event.button.x = x;
+ event.button.y = y;
- event_frame (&event, &cx, &cy);
+
window_
event_frame (&event, &cx, &cy);
std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (cy);
if (tv.first == 0) {
std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (cy);
if (tv.first == 0) {
@@
-4425,14
+4419,14
@@
Editor::reset_point_selection ()
void
Editor::center_playhead ()
{
void
Editor::center_playhead ()
{
- float const page = _visible_canvas_width *
fram
es_per_pixel;
+ float const page = _visible_canvas_width *
sampl
es_per_pixel;
center_screen_internal (playhead_cursor->current_frame (), page);
}
void
Editor::center_edit_point ()
{
center_screen_internal (playhead_cursor->current_frame (), page);
}
void
Editor::center_edit_point ()
{
- float const page = _visible_canvas_width *
fram
es_per_pixel;
+ float const page = _visible_canvas_width *
sampl
es_per_pixel;
center_screen_internal (get_preferred_edit_position(), page);
}
center_screen_internal (get_preferred_edit_position(), page);
}
@@
-5052,7
+5046,6
@@
Editor::toggle_region_lock ()
_session->commit_reversible_command ();
}
_session->commit_reversible_command ();
}
-#ifdef WITH_VIDEOTIMELINE
void
Editor::toggle_region_video_lock ()
{
void
Editor::toggle_region_video_lock ()
{
@@
-5076,8
+5069,6
@@
Editor::toggle_region_video_lock ()
_session->commit_reversible_command ();
}
_session->commit_reversible_command ();
}
-#endif
-
void
Editor::toggle_region_lock_style ()
void
Editor::toggle_region_lock_style ()