#include "keyboard.h"
using namespace std;
-using namespace sigc;
using namespace ARDOUR;
+using Gtkmm2ext::Keyboard;
/** Construct an EditorSummary.
* @param e Editor to represent.
*/
EditorSummary::EditorSummary (Editor* e)
: EditorComponent (e),
+ _start (0),
+ _end (1),
+ _overhang_fraction (0.1),
_x_scale (1),
_y_scale (1),
_last_playhead (-1),
_zoom_dragging (false)
{
-
+ Region::RegionPropertyChanged.connect (region_property_connection, boost::bind (&CairoWidget::set_dirty, this), gui_context());
+ _editor->playhead_cursor->PositionChanged.connect (position_connection, ui_bind (&EditorSummary::playhead_position_changed, this, _1), gui_context());
}
/** Connect to a session.
* @param s Session.
*/
void
-EditorSummary::connect_to_session (Session* s)
+EditorSummary::set_session (Session* s)
{
- EditorComponent::connect_to_session (s);
-
- Region::RegionPropertyChanged.connect (sigc::hide (mem_fun (*this, &EditorSummary::set_dirty)));
-
- _session_connections.push_back (_session->RegionRemoved.connect (sigc::hide (mem_fun (*this, &EditorSummary::set_dirty))));
- _session_connections.push_back (_session->EndTimeChanged.connect (mem_fun (*this, &EditorSummary::set_dirty)));
- _session_connections.push_back (_session->StartTimeChanged.connect (mem_fun (*this, &EditorSummary::set_dirty)));
- _editor->playhead_cursor->PositionChanged.connect (mem_fun (*this, &EditorSummary::playhead_position_changed));
+ EditorComponent::set_session (s);
set_dirty ();
+
+ if (_session) {
+ _session->RegionRemoved.connect (_session_connections, boost::bind (&EditorSummary::set_dirty, this), gui_context());
+ _session->StartTimeChanged.connect (_session_connections, boost::bind (&EditorSummary::set_dirty, this), gui_context());
+ _session->EndTimeChanged.connect (_session_connections, boost::bind (&EditorSummary::set_dirty, this), gui_context());
+ }
}
/** Handle an expose event.
/* XXX: colour should be set from configuration file */
cairo_set_source_rgba (cr, 1, 0, 0, 1);
- double const p = _editor->playhead_cursor->current_frame * _x_scale;
+ double const p = (_editor->playhead_cursor->current_frame - _start) * _x_scale;
cairo_move_to (cr, p, 0);
cairo_line_to (cr, p, _height);
cairo_stroke (cr);
return;
}
+ /* compute start and end points for the summary */
+
+ nframes_t const session_length = _session->current_end_frame() - _session->current_start_frame ();
+ double const theoretical_start = _session->current_start_frame() - session_length * _overhang_fraction;
+ _start = theoretical_start > 0 ? theoretical_start : 0;
+ _end = _session->current_end_frame() + session_length * _overhang_fraction;
+
/* compute total height of all tracks */
int h = 0;
int max_height = 0;
- for (PublicEditor::TrackViewList::const_iterator i = _editor->track_views.begin(); i != _editor->track_views.end(); ++i) {
+ for (TrackViewList::const_iterator i = _editor->track_views.begin(); i != _editor->track_views.end(); ++i) {
int const t = (*i)->effective_height ();
h += t;
max_height = max (max_height, t);
}
- nframes_t const start = _session->current_start_frame ();
- _x_scale = static_cast<double> (_width) / (_session->current_end_frame() - start);
+ _x_scale = static_cast<double> (_width) / (_end - _start);
_y_scale = static_cast<double> (_height) / h;
/* tallest a region should ever be in the summary, in pixels */
- int const tallest_region_pixels = 4;
+ int const tallest_region_pixels = _height / 16;
if (max_height * _y_scale > tallest_region_pixels) {
_y_scale = static_cast<double> (tallest_region_pixels) / max_height;
-
}
/* render regions */
double y = 0;
- for (PublicEditor::TrackViewList::const_iterator i = _editor->track_views.begin(); i != _editor->track_views.end(); ++i) {
+ for (TrackViewList::const_iterator i = _editor->track_views.begin(); i != _editor->track_views.end(); ++i) {
StreamView* s = (*i)->view ();
if (s) {
double const h = (*i)->effective_height () * _y_scale;
cairo_set_line_width (cr, h);
- s->foreach_regionview (bind (
- mem_fun (*this, &EditorSummary::render_region),
+ s->foreach_regionview (sigc::bind (
+ sigc::mem_fun (*this, &EditorSummary::render_region),
cr,
- start,
y + h / 2
));
y += h;
}
}
+ /* start and end markers */
+
+ cairo_set_line_width (cr, 1);
+ cairo_set_source_rgb (cr, 1, 1, 0);
+
+ double const p = (_session->current_start_frame() - _start) * _x_scale;
+ cairo_move_to (cr, p, 0);
+ cairo_line_to (cr, p, _height);
+ cairo_stroke (cr);
+
+ double const q = (_session->current_end_frame() - _start) * _x_scale;
+ cairo_move_to (cr, q, 0);
+ cairo_line_to (cr, q, _height);
+ cairo_stroke (cr);
}
/** Render a region for the summary.
* @param r Region view.
* @param cr Cairo context.
- * @param start Frame offset that the summary starts at.
* @param y y coordinate to render at.
*/
void
-EditorSummary::render_region (RegionView* r, cairo_t* cr, nframes_t start, double y) const
+EditorSummary::render_region (RegionView* r, cairo_t* cr, double y) const
{
uint32_t const c = r->get_fill_color ();
cairo_set_source_rgb (cr, UINT_RGBA_R (c) / 255.0, UINT_RGBA_G (c) / 255.0, UINT_RGBA_B (c) / 255.0);
- cairo_move_to (cr, (r->region()->position() - start) * _x_scale, y);
- cairo_line_to (cr, ((r->region()->position() - start + r->region()->length())) * _x_scale, y);
+ if (r->region()->position() > _start) {
+ cairo_move_to (cr, (r->region()->position() - _start) * _x_scale, y);
+ } else {
+ cairo_move_to (cr, 0, y);
+ }
+
+ if ((r->region()->position() + r->region()->length()) > _start) {
+ cairo_line_to (cr, ((r->region()->position() - _start + r->region()->length())) * _x_scale, y);
+ } else {
+ cairo_line_to (cr, 0, y);
+ }
+
cairo_stroke (cr);
}
void
EditorSummary::set_overlays_dirty ()
{
- ENSURE_GUI_THREAD (mem_fun (*this, &EditorSummary::set_overlays_dirty));
+ ENSURE_GUI_THREAD (*this, &EditorSummary::set_overlays_dirty)
queue_draw ();
}
_start_mouse_x = ev->x;
_start_mouse_y = ev->y;
+ if (
+ _start_editor_x.first <= _start_mouse_x && _start_mouse_x <= _start_editor_x.second &&
+ _start_editor_y.first <= _start_mouse_y && _start_mouse_y <= _start_editor_y.second
+ ) {
+
+ _start_position = IN_VIEWBOX;
+
+ } else if (_start_editor_x.first <= _start_mouse_x && _start_mouse_x <= _start_editor_x.second) {
+
+ _start_position = BELOW_OR_ABOVE_VIEWBOX;
+
+ } else {
+
+ _start_position = TO_LEFT_OR_RIGHT_OF_VIEWBOX;
+ }
+
if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
/* primary-modifier-click: start a zoom drag */
/* secondary-modifier-click: locate playhead */
if (_session) {
- _session->request_locate (ev->x / _x_scale + _session->current_start_frame());
+ _session->request_locate (ev->x / _x_scale + _start);
}
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
void
EditorSummary::get_editor (pair<double, double>* x, pair<double, double>* y) const
{
- x->first = (_editor->leftmost_position () - _session->current_start_frame ()) * _x_scale;
+ x->first = (_editor->leftmost_position () - _start) * _x_scale;
x->second = x->first + _editor->current_page_frames() * _x_scale;
y->first = _editor->vertical_adjustment.get_value() * _y_scale;
- y->second = y->first + _editor->canvas_height () * _y_scale;
+ y->second = y->first + (_editor->canvas_height () - _editor->get_canvas_timebars_vsize()) * _y_scale;
}
bool
_moved = true;
- xr.first += ev->x - _start_mouse_x;
- xr.second += ev->x - _start_mouse_x;
- yr.first += ev->y - _start_mouse_y;
- yr.second += ev->y - _start_mouse_y;
+ /* don't alter x if we clicked outside and above or below the viewbox */
+ if (_start_position == IN_VIEWBOX || _start_position == TO_LEFT_OR_RIGHT_OF_VIEWBOX) {
+ xr.first += ev->x - _start_mouse_x;
+ xr.second += ev->x - _start_mouse_x;
+ }
+
+ /* don't alter y if we clicked outside and to the left or right of the viewbox */
+ if (_start_position == IN_VIEWBOX || _start_position == BELOW_OR_ABOVE_VIEWBOX) {
+ yr.first += ev->y - _start_mouse_y;
+ yr.second += ev->y - _start_mouse_y;
+ }
+
+ if (xr.first < 0) {
+ xr.second -= xr.first;
+ xr.first = 0;
+ }
+
+ if (yr.first < 0) {
+ yr.second -= yr.first;
+ yr.first = 0;
+ }
set_editor (xr, yr);
pair<double, double> yr;
get_editor (&xr, &yr);
- double const amount = 8;
+ double amount = 8;
+
+ if (Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier)) {
+ amount = 64;
+ } else if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
+ amount = 1;
+ }
if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+ /* primary-wheel == left-right scrolling */
+
if (ev->direction == GDK_SCROLL_UP) {
xr.first += amount;
xr.second += amount;
- } else {
+ } else if (ev->direction == GDK_SCROLL_DOWN) {
xr.first -= amount;
xr.second -= amount;
}
if (ev->direction == GDK_SCROLL_DOWN) {
yr.first += amount;
yr.second += amount;
- } else {
+ } else if (ev->direction == GDK_SCROLL_UP) {
yr.first -= amount;
yr.second -= amount;
+ } else if (ev->direction == GDK_SCROLL_LEFT) {
+ xr.first -= amount;
+ xr.second -= amount;
+ } else if (ev->direction == GDK_SCROLL_RIGHT) {
+ xr.first += amount;
+ xr.second += amount;
}
-
}
set_editor (xr, yr);
is merely pending but not executing. But c'est la vie.
*/
- _editor->reset_x_origin (x.first / _x_scale);
- _editor->reset_y_origin (y.first / _y_scale);
+ /* proposed bottom of the editor with the requested position */
+ double const pb = y.second / _y_scale;
+
+ /* bottom of the canvas */
+ double const ch = _editor->full_canvas_height - _editor->canvas_timebars_vsize;
+
+ /* requested y position */
+ double ly = y.first / _y_scale;
+
+ /* clamp y position so as not to go off the bottom */
+ if (pb > ch) {
+ ly -= (pb - ch);
+ }
+
+ if (ly < 0) {
+ ly = 0;
+ }
+
+ _editor->reset_x_origin (x.first / _x_scale + _start);
+ _editor->reset_y_origin (ly);
double const nx = (
((x.second - x.first) / _x_scale) /
void
EditorSummary::playhead_position_changed (nframes64_t p)
{
- if (int (p * _x_scale) != int (_last_playhead)) {
+ if (_session && int (p * _x_scale) != int (_last_playhead)) {
set_overlays_dirty ();
}
}
projects / ardour.git / blobdiff