asset menu size fixups, new picons+prefs, more timecode del, stretch scrollbars,...

[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..8de70d83341aa62c585592fb4d6cc2d5a0e45fc8 100644 (file)
--- a/cinelerra-5.1/cinelerra/editpanel.C
+++ b/cinelerra-5.1/cinelerra/editpanel.C
@@ -442,9 +442,7 @@ void EditPanel::next_edit()
 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)
@@ -452,7 +450,6 @@ void EditPanel::set_position(double 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);
@@ -639,13 +636,6 @@ void EditPanel::clear_outpoint()
        mwindow->delete_outpoint();
 }
 
-void EditPanel::to_clip()
-{
-       subwindow->unlock_window();
-       mwindow->to_clip();
-       subwindow->lock_window("EditPanel::to_clip");
-}
-
 
 EditInPoint::EditInPoint(MWindow *mwindow, EditPanel *panel, int x, int y)
  : BC_Button(x, y, mwindow->theme->get_image_set("inbutton"))