Remove some unused code, and Editor::get_prefix() which wasn't doing anything.
git-svn-id: svn://localhost/ardour2/branches/3.0@9022 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
b461bc1dc1
commit
3b84c96017
|
@ -1138,8 +1138,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
|
||||||
void snap_regions_to_grid ();
|
void snap_regions_to_grid ();
|
||||||
void close_region_gaps ();
|
void close_region_gaps ();
|
||||||
|
|
||||||
int get_prefix (float&, bool&);
|
|
||||||
|
|
||||||
void keyboard_paste ();
|
void keyboard_paste ();
|
||||||
|
|
||||||
void region_from_selection ();
|
void region_from_selection ();
|
||||||
|
@ -1222,25 +1220,15 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
|
||||||
|
|
||||||
void move_to_start ();
|
void move_to_start ();
|
||||||
void move_to_end ();
|
void move_to_end ();
|
||||||
void goto_frame ();
|
|
||||||
void center_playhead ();
|
void center_playhead ();
|
||||||
void center_edit_point ();
|
void center_edit_point ();
|
||||||
void edit_cursor_backward ();
|
|
||||||
void edit_cursor_forward ();
|
|
||||||
void playhead_forward_to_grid ();
|
void playhead_forward_to_grid ();
|
||||||
void playhead_backward_to_grid ();
|
void playhead_backward_to_grid ();
|
||||||
void playhead_backward ();
|
|
||||||
void playhead_forward ();
|
|
||||||
void scroll_playhead (bool forward);
|
void scroll_playhead (bool forward);
|
||||||
void scroll_backward (float pages=0.8f);
|
void scroll_backward (float pages=0.8f);
|
||||||
void scroll_forward (float pages=0.8f);
|
void scroll_forward (float pages=0.8f);
|
||||||
void scroll_tracks_down ();
|
void scroll_tracks_down ();
|
||||||
void scroll_tracks_up ();
|
void scroll_tracks_up ();
|
||||||
void delete_sample_forward ();
|
|
||||||
void delete_sample_backward ();
|
|
||||||
void delete_screen ();
|
|
||||||
void search_backwards ();
|
|
||||||
void search_forwards ();
|
|
||||||
void set_mark ();
|
void set_mark ();
|
||||||
void clear_markers ();
|
void clear_markers ();
|
||||||
void clear_ranges ();
|
void clear_ranges ();
|
||||||
|
|
|
@ -296,8 +296,6 @@ Editor::register_actions ()
|
||||||
ActionManager::session_sensitive_actions.push_back (act);
|
ActionManager::session_sensitive_actions.push_back (act);
|
||||||
act = ActionManager::register_action (editor_actions, "scroll-forward", _("Scroll Forward"), sigc::bind (sigc::mem_fun(*this, &Editor::scroll_forward), 0.8f));
|
act = ActionManager::register_action (editor_actions, "scroll-forward", _("Scroll Forward"), sigc::bind (sigc::mem_fun(*this, &Editor::scroll_forward), 0.8f));
|
||||||
ActionManager::session_sensitive_actions.push_back (act);
|
ActionManager::session_sensitive_actions.push_back (act);
|
||||||
act = ActionManager::register_action (editor_actions, "goto", _("goto"), sigc::mem_fun(*this, &Editor::goto_frame));
|
|
||||||
ActionManager::session_sensitive_actions.push_back (act);
|
|
||||||
act = ActionManager::register_action (editor_actions, "center-playhead", _("Center Playhead"), sigc::mem_fun(*this, &Editor::center_playhead));
|
act = ActionManager::register_action (editor_actions, "center-playhead", _("Center Playhead"), sigc::mem_fun(*this, &Editor::center_playhead));
|
||||||
ActionManager::session_sensitive_actions.push_back (act);
|
ActionManager::session_sensitive_actions.push_back (act);
|
||||||
act = ActionManager::register_action (editor_actions, "center-edit-cursor", _("Center Active Marker"), sigc::mem_fun(*this, &Editor::center_edit_point));
|
act = ActionManager::register_action (editor_actions, "center-edit-cursor", _("Center Active Marker"), sigc::mem_fun(*this, &Editor::center_edit_point));
|
||||||
|
|
|
@ -90,11 +90,3 @@ Editor::keyboard_paste ()
|
||||||
ensure_entered_track_selected (true);
|
ensure_entered_track_selected (true);
|
||||||
paste (1);
|
paste (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
|
||||||
Editor::get_prefix (float& /*val*/, bool& was_floating)
|
|
||||||
{
|
|
||||||
was_floating = false;
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
@ -1207,68 +1207,6 @@ Editor::scroll_playhead (bool forward)
|
||||||
_session->request_locate (pos);
|
_session->request_locate (pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
Editor::playhead_backward ()
|
|
||||||
{
|
|
||||||
framepos_t pos;
|
|
||||||
framepos_t cnt;
|
|
||||||
float prefix;
|
|
||||||
bool was_floating;
|
|
||||||
|
|
||||||
if (get_prefix (prefix, was_floating)) {
|
|
||||||
cnt = 1;
|
|
||||||
} else {
|
|
||||||
if (was_floating) {
|
|
||||||
cnt = (framepos_t) floor (prefix * _session->frame_rate ());
|
|
||||||
} else {
|
|
||||||
cnt = (framepos_t) prefix;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pos = playhead_cursor->current_frame;
|
|
||||||
|
|
||||||
if ((framepos_t) pos < cnt) {
|
|
||||||
pos = 0;
|
|
||||||
} else {
|
|
||||||
pos -= cnt;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* XXX this is completely insane. with the current buffering
|
|
||||||
design, we'll force a complete track buffer flush and
|
|
||||||
reload, just to move 1 sample !!!
|
|
||||||
*/
|
|
||||||
|
|
||||||
_session->request_locate (pos);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
Editor::playhead_forward ()
|
|
||||||
{
|
|
||||||
framepos_t pos;
|
|
||||||
framepos_t cnt;
|
|
||||||
bool was_floating;
|
|
||||||
float prefix;
|
|
||||||
|
|
||||||
if (get_prefix (prefix, was_floating)) {
|
|
||||||
cnt = 1;
|
|
||||||
} else {
|
|
||||||
if (was_floating) {
|
|
||||||
cnt = (framepos_t) floor (prefix * _session->frame_rate ());
|
|
||||||
} else {
|
|
||||||
cnt = (framepos_t) floor (prefix);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pos = playhead_cursor->current_frame;
|
|
||||||
|
|
||||||
/* XXX this is completely insane. with the current buffering
|
|
||||||
design, we'll force a complete track buffer flush and
|
|
||||||
reload, just to move 1 sample !!!
|
|
||||||
*/
|
|
||||||
|
|
||||||
_session->request_locate (pos+cnt);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
Editor::cursor_align (bool playhead_to_edit)
|
Editor::cursor_align (bool playhead_to_edit)
|
||||||
{
|
{
|
||||||
|
@ -1302,98 +1240,13 @@ Editor::cursor_align (bool playhead_to_edit)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
Editor::edit_cursor_backward ()
|
|
||||||
{
|
|
||||||
framepos_t pos;
|
|
||||||
framepos_t cnt;
|
|
||||||
float prefix;
|
|
||||||
bool was_floating;
|
|
||||||
|
|
||||||
if (get_prefix (prefix, was_floating)) {
|
|
||||||
cnt = 1;
|
|
||||||
} else {
|
|
||||||
if (was_floating) {
|
|
||||||
cnt = (framepos_t) floor (prefix * _session->frame_rate ());
|
|
||||||
} else {
|
|
||||||
cnt = (framepos_t) prefix;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((pos = get_preferred_edit_position()) < 0) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pos < cnt) {
|
|
||||||
pos = 0;
|
|
||||||
} else {
|
|
||||||
pos -= cnt;
|
|
||||||
}
|
|
||||||
|
|
||||||
// EDIT CURSOR edit_cursor->set_position (pos);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
Editor::edit_cursor_forward ()
|
|
||||||
{
|
|
||||||
//framepos_t pos;
|
|
||||||
framepos_t cnt;
|
|
||||||
bool was_floating;
|
|
||||||
float prefix;
|
|
||||||
|
|
||||||
if (get_prefix (prefix, was_floating)) {
|
|
||||||
cnt = 1;
|
|
||||||
} else {
|
|
||||||
if (was_floating) {
|
|
||||||
cnt = (framepos_t) floor (prefix * _session->frame_rate ());
|
|
||||||
} else {
|
|
||||||
cnt = (framepos_t) floor (prefix);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// pos = edit_cursor->current_frame;
|
|
||||||
// EDIT CURSOR edit_cursor->set_position (pos+cnt);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
Editor::goto_frame ()
|
|
||||||
{
|
|
||||||
float prefix;
|
|
||||||
bool was_floating;
|
|
||||||
framepos_t frame;
|
|
||||||
|
|
||||||
if (get_prefix (prefix, was_floating)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (was_floating) {
|
|
||||||
frame = (framepos_t) floor (prefix * _session->frame_rate());
|
|
||||||
} else {
|
|
||||||
frame = (framepos_t) floor (prefix);
|
|
||||||
}
|
|
||||||
|
|
||||||
_session->request_locate (frame);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
Editor::scroll_backward (float pages)
|
Editor::scroll_backward (float pages)
|
||||||
{
|
{
|
||||||
|
framepos_t const one_page = (framepos_t) rint (_canvas_width * frames_per_unit);
|
||||||
|
framepos_t const cnt = (framepos_t) floor (pages * one_page);
|
||||||
|
|
||||||
framepos_t frame;
|
framepos_t frame;
|
||||||
framepos_t one_page = (framepos_t) rint (_canvas_width * frames_per_unit);
|
|
||||||
bool was_floating;
|
|
||||||
float prefix;
|
|
||||||
framepos_t cnt;
|
|
||||||
|
|
||||||
if (get_prefix (prefix, was_floating)) {
|
|
||||||
cnt = (framepos_t) floor (pages * one_page);
|
|
||||||
} else {
|
|
||||||
if (was_floating) {
|
|
||||||
cnt = (framepos_t) floor (prefix * _session->frame_rate());
|
|
||||||
} else {
|
|
||||||
cnt = (framepos_t) floor (prefix * one_page);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (leftmost_frame < cnt) {
|
if (leftmost_frame < cnt) {
|
||||||
frame = 0;
|
frame = 0;
|
||||||
} else {
|
} else {
|
||||||
|
@ -1406,22 +1259,10 @@ Editor::scroll_backward (float pages)
|
||||||
void
|
void
|
||||||
Editor::scroll_forward (float pages)
|
Editor::scroll_forward (float pages)
|
||||||
{
|
{
|
||||||
|
framepos_t const one_page = (framepos_t) rint (_canvas_width * frames_per_unit);
|
||||||
|
framepos_t const cnt = (framepos_t) floor (pages * one_page);
|
||||||
|
|
||||||
framepos_t frame;
|
framepos_t frame;
|
||||||
framepos_t one_page = (framepos_t) rint (_canvas_width * frames_per_unit);
|
|
||||||
bool was_floating;
|
|
||||||
float prefix;
|
|
||||||
framepos_t cnt;
|
|
||||||
|
|
||||||
if (get_prefix (prefix, was_floating)) {
|
|
||||||
cnt = (framepos_t) floor (pages * one_page);
|
|
||||||
} else {
|
|
||||||
if (was_floating) {
|
|
||||||
cnt = (framepos_t) floor (prefix * _session->frame_rate());
|
|
||||||
} else {
|
|
||||||
cnt = (framepos_t) floor (prefix * one_page);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (max_framepos - cnt < leftmost_frame) {
|
if (max_framepos - cnt < leftmost_frame) {
|
||||||
frame = max_framepos - cnt;
|
frame = max_framepos - cnt;
|
||||||
} else {
|
} else {
|
||||||
|
@ -1434,38 +1275,18 @@ Editor::scroll_forward (float pages)
|
||||||
void
|
void
|
||||||
Editor::scroll_tracks_down ()
|
Editor::scroll_tracks_down ()
|
||||||
{
|
{
|
||||||
float prefix;
|
double vert_value = vertical_adjustment.get_value() + vertical_adjustment.get_page_size();
|
||||||
bool was_floating;
|
|
||||||
int cnt;
|
|
||||||
|
|
||||||
if (get_prefix (prefix, was_floating)) {
|
|
||||||
cnt = 1;
|
|
||||||
} else {
|
|
||||||
cnt = (int) floor (prefix);
|
|
||||||
}
|
|
||||||
|
|
||||||
double vert_value = vertical_adjustment.get_value() + (cnt *
|
|
||||||
vertical_adjustment.get_page_size());
|
|
||||||
if (vert_value > vertical_adjustment.get_upper() - _canvas_height) {
|
if (vert_value > vertical_adjustment.get_upper() - _canvas_height) {
|
||||||
vert_value = vertical_adjustment.get_upper() - _canvas_height;
|
vert_value = vertical_adjustment.get_upper() - _canvas_height;
|
||||||
}
|
}
|
||||||
|
|
||||||
vertical_adjustment.set_value (vert_value);
|
vertical_adjustment.set_value (vert_value);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
Editor::scroll_tracks_up ()
|
Editor::scroll_tracks_up ()
|
||||||
{
|
{
|
||||||
float prefix;
|
vertical_adjustment.set_value (vertical_adjustment.get_value() - vertical_adjustment.get_page_size());
|
||||||
bool was_floating;
|
|
||||||
int cnt;
|
|
||||||
|
|
||||||
if (get_prefix (prefix, was_floating)) {
|
|
||||||
cnt = 1;
|
|
||||||
} else {
|
|
||||||
cnt = (int) floor (prefix);
|
|
||||||
}
|
|
||||||
|
|
||||||
vertical_adjustment.set_value (vertical_adjustment.get_value() - (cnt * vertical_adjustment.get_page_size()));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -1987,38 +1808,6 @@ Editor::add_location_from_region ()
|
||||||
_session->commit_reversible_command ();
|
_session->commit_reversible_command ();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* DELETION */
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
Editor::delete_sample_forward ()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
Editor::delete_sample_backward ()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
Editor::delete_screen ()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/* SEARCH */
|
|
||||||
|
|
||||||
void
|
|
||||||
Editor::search_backwards ()
|
|
||||||
{
|
|
||||||
/* what ? */
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
Editor::search_forwards ()
|
|
||||||
{
|
|
||||||
/* what ? */
|
|
||||||
}
|
|
||||||
|
|
||||||
/* MARKS */
|
/* MARKS */
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -2056,25 +1845,15 @@ Editor::jump_backward_to_mark ()
|
||||||
void
|
void
|
||||||
Editor::set_mark ()
|
Editor::set_mark ()
|
||||||
{
|
{
|
||||||
framepos_t pos;
|
framepos_t const pos = _session->audible_frame ();
|
||||||
float prefix;
|
|
||||||
bool was_floating;
|
|
||||||
string markername;
|
string markername;
|
||||||
|
_session->locations()->next_available_name (markername, "mark");
|
||||||
if (get_prefix (prefix, was_floating)) {
|
|
||||||
pos = _session->audible_frame ();
|
if (!choose_new_marker_name (markername)) {
|
||||||
} else {
|
|
||||||
if (was_floating) {
|
|
||||||
pos = (framepos_t) floor (prefix * _session->frame_rate ());
|
|
||||||
} else {
|
|
||||||
pos = (framepos_t) floor (prefix);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
_session->locations()->next_available_name(markername,"mark");
|
|
||||||
if (!choose_new_marker_name(markername)) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
_session->locations()->add (new Location (*_session, pos, 0, markername, Location::IsMark), true);
|
_session->locations()->add (new Location (*_session, pos, 0, markername, Location::IsMark), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user