N_("Seconds"),
N_("Minutes"),
N_("Beats/32"),
+ N_("Beats/28"),
+ N_("Beats/24"),
N_("Beats/16"),
+ N_("Beats/14"),
+ N_("Beats/12"),
+ N_("Beats/10"),
N_("Beats/8"),
+ N_("Beats/7"),
+ N_("Beats/6"),
+ N_("Beats/5"),
N_("Beats/4"),
N_("Beats/3"),
+ N_("Beats/2"),
N_("Beats"),
N_("Bars"),
N_("Marks"),
cerr << "size of " << what << " = " << r->width << " x " << r->height << endl;
}
+#ifdef GTKOSX
+static void
+pane_size_watcher (Paned* pane)
+{
+ /* if the handle of a pane vanishes into (at least) the tabs of a notebook,
+ it is no longer accessible. so stop that. this doesn't happen on X11,
+ just the quartz backend.
+
+ ugh.
+ */
+
+ int max_width_of_lhs = GTK_WIDGET(pane->gobj())->allocation.width - 25;
+
+ gint pos = pane->get_position ();
+
+ if (pos > max_width_of_lhs) {
+ pane->set_position (max_width_of_lhs);
+ }
+}
+#endif
+
Editor::Editor ()
: _join_object_range_state (JOIN_OBJECT_RANGE_NONE)
*/
, vertical_adjustment (0.0, 0.0, 10.0, 400.0)
- , horizontal_adjustment (0.0, 0.0, 20.0, 1200.0)
/* tool bar related */
last_autoscroll_y = 0;
autoscroll_active = false;
autoscroll_timeout_tag = -1;
- interthread_progress_window = 0;
logo_item = 0;
analysis_window = 0;
current_interthread_info = 0;
_show_measures = true;
- _show_waveforms_recording = true;
show_gain_after_trim = false;
verbose_cursor_on = true;
last_item_entered = 0;
editor_ruler_menu = 0;
no_ruler_shown_update = false;
marker_menu = 0;
- start_end_marker_menu = 0;
+ session_range_marker_menu = 0;
range_marker_menu = 0;
marker_menu_item = 0;
- tm_marker_menu = 0;
+ tempo_or_meter_marker_menu = 0;
transport_marker_menu = 0;
new_transport_marker_menu = 0;
editor_mixer_strip_width = Wide;
entered_regionview = 0;
entered_marker = 0;
clear_entered_track = false;
- _new_regionviews_show_envelope = false;
current_timefx = 0;
playhead_cursor = 0;
button_release_can_deselect = true;
selection->MarkersChanged.connect (sigc::mem_fun(*this, &Editor::marker_selection_changed));
edit_controls_vbox.set_spacing (0);
- horizontal_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &Editor::scroll_canvas_horizontally), false);
vertical_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &Editor::tie_vertical_scrolling), true);
track_canvas->signal_map_event().connect (sigc::mem_fun (*this, &Editor::track_canvas_map_handler));
nlabel = manage (new Label (_("Regions")));
nlabel->set_angle (-90);
the_notebook.append_page (_regions->widget (), *nlabel);
- nlabel = manage (new Label (_("Tracks/Busses")));
+ nlabel = manage (new Label (_("Tracks & Busses")));
nlabel->set_angle (-90);
the_notebook.append_page (_routes->widget (), *nlabel);
nlabel = manage (new Label (_("Snapshots")));
edit_pane.pack2 (the_notebook, false, true);
edit_pane.signal_size_allocate().connect (sigc::bind (sigc::mem_fun(*this, &Editor::pane_allocation_handler), static_cast<Paned*> (&edit_pane)));
-
+#ifdef GTKOSX
+ Glib::PropertyProxy<int> proxy = edit_pane.property_position();
+ proxy.signal_changed().connect (bind (sigc::ptr_fun (pane_size_watcher), static_cast<Paned*> (&edit_pane)));
+#endif
top_hbox.pack_start (toolbar_frame, false, true);
HBox *hbox = manage (new HBox);
reset_x_origin (frame);
}
-void
-Editor::handle_new_duration ()
-{
- if (!_session) {
- return;
- }
-
- ENSURE_GUI_THREAD (*this, &Editor::handle_new_duration)
- nframes64_t new_end = _session->current_end_frame() + (nframes64_t) floorf (current_page_frames() * 0.10f);
-
- horizontal_adjustment.set_upper (new_end / frames_per_unit);
- horizontal_adjustment.set_page_size (current_page_frames()/frames_per_unit);
-
- if (horizontal_adjustment.get_value() + _canvas_width > horizontal_adjustment.get_upper()) {
- horizontal_adjustment.set_value (horizontal_adjustment.get_upper() - _canvas_width);
- }
- //cerr << "Editor::handle_new_duration () called ha v:l:u:ps:lcf = " << horizontal_adjustment.get_value() << ":" << horizontal_adjustment.get_lower() << ":" << horizontal_adjustment.get_upper() << ":" << horizontal_adjustment.get_page_size() << ":" << endl;//DEBUG
-}
void
Editor::update_title ()
_session->TransportStateChange.connect (_session_connections, invalidator (*this), boost::bind (&Editor::map_transport_state, this), gui_context());
_session->PositionChanged.connect (_session_connections, invalidator (*this), ui_bind (&Editor::map_position_change, this, _1), gui_context());
_session->RouteAdded.connect (_session_connections, invalidator (*this), ui_bind (&Editor::handle_new_route, this, _1), gui_context());
- _session->DurationChanged.connect (_session_connections, invalidator (*this), boost::bind (&Editor::handle_new_duration, this), gui_context());
_session->DirtyChanged.connect (_session_connections, invalidator (*this), boost::bind (&Editor::update_title, this), gui_context());
_session->TimecodeOffsetChanged.connect (_session_connections, invalidator (*this), boost::bind (&Editor::update_just_timecode, this), gui_context());
_session->tempo_map().PropertyChanged.connect (_session_connections, invalidator (*this), ui_bind (&Editor::tempo_map_changed, this, _1), gui_context());
_session->locations()->removed.connect (_session_connections, invalidator (*this), ui_bind (&Editor::location_gone, this, _1), gui_context());
_session->locations()->changed.connect (_session_connections, invalidator (*this), boost::bind (&Editor::refresh_location_display, this), gui_context());
_session->locations()->StateChanged.connect (_session_connections, invalidator (*this), ui_bind (&Editor::refresh_location_display_s, this, _1), gui_context());
- _session->locations()->end_location()->changed.connect (_session_connections, invalidator (*this), ui_bind (&Editor::end_location_changed, this, _1), gui_context());
_session->history().Changed.connect (_session_connections, invalidator (*this), boost::bind (&Editor::history_changed, this), gui_context());
if (Profile->get_sae()) {
_session->config.map_parameters (pc);
refresh_location_display ();
- handle_new_duration ();
restore_ruler_visibility ();
//tempo_map_changed (PropertyChange (0));
break;
case StreamItem:
- if (clicked_routeview->get_diskstream()) {
+ if (clicked_routeview->track()) {
build_menu_function = &Editor::build_track_context_menu;
} else {
build_menu_function = &Editor::build_track_bus_context_menu;
ActionManager::set_sensitive (ActionManager::edit_point_in_region_sensitive_actions, false);
}
}
- /*
if (region_edit_menu_split_multichannel_item) {
- if (clicked_regionview && clicked_regionview->region().n_channels() > 1) {
- // GTK2FIX find the action, change its sensitivity
- // region_edit_menu_split_multichannel_item->set_sensitive (true);
+ if (clicked_regionview && clicked_regionview->region()->n_channels() > 1) {
+ region_edit_menu_split_multichannel_item->set_sensitive (true);
} else {
- // GTK2FIX see above
- // region_edit_menu_split_multichannel_item->set_sensitive (false);
+ region_edit_menu_split_multichannel_item->set_sensitive (false);
}
- }*/
+ }
}
break;
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (clicked_axisview);
if (rtv) {
- boost::shared_ptr<Diskstream> ds;
+ boost::shared_ptr<Track> tr;
boost::shared_ptr<Playlist> pl;
- if ((ds = rtv->get_diskstream()) && ((pl = ds->playlist()))) {
- Playlist::RegionList* regions = pl->regions_at ((nframes64_t) floor ( (double)frame * ds->speed()));
+ if ((tr = rtv->track()) && ((pl = tr->playlist()))) {
+ Playlist::RegionList* regions = pl->regions_at ((nframes64_t) floor ( (double)frame * tr->speed()));
if (selection->regions.size() > 1) {
// there's already a multiple selection: just add a
boost::shared_ptr<Region> dummy_region; // = NULL
add_region_context_items (rtv->view(), dummy_region, edit_items);
} else {
- for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
+ for (Playlist::RegionList::reverse_iterator i = regions->rbegin(); i != regions->rend(); ++i) {
add_region_context_items (rtv->view(), (*i), edit_items);
}
}
AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*> (clicked_axisview);
if (atv) {
- boost::shared_ptr<Diskstream> ds;
+ boost::shared_ptr<Track> tr;
boost::shared_ptr<Playlist> pl;
boost::shared_ptr<AudioPlaylist> apl;
- if ((
ds = atv->get_diskstream()) && ((pl = ds->playlist()) != 0) && ((apl = boost::dynamic_pointer_cast<AudioPlaylist> (pl)) != 0)) {
+ if ((
tr = atv->track()) && ((pl = tr->playlist()) != 0) && ((apl = boost::dynamic_pointer_cast<AudioPlaylist> (pl)) != 0)) {
Playlist::RegionList* regions = pl->regions_at (frame);
AudioPlaylist::Crossfades xfades;
boost::shared_ptr<Region> dummy_region; // = NULL
add_region_context_items (atv->audio_view(), dummy_region, edit_items);
} else {
- for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
+ for (Playlist::RegionList::reverse_iterator i = regions->rbegin(); i != regions->rend(); ++i) {
add_region_context_items (atv->audio_view(), (*i), edit_items);
}
}
sigc::bind (sigc::mem_fun(*this, &Editor::set_selected_regionview_from_map_event), sv, boost::weak_ptr<Region>(region)));
items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &Editor::rename_region)));
- if (mr && internal_editing()) {
- items.push_back (MenuElem (_("List editor..."), sigc::mem_fun(*this, &Editor::show_midi_list_editor)));
- } else {
- items.push_back (MenuElem (_("Region Properties..."), sigc::mem_fun(*this, &Editor::edit_region)));
+ if (mr) {
+ items.push_back (MenuElem (_("List Editor..."), sigc::mem_fun(*this, &Editor::show_midi_list_editor)));
}
+ items.push_back (MenuElem (_("Region Properties..."), sigc::mem_fun(*this, &Editor::edit_region)));
}
items.push_back (MenuElem (_("Raise to Top Layer"), sigc::mem_fun(*this, &Editor::raise_region_to_top)));
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Audition"), sigc::mem_fun(*this, &Editor::play_selected_region)));
- items.push_back (MenuElem (_("Export"), sigc::mem_fun(*this, &Editor::export_region)));
+ items.push_back (MenuElem (_("Export..."), sigc::mem_fun(*this, &Editor::export_region)));
items.push_back (MenuElem (_("Bounce"), sigc::mem_fun(*this, &Editor::bounce_region_selection)));
if (ar) {
- items.push_back (MenuElem (_("Spectral Analysis"), sigc::mem_fun(*this, &Editor::analyze_region_selection)));
+ items.push_back (MenuElem (_("Spectral Analysis..."), sigc::mem_fun(*this, &Editor::analyze_region_selection)));
}
items.push_back (SeparatorElem());
break;
}
- bbt_glue_item->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &Editor::set_region_lock_style), Region::MusicTime));
+ bbt_glue_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_region_lock_style));
items.push_back (CheckMenuElem (_("Mute")));
CheckMenuItem* region_mute_item = static_cast<CheckMenuItem*>(&items.back());
fooc.block (false);
}
- items.push_back (MenuElem (_("Transpose"), mem_fun(*this, &Editor::pitch_shift_regions)));
+ items.push_back (MenuElem (_("Transpose..."), mem_fun(*this, &Editor::pitch_shift_regions)));
if (!Profile->get_sae()) {
items.push_back (CheckMenuElem (_("Opaque")));
items.push_back (SeparatorElem());
}
- items.push_back (MenuElem (_("Normalize"), sigc::mem_fun(*this, &Editor::normalize_region)));
+ items.push_back (MenuElem (_("Normalize..."), sigc::mem_fun(*this, &Editor::normalize_region)));
if (ar->scale_amplitude() != 1) {
items.push_back (MenuElem (_("Reset Gain"), sigc::mem_fun(*this, &Editor::reset_region_scale_amplitude)));
}
} else if (mr) {
items.push_back (MenuElem (_("Quantize"), sigc::mem_fun(*this, &Editor::quantize_region)));
+ items.push_back (MenuElem (_("Fork"), sigc::mem_fun(*this, &Editor::fork_region)));
items.push_back (SeparatorElem());
}
region_edit_menu_split_multichannel_item = &items.back();
items.push_back (MenuElem (_("Duplicate"), (sigc::bind (sigc::mem_fun(*this, &Editor::duplicate_dialog), false))));
- items.push_back (MenuElem (_("Multi-Duplicate"), (sigc::bind (sigc::mem_fun(*this, &Editor::duplicate_dialog), true))));
+ items.push_back (MenuElem (_("Multi-Duplicate..."), (sigc::bind (sigc::mem_fun(*this, &Editor::duplicate_dialog), true))));
items.push_back (MenuElem (_("Fill Track"), (sigc::mem_fun(*this, &Editor::region_fill_track))));
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &Editor::remove_selected_regions)));
edit_items.push_back (MenuElem (_("Consolidate Range With Processing"), sigc::bind (sigc::mem_fun(*this, &Editor::bounce_range_selection), true, true)));
edit_items.push_back (MenuElem (_("Bounce Range to Region List"), sigc::bind (sigc::mem_fun(*this, &Editor::bounce_range_selection), false, false)));
edit_items.push_back (MenuElem (_("Bounce Range to Region List With Processing"), sigc::bind (sigc::mem_fun(*this, &Editor::bounce_range_selection), false, true)));
- edit_items.push_back (MenuElem (_("Export Range"), sigc::mem_fun(*this, &Editor::export_range)));
+ edit_items.push_back (MenuElem (_("Export Range"), sigc::mem_fun(*this, &Editor::export_selection)));
}
instant_save ();
switch (_snap_type) {
- case SnapToAThirtysecondBeat:
- case SnapToASixteenthBeat:
- case SnapToAEighthBeat:
- case SnapToAQuarterBeat:
- case SnapToAThirdBeat:
+ case SnapToBeatDiv32:
+ case SnapToBeatDiv28:
+ case SnapToBeatDiv24:
+ case SnapToBeatDiv16:
+ case SnapToBeatDiv14:
+ case SnapToBeatDiv12:
+ case SnapToBeatDiv10:
+ case SnapToBeatDiv8:
+ case SnapToBeatDiv7:
+ case SnapToBeatDiv6:
+ case SnapToBeatDiv5:
+ case SnapToBeatDiv4:
+ case SnapToBeatDiv3:
+ case SnapToBeatDiv2:
compute_bbt_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames());
update_tempo_based_rulers ();
break;
default:
/* relax */
break;
- }
+ }
+
+ SnapChanged (); /* EMIT SIGNAL */
}
void
set_edit_point_preference ((EditPoint) string_2_enum (prop->value(), _edit_point), true);
}
- if ((prop = node.property ("show-waveforms-recording"))) {
- bool yn = string_is_affirmative (prop->value());
- _show_waveforms_recording = !yn;
- RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleWaveformsWhileRecording"));
- if (act) {
- RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
- /* do it twice to force the change */
- tact->set_active (!yn);
- tact->set_active (yn);
- }
- }
-
if ((prop = node.property ("show-measures"))) {
bool yn = string_is_affirmative (prop->value());
_show_measures = !yn;
}
}
+ if ((prop = node.property (X_("editor-list-page")))) {
+ the_notebook.set_current_page (atoi (prop->value ()));
+ }
+
+ if ((prop = node.property (X_("editor-pane-position")))) {
+ edit_pane.set_position (atoi (prop->value ()));
+ }
return 0;
}
snprintf (buf, sizeof (buf), "%f", vertical_adjustment.get_value ());
node->add_property ("y-origin", buf);
- node->add_property ("show-waveforms-recording", _show_waveforms_recording ? "yes" : "no");
node->add_property ("show-measures", _show_measures ? "yes" : "no");
node->add_property ("follow-playhead", _follow_playhead ? "yes" : "no");
node->add_property ("stationary-playhead", _stationary_playhead ? "yes" : "no");
node->add_property (X_("show-editor-list"), tact->get_active() ? "yes" : "no");
}
+ snprintf (buf, sizeof (buf), "%d", the_notebook.get_current_page ());
+ node->add_property (X_("editor-list-page"), buf);
+
+ snprintf (buf, sizeof (buf), "%d", edit_pane.get_position ());
+ node->add_property (X_("editor-pane-position"), buf);
+
return *node;
}
start = _session->tempo_map().round_to_beat (start, direction);
break;
- case SnapToAThirtysecondBeat:
+ case SnapToBeatDiv32:
start = _session->tempo_map().round_to_beat_subdivision (start, 32, direction);
break;
-
- case SnapToASixteenthBeat:
+ case SnapToBeatDiv28:
+ start = _session->tempo_map().round_to_beat_subdivision (start, 28, direction);
+ break;
+ case SnapToBeatDiv24:
+ start = _session->tempo_map().round_to_beat_subdivision (start, 24, direction);
+ break;
+ case SnapToBeatDiv16:
start = _session->tempo_map().round_to_beat_subdivision (start, 16, direction);
break;
-
- case SnapToAEighthBeat:
+ case SnapToBeatDiv14:
+ start = _session->tempo_map().round_to_beat_subdivision (start, 14, direction);
+ break;
+ case SnapToBeatDiv12:
+ start = _session->tempo_map().round_to_beat_subdivision (start, 12, direction);
+ break;
+ case SnapToBeatDiv10:
+ start = _session->tempo_map().round_to_beat_subdivision (start, 10, direction);
+ break;
+ case SnapToBeatDiv8:
start = _session->tempo_map().round_to_beat_subdivision (start, 8, direction);
break;
-
- case SnapToAQuarterBeat:
+ case SnapToBeatDiv7:
+ start = _session->tempo_map().round_to_beat_subdivision (start, 7, direction);
+ break;
+ case SnapToBeatDiv6:
+ start = _session->tempo_map().round_to_beat_subdivision (start, 6, direction);
+ break;
+ case SnapToBeatDiv5:
+ start = _session->tempo_map().round_to_beat_subdivision (start, 5, direction);
+ break;
+ case SnapToBeatDiv4:
start = _session->tempo_map().round_to_beat_subdivision (start, 4, direction);
break;
-
- case SnapToAThirdBeat:
+ case SnapToBeatDiv3:
start = _session->tempo_map().round_to_beat_subdivision (start, 3, direction);
break;
+ case SnapToBeatDiv2:
+ start = _session->tempo_map().round_to_beat_subdivision (start, 2, direction);
+ break;
case SnapToMark:
if (for_mark) {
Editor::setup_tooltips ()
{
ARDOUR_UI::instance()->set_tip (mouse_move_button, _("Select/Move Objects"));
- ARDOUR_UI::instance()->set_tip (mouse_select_button, _("Select/Move Ranges"));
ARDOUR_UI::instance()->set_tip (mouse_gain_button, _("Draw Gain Automation"));
ARDOUR_UI::instance()->set_tip (mouse_zoom_button, _("Select Zoom Range"));
ARDOUR_UI::instance()->set_tip (mouse_timefx_button, _("Stretch/Shrink Regions"));
if (with_dialog) {
- ArdourDialog win ("Duplicate");
- Label label (_("Number of Duplications:"));
+ ArdourDialog win (_("Duplicate"));
+ Label label (_("Number of duplications:"));
Adjustment adjustment (1.0, 1.0, 1000000.0, 1.0, 5.0);
SpinButton spinner (adjustment, 0.0, 1);
HBox hbox;
string choice = snap_type_selector.get_active_text();
SnapType snaptype = SnapToBeat;
- if (choice == _("Beats/3")) {
- snaptype = SnapToAThirdBeat;
+ if (choice == _("Beats/2")) {
+ snaptype = SnapToBeatDiv2;
+ } else if (choice == _("Beats/3")) {
+ snaptype = SnapToBeatDiv3;
} else if (choice == _("Beats/4")) {
- snaptype = SnapToAQuarterBeat;
+ snaptype = SnapToBeatDiv4;
+ } else if (choice == _("Beats/5")) {
+ snaptype = SnapToBeatDiv5;
+ } else if (choice == _("Beats/6")) {
+ snaptype = SnapToBeatDiv6;
+ } else if (choice == _("Beats/7")) {
+ snaptype = SnapToBeatDiv7;
} else if (choice == _("Beats/8")) {
- snaptype = SnapToAEighthBeat;
+ snaptype = SnapToBeatDiv8;
+ } else if (choice == _("Beats/10")) {
+ snaptype = SnapToBeatDiv10;
+ } else if (choice == _("Beats/12")) {
+ snaptype = SnapToBeatDiv12;
+ } else if (choice == _("Beats/14")) {
+ snaptype = SnapToBeatDiv14;
} else if (choice == _("Beats/16")) {
- snaptype = SnapToASixteenthBeat;
+ snaptype = SnapToBeatDiv16;
+ } else if (choice == _("Beats/24")) {
+ snaptype = SnapToBeatDiv24;
+ } else if (choice == _("Beats/28")) {
+ snaptype = SnapToBeatDiv28;
} else if (choice == _("Beats/32")) {
- snaptype = SnapToAThirtysecondBeat;
+ snaptype = SnapToBeatDiv32;
} else if (choice == _("Beats")) {
snaptype = SnapToBeat;
} else if (choice == _("Bars")) {
return 1.0;
break;
- case SnapToAThirtysecondBeat:
+ case SnapToBeatDiv32:
return 1.0/32.0;
break;
-
- case SnapToASixteenthBeat:
+ case SnapToBeatDiv28:
+ return 1.0/28.0;
+ break;
+ case SnapToBeatDiv24:
+ return 1.0/24.0;
+ break;
+ case SnapToBeatDiv16:
return 1.0/16.0;
break;
-
- case SnapToAEighthBeat:
+ case SnapToBeatDiv14:
+ return 1.0/14.0;
+ break;
+ case SnapToBeatDiv12:
+ return 1.0/12.0;
+ break;
+ case SnapToBeatDiv10:
+ return 1.0/10.0;
+ break;
+ case SnapToBeatDiv8:
return 1.0/8.0;
break;
-
- case SnapToAQuarterBeat:
+ case SnapToBeatDiv7:
+ return 1.0/7.0;
+ break;
+ case SnapToBeatDiv6:
+ return 1.0/6.0;
+ break;
+ case SnapToBeatDiv5:
+ return 1.0/5.0;
+ break;
+ case SnapToBeatDiv4:
return 1.0/4.0;
break;
-
- case SnapToAThirdBeat:
+ case SnapToBeatDiv3:
return 1.0/3.0;
break;
+ case SnapToBeatDiv2:
+ return 1.0/2.0;
+ break;
case SnapToBar:
if (_session) {
return ret;
}
-void
-Editor::end_location_changed (Location* location)
-{
- ENSURE_GUI_THREAD (*this, &Editor::end_location_changed, location)
- //reset_scrolling_region ();
- nframes64_t session_span = location->start() + (nframes64_t) floorf (current_page_frames() * 0.10f);
- horizontal_adjustment.set_upper (session_span / frames_per_unit);
-}
-
int
Editor::playlist_deletion_dialog (boost::shared_ptr<Playlist> pl)
{
- ArdourDialog dialog ("playlist deletion dialog");
+ ArdourDialog dialog (_("Playlist Deletion"));
Label label (string_compose (_("Playlist %1 is currently unused.\n"
"If left alone, no audio files used by it will be cleaned.\n"
"If deleted, audio files used by it alone by will cleaned."),
void
Editor::reposition_and_zoom (nframes64_t frame, double fpu)
{
- //cerr << "Editor::reposition_and_zoom () called ha v:l:u:ps:fpu = " << horizontal_adjustment.get_value() << ":" << horizontal_adjustment.get_lower() << ":" << horizontal_adjustment.get_upper() << ":" << horizontal_adjustment.get_page_size() << ":" << frames_per_unit << endl;//DEBUG
reset_x_origin (frame);
reset_zoom (fpu);
void
Editor::post_zoom ()
{
- nframes64_t cef = 0;
-
// convert fpu to frame count
nframes64_t frames = (nframes64_t) floor (frames_per_unit * _canvas_width);
}
}
- leftmost_frame = (nframes64_t) floor (horizontal_adjustment.get_value() * frames_per_unit);
-
ZoomChanged (); /* EMIT_SIGNAL */
- if (_session) {
- cef = _session->current_end_frame() + (current_page_frames() / 10);// Add a little extra so we can see the end marker
- }
- horizontal_adjustment.set_upper (cef / frames_per_unit);
-
//reset_scrolling_region ();
if (playhead_cursor) {
Editor::queue_visual_change (nframes64_t where)
{
pending_visual_change.add (VisualChange::TimeOrigin);
-
- /* if we're moving beyond the end, make sure the upper limit of the horizontal adjustment
- can reach.
- */
-
- if (_session && (where > _session->current_end_frame())) {
- horizontal_adjustment.set_upper ((where + current_page_frames()) / frames_per_unit);
- }
-
pending_visual_change.time_origin = where;
-
ensure_visual_change_idle_handler ();
}
VisualChange::Type p = pending_visual_change.pending;
pending_visual_change.pending = (VisualChange::Type) 0;
- double last_time_origin = horizontal_adjustment.get_value();
+ double last_time_origin = horizontal_position ();
if (p & VisualChange::ZoomLevel) {
set_frames_per_unit (pending_visual_change.frames_per_unit);
update_tempo_based_rulers ();
}
if (p & VisualChange::TimeOrigin) {
- horizontal_adjustment.set_value (pending_visual_change.time_origin / frames_per_unit);
+ set_horizontal_position (pending_visual_change.time_origin / frames_per_unit);
}
if (p & VisualChange::YOrigin) {
vertical_adjustment.set_value (pending_visual_change.y_origin);
}
- if (last_time_origin == horizontal_adjustment.get_value()) {
+ if (last_time_origin == horizontal_position ()) {
/* changed signal not emitted */
update_fixed_rulers ();
redisplay_tempo (true);
_summary->set_overlays_dirty ();
- // cerr << "Editor::idle_visual_changer () called ha v:l:u:ps:fpu = " << horizontal_adjustment.get_value() << ":" << horizontal_adjustment.get_lower() << ":" << horizontal_adjustment.get_upper() << ":" << horizontal_adjustment.get_page_size() << ":" << frames_per_unit << endl;//DEBUG
pending_visual_change.idle_handler_id = -1;
return 0; /* this is always a one-shot call */
}
for (TrackViewList::const_iterator t = tracks->begin(); t != tracks->end(); ++t) {
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(*t);
if (rtv) {
- boost::shared_ptr<Diskstream> ds;
+ boost::shared_ptr<Track> tr;
boost::shared_ptr<Playlist> pl;
- if ((ds = rtv->get_diskstream()) && ((pl = ds->playlist()))) {
+ if ((tr = rtv->track()) && ((pl = tr->playlist()))) {
Playlist::RegionList* regions = pl->regions_at (
- (nframes64_t) floor ( (double)where * ds->speed()));
+ (nframes64_t) floor ( (double)where * tr->speed()));
for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
RegionView* rv = rtv->view()->find_view (*i);
for (TrackViewList::const_iterator t = tracks->begin(); t != tracks->end(); ++t) {
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(*t);
if (rtv) {
- boost::shared_ptr<Diskstream> ds;
+ boost::shared_ptr<Track> tr;
boost::shared_ptr<Playlist> pl;
- if ((ds = rtv->get_diskstream()) && ((pl = ds->playlist()))) {
+ if ((tr = rtv->track()) && ((pl = tr->playlist()))) {
Playlist::RegionList* regions = pl->regions_touched (
- (nframes64_t) floor ( (double)where * ds->speed()), max_frames);
+ (nframes64_t) floor ( (double)where * tr->speed()), max_frames);
for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
boost::shared_ptr<Playlist> pl;
vector<boost::shared_ptr<Region> > results;
RegionView* marv;
- boost::shared_ptr<Diskstream> ds;
+ boost::shared_ptr<Track> tr;
- if ((ds = tatv->get_diskstream()) == 0) {
+ if ((tr = tatv->track()) == 0) {
/* bus */
continue;
}
- if ((pl = (ds->playlist())) != 0) {
+ if ((pl = (tr->playlist())) != 0) {
pl->get_region_list_equivalent_regions (region, results);
}
}
/* clamp */
- if (uint32_t (min_resulting) < TimeAxisView::hSmall) {
- _pending_resize_amount += TimeAxisView::hSmall - min_resulting;
+ if (uint32_t (min_resulting) < TimeAxisView::preset_height (HeightSmall)) {
+ _pending_resize_amount += TimeAxisView::preset_height (HeightSmall) - min_resulting;
}
}
}
void
-Editor::hide_track_in_display (TimeAxisView& tv, bool /*temponly*/)
+Editor::hide_track_in_display (TimeAxisView* tv, bool /*temponly*/)
{
- RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (&tv);
+ RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (tv);
if (rtv && current_mixer_strip && (rtv->route() == current_mixer_strip->route())) {
// this will hide the mixer strip
- set_selected_mixer_strip (tv);
+ set_selected_mixer_strip (*tv);
}
- _routes->hide_track_in_display (tv);
+ _routes->hide_track_in_display (*tv);
}
bool
}
void
-Editor::remove_a_region (boost::shared_ptr<Region> r)
+Editor::show_a_region (boost::shared_ptr<Region> r)
{
- // _session->remove_region_from_region_list (r);
+ r->set_hidden (false);
}
void
_regions->selection_mapover (sigc::mem_fun (*this, &Editor::hide_a_region));
}
+void
+Editor::show_region_in_region_list ()
+{
+ _regions->selection_mapover (sigc::mem_fun (*this, &Editor::show_a_region));
+}
+
void
Editor::start_step_editing ()
{
* 1. we don't update things when there's a pending locate request, otherwise
* when the editor requests a locate there is a chance that this method
* will move the playhead before the locate request is processed, causing
+ * a visual glitch.
* 2. if we're not rolling, there's nothing to do here (locates are handled elsewhere).
* 3. if we're still at the same frame that we were last time, there's nothing to do.
*/
}
current = target;
- horizontal_adjustment.set_value (current);
+ set_horizontal_position (current);
#endif
}
projects / ardour.git / blobdiff