summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/editor.cc7
-rw-r--r--gtk2_ardour/editor.h2
-rw-r--r--gtk2_ardour/editor_canvas.cc134
-rw-r--r--gtk2_ardour/editor_cursors.cc8
-rw-r--r--gtk2_ardour/editor_mixer.cc2
5 files changed, 59 insertions, 94 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index b841efb542..ce1f90f789 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -338,7 +338,6 @@ Editor::Editor ()
last_canvas_frame = 0;
playhead_cursor = 0;
button_release_can_deselect = true;
- canvas_idle_queued = false;
_dragging_playhead = false;
_dragging_edit_point = false;
_dragging_hscrollbar = false;
@@ -1219,6 +1218,8 @@ Editor::connect_to_session (Session *t)
nudge_clock.set_session (session);
nudge_clock.set (session->frame_rate() * 5); // default of 5 seconds
+ playhead_cursor->canvas_item.show ();
+
if (rhythm_ferret) {
rhythm_ferret->set_session (session);
}
@@ -4050,8 +4051,6 @@ Editor::session_state_saved (string snap_name)
void
Editor::maximise_editing_space ()
{
- initial_ruler_update_required = true;
-
mouse_mode_tearoff->set_visible (false);
tools_tearoff->set_visible (false);
@@ -4075,8 +4074,6 @@ Editor::maximise_editing_space ()
void
Editor::restore_editing_space ()
{
- initial_ruler_update_required = true;
-
// user changed width of pane during fullscreen
if(post_maximal_pane_position != edit_pane.get_position()) {
post_maximal_pane_position = edit_pane.get_position();
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 0cffd0ad32..f58602b266 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -251,7 +251,6 @@ class Editor : public PublicEditor
void set_show_measures (bool yn);
bool show_measures () const { return _show_measures; }
- bool initial_ruler_update_required;
#ifdef FFT_ANALYSIS
/* analysis window */
@@ -1419,7 +1418,6 @@ public:
bool track_canvas_motion_notify_event (GdkEventMotion* event);
Gtk::Allocation canvas_allocation;
- bool canvas_idle_queued;
void track_canvas_allocate (Gtk::Allocation alloc);
bool track_canvas_size_allocated ();
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index ef16b42435..21f06dc177 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -101,33 +101,6 @@ Editor::initialize_canvas ()
track_canvas->set_center_scroll_region (false);
track_canvas->set_dither (Gdk::RGB_DITHER_NONE);
- /* need to handle 4 specific types of events as catch-alls */
-
- track_canvas->signal_scroll_event().connect (mem_fun (*this, &Editor::track_canvas_scroll_event));
- track_canvas->signal_motion_notify_event().connect (mem_fun (*this, &Editor::track_canvas_motion_notify_event));
- track_canvas->signal_button_press_event().connect (mem_fun (*this, &Editor::track_canvas_button_press_event));
- track_canvas->signal_button_release_event().connect (mem_fun (*this, &Editor::track_canvas_button_release_event));
-
- track_canvas->set_name ("EditorMainCanvas");
- track_canvas->add_events (Gdk::POINTER_MOTION_HINT_MASK|Gdk::SCROLL_MASK);
- track_canvas->signal_leave_notify_event().connect (mem_fun(*this, &Editor::left_track_canvas));
- track_canvas->signal_enter_notify_event().connect (mem_fun(*this, &Editor::entered_track_canvas));
- track_canvas->set_flags (CAN_FOCUS);
-
- /* set up drag-n-drop */
-
- vector<TargetEntry> target_table;
-
- // Drag-N-Drop from the region list can generate this target
- target_table.push_back (TargetEntry ("regions"));
-
- target_table.push_back (TargetEntry ("text/plain"));
- target_table.push_back (TargetEntry ("text/uri-list"));
- target_table.push_back (TargetEntry ("application/x-rootwin-drop"));
-
- track_canvas->drag_dest_set (target_table);
- track_canvas->signal_drag_data_received().connect (mem_fun(*this, &Editor::track_canvas_drag_data_received));
-
/* stuff for the verbose canvas cursor */
Pango::FontDescription* font = get_font_for_style (N_("VerboseCanvasCursor"));
@@ -161,32 +134,32 @@ Editor::initialize_canvas ()
_region_motion_group = new ArdourCanvas::Group (*_master_group);
meter_bar_group = new ArdourCanvas::Group (*track_canvas->root());
- meter_bar = new ArdourCanvas::SimpleRect (*meter_bar_group, 0.0, 0.0, 100, timebar_height);
+ meter_bar = new ArdourCanvas::SimpleRect (*meter_bar_group, 0.0, 0.0, DBL_MAX, timebar_height);
meter_bar->property_outline_what() = (0x1 | 0x8);
meter_bar->property_outline_pixels() = 0;
tempo_bar_group = new ArdourCanvas::Group (*track_canvas->root());
- tempo_bar = new ArdourCanvas::SimpleRect (*tempo_bar_group, 0.0, 0.0, 100, (timebar_height));
+ tempo_bar = new ArdourCanvas::SimpleRect (*tempo_bar_group, 0.0, 0.0, DBL_MAX, (timebar_height));
tempo_bar->property_outline_what() = (0x1 | 0x8);
tempo_bar->property_outline_pixels() = 0;
range_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root());
- range_marker_bar = new ArdourCanvas::SimpleRect (*range_marker_bar_group, 0.0, 0.0, 100, (timebar_height));
+ range_marker_bar = new ArdourCanvas::SimpleRect (*range_marker_bar_group, 0.0, 0.0, DBL_MAX, (timebar_height));
range_marker_bar->property_outline_what() = (0x1 | 0x8);
range_marker_bar->property_outline_pixels() = 0;
transport_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root());
- transport_marker_bar = new ArdourCanvas::SimpleRect (*transport_marker_bar_group, 0.0, 0.0, 100, (timebar_height));
+ transport_marker_bar = new ArdourCanvas::SimpleRect (*transport_marker_bar_group, 0.0, 0.0, DBL_MAX, (timebar_height));
transport_marker_bar->property_outline_what() = (0x1 | 0x8);
transport_marker_bar->property_outline_pixels() = 0;
marker_bar_group = new ArdourCanvas::Group (*track_canvas->root());
- marker_bar = new ArdourCanvas::SimpleRect (*marker_bar_group, 0.0, 0.0, 100, (timebar_height));
+ marker_bar = new ArdourCanvas::SimpleRect (*marker_bar_group, 0.0, 0.0, DBL_MAX, (timebar_height));
marker_bar->property_outline_what() = (0x1 | 0x8);
marker_bar->property_outline_pixels() = 0;
cd_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root());
- cd_marker_bar = new ArdourCanvas::SimpleRect (*cd_marker_bar_group, 0.0, 0.0, 100, (timebar_height));
+ cd_marker_bar = new ArdourCanvas::SimpleRect (*cd_marker_bar_group, 0.0, 0.0, DBL_MAX, (timebar_height));
cd_marker_bar->property_outline_what() = (0x1 | 0x8);
cd_marker_bar->property_outline_pixels() = 0;
@@ -273,12 +246,37 @@ Editor::initialize_canvas ()
playhead_cursor = new Cursor (*this, &Editor::canvas_playhead_cursor_event);
- initial_ruler_update_required = true;
- track_canvas->signal_size_allocate().connect (mem_fun(*this, &Editor::track_canvas_allocate));
-
if (logo_item) {
logo_item->lower_to_bottom ();
}
+ /* need to handle 4 specific types of events as catch-alls */
+
+ track_canvas->signal_scroll_event().connect (mem_fun (*this, &Editor::track_canvas_scroll_event));
+ track_canvas->signal_motion_notify_event().connect (mem_fun (*this, &Editor::track_canvas_motion_notify_event));
+ track_canvas->signal_button_press_event().connect (mem_fun (*this, &Editor::track_canvas_button_press_event));
+ track_canvas->signal_button_release_event().connect (mem_fun (*this, &Editor::track_canvas_button_release_event));
+
+ track_canvas->set_name ("EditorMainCanvas");
+ track_canvas->add_events (Gdk::POINTER_MOTION_HINT_MASK|Gdk::SCROLL_MASK);
+ track_canvas->signal_leave_notify_event().connect (mem_fun(*this, &Editor::left_track_canvas));
+ track_canvas->signal_enter_notify_event().connect (mem_fun(*this, &Editor::entered_track_canvas));
+ track_canvas->set_flags (CAN_FOCUS);
+
+ /* set up drag-n-drop */
+
+ vector<TargetEntry> target_table;
+
+ // Drag-N-Drop from the region list can generate this target
+ target_table.push_back (TargetEntry ("regions"));
+
+ target_table.push_back (TargetEntry ("text/plain"));
+ target_table.push_back (TargetEntry ("text/uri-list"));
+ target_table.push_back (TargetEntry ("application/x-rootwin-drop"));
+
+ track_canvas->drag_dest_set (target_table);
+ track_canvas->signal_drag_data_received().connect (mem_fun(*this, &Editor::track_canvas_drag_data_received));
+
+ track_canvas->signal_size_allocate().connect (mem_fun(*this, &Editor::track_canvas_allocate));
ColorsChanged.connect (mem_fun (*this, &Editor::color_handler));
color_handler();
@@ -289,26 +287,13 @@ void
Editor::track_canvas_allocate (Gtk::Allocation alloc)
{
canvas_allocation = alloc;
-
- if (!initial_ruler_update_required) {
- if (!canvas_idle_queued) {
- /* call this first so that we do stuff before any pending redraw */
- Glib::signal_idle().connect (mem_fun (*this, &Editor::track_canvas_size_allocated), false);
- canvas_idle_queued = true;
- }
- return;
- }
-
- initial_ruler_update_required = false;
track_canvas_size_allocated ();
}
bool
Editor::track_canvas_size_allocated ()
{
- if (canvas_idle_queued) {
- canvas_idle_queued = false;
- }
+ bool height_changed = canvas_height != canvas_allocation.get_height();
canvas_width = canvas_allocation.get_width();
canvas_height = canvas_allocation.get_height();
@@ -328,42 +313,31 @@ Editor::track_canvas_size_allocated ()
full_canvas_height = height + canvas_timebars_vsize;
}
- zoom_range_clock.set ((nframes64_t) floor ((canvas_width * frames_per_unit)));
- playhead_cursor->set_position (playhead_cursor->current_frame);
+ if (height_changed) {
+ if (playhead_cursor) {
+ playhead_cursor->set_length (canvas_height);
+ }
+
+ for (MarkerSelection::iterator x = selection->markers.begin(); x != selection->markers.end(); ++x) {
+ (*x)->set_line_vpos (0, canvas_height);
+ }
+
+ // marker_drag_line_points.back().set_y(canvas_height);
+ range_marker_drag_rect->property_y2() = canvas_height;
+ transport_loop_range_rect->property_y2() = canvas_height;
+ transport_punch_range_rect->property_y2() = canvas_height;
+ transport_punchin_line->property_y2() = canvas_height;
+ transport_punchout_line->property_y2() = canvas_height;
+ vertical_adjustment.set_page_size (canvas_height);
+ }
+
+ redisplay_tempo (false);
horizontal_adjustment.set_upper (session->current_end_frame()/frames_per_unit);
horizontal_adjustment.set_page_size (current_page_frames()/frames_per_unit);
-
reset_hscrollbar_stepping ();
- if (playhead_cursor) {
- playhead_cursor->set_length (canvas_height);
- }
-
- vertical_adjustment.set_page_size (canvas_height);
-
- for (MarkerSelection::iterator x = selection->markers.begin(); x != selection->markers.end(); ++x) {
- (*x)->set_line_vpos (0, canvas_height);
- }
-
- marker_drag_line_points.back().set_y(canvas_height);
- range_marker_drag_rect->property_y2() = canvas_height;
- transport_loop_range_rect->property_y2() = canvas_height;
- transport_punch_range_rect->property_y2() = canvas_height;
- transport_punchin_line->property_y2() = canvas_height;
- transport_punchout_line->property_y2() = canvas_height;
-
- /* a future (larger) allocation will look less ugly if we add extra width */
- double canvas_width_fudge = canvas_width * 1.5;
- tempo_bar->property_x2() = canvas_width_fudge;
- meter_bar->property_x2() = canvas_width_fudge;
- marker_bar->property_x2() = canvas_width_fudge;
- cd_marker_bar->property_x2() = canvas_width_fudge;
- range_marker_bar->property_x2() = canvas_width_fudge;
- transport_marker_bar->property_x2() = canvas_width_fudge;
-
update_fixed_rulers();
- redisplay_tempo (true);
Resized (); /* EMIT_SIGNAL */
diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc
index ca00ec61d2..0f5c414408 100644
--- a/gtk2_ardour/editor_cursors.cc
+++ b/gtk2_ardour/editor_cursors.cc
@@ -64,10 +64,6 @@ Editor::Cursor::set_position (nframes64_t frame)
{
double new_pos = editor.frame_to_unit (frame);
- if (editor.session == 0) {
- canvas_item.hide();
- }
- current_frame = frame;
if (new_pos != points.front().get_x()) {
points.front().set_x (new_pos);
@@ -75,6 +71,7 @@ Editor::Cursor::set_position (nframes64_t frame)
canvas_item.property_points() = points;
}
+ current_frame = frame;
}
void
@@ -83,9 +80,6 @@ Editor::Cursor::set_length (double units)
length = units;
points.back().set_y (points.front().get_y() + length);
canvas_item.property_points() = points;
- if (editor.session != 0) {
- canvas_item.show();
- }
}
void
diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index 658e1aeee6..87ad8bb6b7 100644
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -308,6 +308,8 @@ Editor::session_going_away ()
drag_info.item = 0;
last_canvas_frame = 0;
+ playhead_cursor->canvas_item.hide ();
+
/* hide all tracks */
hide_all_tracks (false);
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-27 17:58:22 +0000