nested clips, big rework and cleanup, sams new icons, leaks and tweaks

[goodguy/history.git] / cinelerra-5.1 / cinelerra / playtransport.C

diff --git a/cinelerra-5.1/cinelerra/playtransport.C b/cinelerra-5.1/cinelerra/playtransport.C
index 6fc55d63d376f12fefd1d68dff011764b8344e2f..966d299d9f621aba207e8d1f537f5436bf932659 100644 (file)
--- a/cinelerra-5.1/cinelerra/playtransport.C
+++ b/cinelerra-5.1/cinelerra/playtransport.C
@@ -129,6 +129,11 @@ int PlayTransport::get_w()
        return end_button->get_x() + end_button->get_w() - rewind_button->get_x();
 }
 
+int PlayTransport::is_stopped()
+{
+       return engine->command->command == STOP ? 1 : 0;
+}
+
 int PlayTransport::flip_vertical(int vertical, int &x, int &y)
 {
        if(vertical)
@@ -179,8 +184,13 @@ int PlayTransport::flip_vertical(int vertical, int &x, int &y)
 
 int PlayTransport::keypress_event()
 {
-       int result = 1;
        int key = subwindow->get_keypress();
+       return do_keypress(key);
+}
+
+int PlayTransport::do_keypress(int key)
+{
+       int result = 1;
 // unqualified keys, still holding lock
        switch( key ) {
        case HOME:
@@ -190,10 +200,13 @@ int PlayTransport::keypress_event()
                goto_end();
                return result;
        }
-
-       int toggle_audio = subwindow->shift_down() ? 1 : 0;
-       int use_inout = subwindow->ctrl_down() ? 1 : 0;
+// as in play_command
+       int ctrl_key = subwindow->ctrl_down() ? 1 : 0;
+       int shft_key = subwindow->shift_down() ? 1 : 0;
        int alt_key = subwindow->alt_down() ? 1 : 0;
+       int use_inout = ctrl_key;
+       int toggle_audio = shft_key & ~ctrl_key;
+       int loop_play = shft_key & ctrl_key;
        int command = -1, prev_command = engine->command->command;
        using_inout = use_inout;
        subwindow->unlock_window();
@@ -251,7 +264,7 @@ int PlayTransport::keypress_event()
                break;
        }
        if( command >= 0 ) {
-               handle_transport(command, 0, use_inout, 1, toggle_audio);
+               handle_transport(command, 0, use_inout, 1, toggle_audio, loop_play);
                result = 1;
        }
 
@@ -272,74 +285,16 @@ void PlayTransport::goto_end()
 
 
 
-void PlayTransport::handle_transport(int command,
-       int wait_tracking, int use_inout, int update_refresh, int toggle_audio)
+void PlayTransport::handle_transport(int command, int wait_tracking, int use_inout,
+               int update_refresh, int toggle_audio, int loop_play)
 {
-       if( !get_edl() ) return;
-
-// Stop requires transferring the output buffer to a refresh buffer.
-       int do_stop = 0;
-       int resume = 0;
-//printf("PlayTransport::handle_transport 1 %d\n", command);
-       int prev_command = engine->command->command;
-       int prev_single_frame = engine->command->single_frame();
-       int prev_audio = engine->command->audio_toggle ?
-                !prev_single_frame : prev_single_frame;
-       int cur_single_frame = TransportCommand::single_frame(command);
-       int cur_audio = toggle_audio ?
-                !cur_single_frame : cur_single_frame;
-
-// Dispatch command
-       switch(command) {
-       case FAST_REWIND:       // Commands that play back
-       case NORMAL_REWIND:
-       case SLOW_REWIND:
-       case SINGLE_FRAME_REWIND:
-       case SINGLE_FRAME_FWD:
-       case SLOW_FWD:
-       case NORMAL_FWD:
-       case FAST_FWD:
-               if( !prev_single_frame &&
-                   prev_command == command &&
-                   cur_audio == prev_audio ) {
-// Same direction pressed twice and no change in audio state,  Stop
-                       do_stop = 1;
-                       break;
-               }
-// Resume or change direction
-               switch( prev_command ) {
-               default:
-                       engine->que->send_command(STOP, CHANGE_NONE, 0, 0);
-                       engine->interrupt_playback(wait_tracking);
-                       resume = 1;
-// fall through
-               case STOP:
-               case COMMAND_NONE:
-               case SINGLE_FRAME_FWD:
-               case SINGLE_FRAME_REWIND:
-// Start from scratch
-                       engine->que->send_command(command, CHANGE_NONE, get_edl(),
-                               1, resume, use_inout, toggle_audio,
-                               mwindow->preferences->forward_render_displacement);
-                       break;
-               }
-               break;
-
-// Commands that stop
-       case STOP:
-       case REWIND:
-       case GOTO_END:
-               do_stop = 1;
-               break;
-       }
-
-       if( do_stop ) {
-               engine->que->send_command(STOP, CHANGE_NONE, 0, 0);
-               engine->interrupt_playback(wait_tracking);
-       }
+       EDL *edl = get_edl();
+       if( !edl ) return;
+       if( !is_vwindow() )
+               mwindow->queue_mixers(edl, command, wait_tracking, use_inout, update_refresh, toggle_audio, 0);
+       engine->issue_command(edl, command, wait_tracking, use_inout, update_refresh, toggle_audio, loop_play);
 }
 
-
 EDL* PlayTransport::get_edl()
 {
        return mwindow->edl;
@@ -380,6 +335,19 @@ int PTransportButton::set_mode(int mode)
        return 0;
 }
 
+int PTransportButton::play_command(const char *lock_msg, int command)
+{
+       int ctrl_key = transport->subwindow->ctrl_down() ? 1 : 0;
+       int shft_key = transport->subwindow->shift_down() ? 1 : 0;
+       int use_inout = ctrl_key;
+       int toggle_audio = shft_key & ~ctrl_key;
+       int loop_play = shft_key & ctrl_key;
+       unlock_window();
+       transport->handle_transport(command, 0, use_inout, 0, toggle_audio, loop_play);
+       lock_window(lock_msg);
+       return 1;
+}
+
 
 RewindButton::RewindButton(MWindow *mwindow, PlayTransport *transport, int x, int y)
  : PTransportButton(mwindow, transport, x, y, mwindow->theme->get_image_set("rewind"))
@@ -401,10 +369,7 @@ FastReverseButton::FastReverseButton(MWindow *mwindow, PlayTransport *transport,
 }
 int FastReverseButton::handle_event()
 {
-       unlock_window();
-       transport->handle_transport(FAST_REWIND, 0, ctrl_down());
-       lock_window("FastReverseButton::handle_event");
-       return 1;
+       return play_command("FastReverseButton::handle_event", FAST_REWIND);
 }
 
 // Reverse playback normal speed
@@ -416,10 +381,7 @@ ReverseButton::ReverseButton(MWindow *mwindow, PlayTransport *transport, int x,
 }
 int ReverseButton::handle_event()
 {
-       unlock_window();
-       transport->handle_transport(NORMAL_REWIND, 0, ctrl_down());
-       lock_window("ReverseButton::handle_event");
-       return 1;
+       return play_command("ReverseButton::handle_event", NORMAL_REWIND);
 }
 
 // Reverse playback one frame
@@ -446,10 +408,7 @@ PlayButton::PlayButton(MWindow *mwindow, PlayTransport *transport, int x, int y)
 }
 int PlayButton::handle_event()
 {
-       unlock_window();
-       transport->handle_transport(NORMAL_FWD, 0, ctrl_down());
-       lock_window("PlayButton::handle_event");
-       return 1;
+       return play_command("PlayButton::handle_event", NORMAL_FWD);
 }
 
 
@@ -478,10 +437,7 @@ FastPlayButton::FastPlayButton(MWindow *mwindow, PlayTransport *transport, int x
 }
 int FastPlayButton::handle_event()
 {
-       unlock_window();
-       transport->handle_transport(FAST_FWD, 0, ctrl_down());
-       lock_window("FastPlayButton::handle_event");
-       return 1;
+       return play_command("FastPlayButton::handle_event", FAST_FWD);
 }
 
 EndButton::EndButton(MWindow *mwindow, PlayTransport *transport, int x, int y)
@@ -514,8 +470,7 @@ int StopButton::handle_event()
 
 void PlayTransport::change_position(double position)
 {
-       EDL *edl = get_edl();
-       if( !edl ) return;
+       if( !get_edl() ) return;
        int prev_command = engine->command->command;
 // stop transport
        if( prev_command != STOP && prev_command != COMMAND_NONE &&