X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fplaybackengine.C;h=16f6bd7a73c65bda3ffd6065186063eefe206f58;hp=39fdaa96e2527a67d20c603a7b66dd4abdb5a6a2;hb=45dd712aa4b2894f6b2390b4797262831dcdb47a;hpb=2e28d225c343f02500594688bf8d0528df40600c diff --git a/cinelerra-5.1/cinelerra/playbackengine.C b/cinelerra-5.1/cinelerra/playbackengine.C index 39fdaa96..16f6bd7a 100644 --- a/cinelerra-5.1/cinelerra/playbackengine.C +++ b/cinelerra-5.1/cinelerra/playbackengine.C @@ -61,7 +61,6 @@ PlaybackEngine::PlaybackEngine(MWindow *mwindow, Canvas *output) stop_command->realtime = 1; sent_command = new TransportCommand(); sent_command->command = -1; - sent_lock = new Mutex("PlaybackEngine::sent"); tracking_lock = new Mutex("PlaybackEngine::tracking_lock"); renderengine_lock = new Mutex("PlaybackEngine::renderengine_lock"); tracking_done = new Condition(1, "PlaybackEngine::tracking_done"); @@ -92,7 +91,6 @@ PlaybackEngine::~PlaybackEngine() delete next_command; delete stop_command; delete sent_command; - delete sent_lock; delete input_lock; delete output_lock; } @@ -130,26 +128,25 @@ int PlaybackEngine::create_render_engine() void PlaybackEngine::delete_render_engine() { renderengine_lock->lock("PlaybackEngine::delete_render_engine"); - delete render_engine; - render_engine = 0; + delete render_engine; render_engine = 0; renderengine_lock->unlock(); } void PlaybackEngine::arm_render_engine() { - if(render_engine) + if( render_engine ) render_engine->arm_command(command); } void PlaybackEngine::start_render_engine() { - if(render_engine) render_engine->start_command(); + if( render_engine ) + render_engine->start_command(); } void PlaybackEngine::wait_render_engine() { - if(command->realtime && render_engine) - { + if( command->realtime && render_engine ) { render_engine->join(); } } @@ -182,14 +179,14 @@ void PlaybackEngine::sync_parameters(EDL *edl) { // TODO: lock out render engine from keyframe deletions command->get_edl()->synchronize_params(edl); - if(render_engine) render_engine->get_edl()->synchronize_params(edl); + if( render_engine ) + render_engine->get_edl()->synchronize_params(edl); } - void PlaybackEngine::interrupt_playback(int wait_tracking) { renderengine_lock->lock("PlaybackEngine::interrupt_playback"); - if(render_engine) + if( render_engine ) render_engine->interrupt_playback(); renderengine_lock->unlock(); @@ -197,22 +194,19 @@ void PlaybackEngine::interrupt_playback(int wait_tracking) pause_lock->unlock(); // Wait for tracking to finish if it is running - if(wait_tracking) - { + if( wait_tracking ) { tracking_done->lock("PlaybackEngine::interrupt_playback"); tracking_done->unlock(); } } - // Return 1 if levels exist int PlaybackEngine::get_output_levels(double *levels, long position) { int result = 0; - if(render_engine && render_engine->do_audio) - { - result = 1; + if( render_engine && render_engine->do_audio ) { render_engine->get_output_levels(levels, position); + result = 1; } return result; } @@ -221,10 +215,9 @@ int PlaybackEngine::get_output_levels(double *levels, long position) int PlaybackEngine::get_module_levels(ArrayList *module_levels, long position) { int result = 0; - if(render_engine && render_engine->do_audio) - { - result = 1; + if( render_engine && render_engine->do_audio ) { render_engine->get_module_levels(module_levels, position); + result = 1; } return result; } @@ -289,10 +282,8 @@ double PlaybackEngine::get_tracking_position() // Don't interpolate when every frame is played. - if(command->get_edl()->session->video_every_frame && - render_engine && - render_engine->do_video) - { + if( command->get_edl()->session->video_every_frame && + render_engine && render_engine->do_video ) { result = tracking_position; } else @@ -367,26 +358,15 @@ void PlaybackEngine::run() // Wait for current command to finish output_lock->lock("PlaybackEngine::run"); if( done ) break; - -// Read the new command - sent_lock->lock("PlaybackEngine::run"); - int command = sent_command->command; - if( command >= 0 ) { - this->command->copy_from(sent_command); //printf("sent command=%d\n", sent_command->command); - sent_command->command = -1; - if( sent_command->locked ) - input_lock->unlock(); - } - sent_lock->unlock(); - if( command < 0 ) continue; +// Read the new command + command->copy_from(sent_command); + input_lock->unlock(); interrupt_playback(0); wait_render_engine(); -//printf("PlaybackEngine::run 1 %d\n", command->command); - - switch( command ) { + switch( command->command ) { // Parameter change only case COMMAND_NONE: perform_change(); @@ -435,7 +415,7 @@ void PlaybackEngine::stop_playback(int wait_tracking) { transport_stop(wait_tracking); renderengine_lock->lock("PlaybackEngine::stop_playback"); - if(render_engine) + if( render_engine ) render_engine->wait_done(); renderengine_lock->unlock(); } @@ -448,11 +428,9 @@ void PlaybackEngine::send_command(int command, EDL *edl, int wait_tracking, int int do_stop = 0, do_resume = 0; int curr_command = this->command->command; int curr_single_frame = TransportCommand::single_frame(curr_command); - int curr_direction = TransportCommand::get_direction(curr_command); int curr_audio = this->command->toggle_audio ? !curr_single_frame : curr_single_frame; int single_frame = TransportCommand::single_frame(command); - int direction = TransportCommand::get_direction(command); int next_audio = next_command->toggle_audio ? !single_frame : single_frame; // Dispatch command @@ -476,7 +454,7 @@ void PlaybackEngine::send_command(int command, EDL *edl, int wait_tracking, int // Resume or change direction switch( curr_command ) { default: - transport_stop(curr_direction != direction ? 1 : 0); + transport_stop(0); do_resume = 1; // fall through case STOP: @@ -506,17 +484,23 @@ void PlaybackEngine::send_command(int command, EDL *edl, int wait_tracking, int } } -int PlaybackEngine::transport_stop(int wait_tracking) +int PlaybackEngine::put_command(TransportCommand *command, int reset) { - interrupt_playback(0); - input_lock->lock("PlaybackEngine::transport_stop"); - sent_lock->lock("PlaybackEngine::transport_stop"); - sent_command->copy_from(stop_command); - sent_command->locked = wait_tracking ? 1 : 0; - if( !sent_command->locked ) - input_lock->unlock(); - sent_lock->unlock(); +// commands can deadlock updating tracking,meters,clock... + int mlocked = mwindow->gui->break_lock(); + input_lock->lock("PlaybackEngine::put_command"); + sent_command->copy_from(command); + if( reset ) + command->reset(); output_lock->unlock(); + if( mlocked ) + mwindow->gui->lock_window("PlaybackEngine::put_command"); + return 0; +} + +int PlaybackEngine::transport_stop(int wait_tracking) +{ + put_command(stop_command, 0); if( wait_tracking ) { tracking_done->lock("PlaybackEngine::transport_stop"); tracking_done->unlock(); @@ -545,18 +529,7 @@ int PlaybackEngine::transport_command(int command, int change_type, EDL *new_edl next_command->set_playback_range(new_edl, use_inout, preferences->forward_render_displacement); } - - input_lock->lock("PlaybackEngine::transport_command"); - next_command->locked = - next_command->change_type == CHANGE_NONE || - next_command->change_type == CHANGE_PARAMS ? 0 : 1; - sent_lock->lock("PlaybackEngine::transport_command"); - sent_command->copy_from(next_command); - if( !sent_command->locked ) - input_lock->unlock(); - next_command->reset(); - sent_lock->unlock(); - output_lock->unlock(); + put_command(next_command, 1); //static const char *types[] = { "NONE", // "FRAME_FWD", "NORMAL_FWD", "FAST_FWD", "FRAME_REV", "NORMAL_REV", "FAST_REV", // "STOP", "PAUSE", "SLOW_FWD", "SLOW_REV", "REWIND", "GOTO_END", "CURRENT_FRAME",