improve delays created by vicon drawing locks, reset_cache segv fix, gang track toolt...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / transportque.C

diff --git a/cinelerra-5.1/cinelerra/transportque.C b/cinelerra-5.1/cinelerra/transportque.C
index a4faa9bfd6ffd0c2bbb37dcda3ec15254f6663c0..a8c1fb9297b065c1000afa793c2cc6f9f5046f4a 100644 (file)
--- a/cinelerra-5.1/cinelerra/transportque.C
+++ b/cinelerra-5.1/cinelerra/transportque.C
@@ -47,18 +47,19 @@ TransportCommand::~TransportCommand()
 
 void TransportCommand::reset()
 {
+       command = COMMAND_NONE;
+       change_type = 0;
        playbackstart = 0;
        start_position = 0;
        end_position = 0;
        infinite = 0;
        realtime = 0;
        resume = 0;
+       locked = 0;
        toggle_audio = 0;
        loop_play = 0;
+       displacement = 0;
        speed = 0;
-// Don't reset the change type for commands which don't perform the change
-       if(command != STOP) change_type = 0;
-       command = COMMAND_NONE;
 }
 
 EDL* TransportCommand::get_edl()
@@ -89,6 +90,7 @@ void TransportCommand::copy_from(TransportCommand *command)
        this->playbackstart = command->playbackstart;
        this->realtime = command->realtime;
        this->resume = command->resume;
+       this->locked = command->locked;
        this->toggle_audio = command->toggle_audio;
        this->loop_play = command->loop_play;
        this->displacement = command->displacement;
@@ -167,11 +169,19 @@ void TransportCommand::set_playback_range(EDL *edl, int use_inout, int do_displa
        end_position = use_inout && edl->local_session->outpoint_valid() ?
                edl->local_session->get_outpoint() :
                !loop_play ? edl->local_session->get_selectionend(1) : length;
+       if( start_position >= length )
+               length = edl->tracks->total_length();
 
-       if( !use_inout && EQUIV(start_position, end_position) ) {
+       if( command == REWIND ) {
+               start_position = end_position = 0;
+               command = CURRENT_FRAME;
+       }
+       else if( command == GOTO_END ) {
+               start_position = end_position = length;
+               command = LAST_FRAME;
+       }
+       else if( !use_inout && EQUIV(start_position, end_position) ) {
 // starting play at or past end_position, play to end_position of media (for mixers)
-               if( start_position >= length )
-                       length = edl->tracks->total_length();
                switch( command ) {
                case SLOW_FWD:
                case FAST_FWD:
@@ -182,6 +192,7 @@ void TransportCommand::set_playback_range(EDL *edl, int use_inout, int do_displa
                            start_position > edl->local_session->loop_end ) {
                                start_position = edl->local_session->loop_start;
                        }
+                       displacement = realtime && do_displacement ? frame_period : 0;
                        break; }
 
                case SLOW_REWIND:
@@ -195,9 +206,10 @@ void TransportCommand::set_playback_range(EDL *edl, int use_inout, int do_displa
                        }
                        break;
 
+               case SINGLE_FRAME_FWD:
+                       displacement = realtime && do_displacement ? frame_period : 0;
                case CURRENT_FRAME:
                case LAST_FRAME:
-               case SINGLE_FRAME_FWD:
                        end_position = start_position + frame_period;
                        break;
 
@@ -205,17 +217,9 @@ void TransportCommand::set_playback_range(EDL *edl, int use_inout, int do_displa
                        start_position = end_position - frame_period;
                        break;
                }
-
-               if( realtime && do_displacement ) {
-                       if( (command != CURRENT_FRAME && get_direction() == PLAY_FORWARD ) ||
-                           (command != LAST_FRAME    && get_direction() == PLAY_REVERSE ) ) {
-                               start_position += frame_period;
-                               end_position += frame_period;
-                               displacement = 1;
-                       }
-               }
+               start_position += displacement;
+               end_position += displacement;
        }
-
 //     if( start_position < 0 )
 //             start_position = 0;
 //     if( end_position > length )