SET_TRACE
}
+void EditPanel::stop_transport(const char *lock_msg)
+{
+ int have_subwindow_lock = subwindow->get_window_lock();
+ if( have_subwindow_lock ) subwindow->unlock_window();
+ mwindow->stop_transport();
+ if( have_subwindow_lock ) subwindow->lock_window(lock_msg);
+}
void EditPanel::toggle_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() ?
- 0 : subwindow->get_window_lock();
- if(have_mwindow_lock)
- mwindow->gui->unlock_window();
- if(have_subwindow_lock)
- subwindow->unlock_window();
-
- mwindow->gui->mbuttons->transport->handle_transport(STOP, 1, 0, 0);
+ if( have_mwindow_lock ) mwindow->gui->unlock_window();
- if(have_subwindow_lock)
- subwindow->lock_window("EditPanel::prev_label 1");
+ stop_transport("EditPanel::prev_label 1");
mwindow->gui->lock_window("EditPanel::prev_label 2");
-
if( snap )
mwindow->snap_left_label();
else
mwindow->prev_label(shift_down);
-
- if(!have_mwindow_lock)
+ if( !have_mwindow_lock )
mwindow->gui->unlock_window();
}
{
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() ?
- 0 : subwindow->get_window_lock();
- if(have_mwindow_lock)
- mwindow->gui->unlock_window();
- if(have_subwindow_lock)
- subwindow->unlock_window();
-
- mwindow->gui->mbuttons->transport->handle_transport(STOP, 1, 0, 0);
+ if( have_mwindow_lock ) mwindow->gui->unlock_window();
- if(have_subwindow_lock)
- subwindow->lock_window("EditPanel::next_label 1");
+ stop_transport("EditPanel::next_label 1");
mwindow->gui->lock_window("EditPanel::next_label 2");
-
if( snap )
mwindow->snap_right_label();
else
mwindow->next_label(shift_down);
-
- if(!have_mwindow_lock)
+ if( !have_mwindow_lock )
mwindow->gui->unlock_window();
}
{
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() ?
- 0 : subwindow->get_window_lock();
- if(have_mwindow_lock)
- mwindow->gui->unlock_window();
- if(have_subwindow_lock)
- subwindow->unlock_window();
-
- mwindow->gui->mbuttons->transport->handle_transport(STOP, 1, 0, 0);
+ if( have_mwindow_lock ) mwindow->gui->unlock_window();
- if(have_subwindow_lock)
- subwindow->lock_window("EditPanel::prev_edit 1");
+ stop_transport("EditPanel::prev_edit 1");
mwindow->gui->lock_window("EditPanel::prev_edit 2");
else
mwindow->prev_edit_handle(shift_down);
- if(!have_mwindow_lock)
+ if( !have_mwindow_lock )
mwindow->gui->unlock_window();
}
{
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() ?
- 0 : subwindow->get_window_lock();
- if(have_mwindow_lock)
- mwindow->gui->unlock_window();
- if(have_subwindow_lock)
- subwindow->unlock_window();
-
- mwindow->gui->mbuttons->transport->handle_transport(STOP, 1, 0, 0);
+ if( have_mwindow_lock ) mwindow->gui->unlock_window();
- if(have_subwindow_lock)
- subwindow->lock_window("EditPanel::next_edit 1");
+ stop_transport("EditPanel::next_edit 1");
mwindow->gui->lock_window("EditPanel::next_edit 2");
else
mwindow->next_edit_handle(shift_down);
- if(!have_mwindow_lock)
+ if( !have_mwindow_lock )
mwindow->gui->unlock_window();
}
}
int EditInPoint::keypress_event()
{
- if(get_keypress() == '[')
- {
- panel->set_inpoint();
+ int key = get_keypress();
+ if( key == '[' || key == '<' ) {
+ panel->set_inpoint();
return 1;
}
if(ctrl_down() && get_keypress() == 't')
}
int EditOutPoint::keypress_event()
{
- if(get_keypress() == ']')
- {
+ int key = get_keypress();
+ if( key == ']' || key == '>' ) {
panel->set_outpoint();
return 1;
}