projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build version update
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
editpanel.C
diff --git
a/cinelerra-5.1/cinelerra/editpanel.C
b/cinelerra-5.1/cinelerra/editpanel.C
index e823421025aefb2aa2550521ea5d7d4dc7b5cd7b..c056e2ebbec836635550ebefa9f774a918bed480 100644
(file)
--- a/
cinelerra-5.1/cinelerra/editpanel.C
+++ b/
cinelerra-5.1/cinelerra/editpanel.C
@@
-339,6
+339,8
@@
void EditPanel::toggle_label()
void EditPanel::prev_label()
{
int shift_down = subwindow->shift_down();
void EditPanel::prev_label()
{
int shift_down = subwindow->shift_down();
+ int snap = subwindow->ctrl_down() && subwindow->alt_down();
+
int have_mwindow_lock = mwindow->gui->get_window_lock();
int have_subwindow_lock =
subwindow->get_top_level() == mwindow->gui->get_top_level() ?
int have_mwindow_lock = mwindow->gui->get_window_lock();
int have_subwindow_lock =
subwindow->get_top_level() == mwindow->gui->get_top_level() ?
@@
-355,7
+357,10
@@
void EditPanel::prev_label()
mwindow->gui->lock_window("EditPanel::prev_label 2");
mwindow->gui->lock_window("EditPanel::prev_label 2");
- mwindow->prev_label(shift_down);
+ if( snap )
+ mwindow->snap_left_label();
+ else
+ mwindow->prev_label(shift_down);
if(!have_mwindow_lock)
mwindow->gui->unlock_window();
if(!have_mwindow_lock)
mwindow->gui->unlock_window();
@@
-364,6
+369,8
@@
void EditPanel::prev_label()
void EditPanel::next_label()
{
int shift_down = subwindow->shift_down();
void EditPanel::next_label()
{
int shift_down = subwindow->shift_down();
+ int snap = subwindow->ctrl_down() && subwindow->alt_down();
+
int have_mwindow_lock = mwindow->gui->get_window_lock();
int have_subwindow_lock =
subwindow->get_top_level() == mwindow->gui->get_top_level() ?
int have_mwindow_lock = mwindow->gui->get_window_lock();
int have_subwindow_lock =
subwindow->get_top_level() == mwindow->gui->get_top_level() ?
@@
-380,7
+387,10
@@
void EditPanel::next_label()
mwindow->gui->lock_window("EditPanel::next_label 2");
mwindow->gui->lock_window("EditPanel::next_label 2");
- mwindow->next_label(shift_down);
+ if( snap )
+ mwindow->snap_right_label();
+ else
+ mwindow->next_label(shift_down);
if(!have_mwindow_lock)
mwindow->gui->unlock_window();
if(!have_mwindow_lock)
mwindow->gui->unlock_window();
@@
-391,6
+401,8
@@
void EditPanel::next_label()
void EditPanel::prev_edit()
{
int shift_down = subwindow->shift_down();
void EditPanel::prev_edit()
{
int shift_down = subwindow->shift_down();
+ int snap = subwindow->ctrl_down() && subwindow->alt_down();
+
int have_mwindow_lock = mwindow->gui->get_window_lock();
int have_subwindow_lock =
subwindow->get_top_level() == mwindow->gui->get_top_level() ?
int have_mwindow_lock = mwindow->gui->get_window_lock();
int have_subwindow_lock =
subwindow->get_top_level() == mwindow->gui->get_top_level() ?
@@
-407,7
+419,10
@@
void EditPanel::prev_edit()
mwindow->gui->lock_window("EditPanel::prev_edit 2");
mwindow->gui->lock_window("EditPanel::prev_edit 2");
- mwindow->prev_edit_handle(shift_down);
+ if( snap )
+ mwindow->snap_left_edit();
+ else
+ mwindow->prev_edit_handle(shift_down);
if(!have_mwindow_lock)
mwindow->gui->unlock_window();
if(!have_mwindow_lock)
mwindow->gui->unlock_window();
@@
-416,6
+431,8
@@
void EditPanel::prev_edit()
void EditPanel::next_edit()
{
int shift_down = subwindow->shift_down();
void EditPanel::next_edit()
{
int shift_down = subwindow->shift_down();
+ int snap = subwindow->ctrl_down() && subwindow->alt_down();
+
int have_mwindow_lock = mwindow->gui->get_window_lock();
int have_subwindow_lock =
subwindow->get_top_level() == mwindow->gui->get_top_level() ?
int have_mwindow_lock = mwindow->gui->get_window_lock();
int have_subwindow_lock =
subwindow->get_top_level() == mwindow->gui->get_top_level() ?
@@
-432,7
+449,10
@@
void EditPanel::next_edit()
mwindow->gui->lock_window("EditPanel::next_edit 2");
mwindow->gui->lock_window("EditPanel::next_edit 2");
- mwindow->next_edit_handle(shift_down);
+ if( snap )
+ mwindow->snap_right_edit();
+ else
+ mwindow->next_edit_handle(shift_down);
if(!have_mwindow_lock)
mwindow->gui->unlock_window();
if(!have_mwindow_lock)
mwindow->gui->unlock_window();
@@
-442,9
+462,7
@@
void EditPanel::next_edit()
double EditPanel::get_position()
{
EDL *edl = mwindow->edl;
double EditPanel::get_position()
{
EDL *edl = mwindow->edl;
- return !edl ? 0 :
- edl->local_session->get_selectionstart(1) +
- edl->session->get_frame_offset() / edl->session->frame_rate;
+ return !edl ? 0 : edl->local_session->get_selectionstart(1);
}
void EditPanel::set_position(double position)
}
void EditPanel::set_position(double position)
@@
-452,7
+470,6
@@
void EditPanel::set_position(double position)
EDL *edl = mwindow->edl;
if( !edl ) return;
if( position != get_position() ) {
EDL *edl = mwindow->edl;
if( !edl ) return;
if( position != get_position() ) {
- position -= edl->session->get_frame_offset() / edl->session->frame_rate;
if( position < 0 ) position = 0;
edl->local_session->set_selectionstart(position);
edl->local_session->set_selectionend(position);
if( position < 0 ) position = 0;
edl->local_session->set_selectionstart(position);
edl->local_session->set_selectionend(position);
@@
-629,21
+646,9
@@
void EditPanel::set_outpoint()
mwindow->set_outpoint(1);
}
mwindow->set_outpoint(1);
}
-void EditPanel::clear_inpoint()
-{
- mwindow->delete_inpoint();
-}
-
-void EditPanel::clear_outpoint()
-{
- mwindow->delete_outpoint();
-}
-
-void EditPanel::to_clip()
+void EditPanel::unset_inoutpoint()
{
{
- subwindow->unlock_window();
- mwindow->to_clip();
- subwindow->lock_window("EditPanel::to_clip");
+ mwindow->unset_inoutpoint(1);
}
}
@@
-669,6
+674,11
@@
int EditInPoint::keypress_event()
panel->set_inpoint();
return 1;
}
panel->set_inpoint();
return 1;
}
+ if(ctrl_down() && get_keypress() == 't')
+ {
+ panel->unset_inoutpoint();
+ return 1;
+ }
return 0;
}
return 0;
}
@@
-694,6
+704,11
@@
int EditOutPoint::keypress_event()
panel->set_outpoint();
return 1;
}
panel->set_outpoint();
return 1;
}
+ if(ctrl_down() && get_keypress() == 't')
+ {
+ panel->unset_inoutpoint();
+ return 1;
+ }
return 0;
}
return 0;
}
@@
-715,7
+730,7
@@
EditNextLabel::~EditNextLabel()
}
int EditNextLabel::keypress_event()
{
}
int EditNextLabel::keypress_event()
{
- if(
get_keypress() == RIGHT && ctrl_down()
)
+ if(
ctrl_down() && get_keypress() == (!alt_down() ? RIGHT : '>')
)
return handle_event();
return 0;
}
return handle_event();
return 0;
}
@@
-742,7
+757,7
@@
EditPrevLabel::~EditPrevLabel()
}
int EditPrevLabel::keypress_event()
{
}
int EditPrevLabel::keypress_event()
{
- if(
get_keypress() == LEFT && ctrl_down()
)
+ if(
ctrl_down() && get_keypress() == (!alt_down() ? LEFT : '<')
)
return handle_event();
return 0;
}
return handle_event();
return 0;
}
@@
-771,7
+786,7
@@
EditNextEdit::~EditNextEdit()
}
int EditNextEdit::keypress_event()
{
}
int EditNextEdit::keypress_event()
{
- if(
get_keypress() == RIGHT && alt_down()
)
+ if(
alt_down() && get_keypress() == (!ctrl_down() ? RIGHT : '.')
)
return handle_event();
return 0;
}
return handle_event();
return 0;
}
@@
-798,7
+813,7
@@
EditPrevEdit::~EditPrevEdit()
}
int EditPrevEdit::keypress_event()
{
}
int EditPrevEdit::keypress_event()
{
- if(
get_keypress() == LEFT && alt_down()
)
+ if(
alt_down() && get_keypress() == (!ctrl_down() ? LEFT : ',')
)
return handle_event();
return 0;
}
return handle_event();
return 0;
}
@@
-884,7
+899,7
@@
int EditToClip::handle_event()
int EditToClip::keypress_event()
{
int EditToClip::keypress_event()
{
- if(get_keypress() == 'i')
+ if(get_keypress() == 'i'
&& !alt_down()
)
{
handle_event();
return 1;
{
handle_event();
return 1;
@@
-1196,7
+1211,7
@@
EditLabelbutton::~EditLabelbutton()
}
int EditLabelbutton::keypress_event()
{
}
int EditLabelbutton::keypress_event()
{
- if(get_keypress() == 'l')
+ if(get_keypress() == 'l'
&& !alt_down()
)
return handle_event();
return 0;
}
return handle_event();
return 0;
}