command->command = STOP;
next_command = new TransportCommand();
next_command->change_type = CHANGE_ALL;
- curr_command = new TransportCommand();
stop_command = new TransportCommand();
stop_command->command = STOP;
+ stop_command->realtime = 1;
+ sent_command = new TransportCommand();
+ sent_command->command = -1;
tracking_lock = new Mutex("PlaybackEngine::tracking_lock");
renderengine_lock = new Mutex("PlaybackEngine::renderengine_lock");
tracking_done = new Condition(1, "PlaybackEngine::tracking_done");
PlaybackEngine::~PlaybackEngine()
{
done = 1;
- transport_stop(0);
+ output_lock->unlock();
Thread::join();
delete preferences;
delete_render_engine();
delete command;
delete next_command;
delete stop_command;
- delete curr_command;
+ delete sent_command;
delete input_lock;
delete output_lock;
}
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();
}
}
void PlaybackEngine::perform_change()
{
- switch( command->change_type )
- {
+ switch( command->change_type ) {
case CHANGE_ALL:
create_cache();
case CHANGE_EDL:
create_render_engine();
+ break;
case CHANGE_PARAMS:
- if(command->change_type != CHANGE_EDL &&
- (uint32_t)command->change_type != CHANGE_ALL)
- render_engine->get_edl()->synchronize_params(command->get_edl());
+ render_engine->get_edl()->synchronize_params(command->get_edl());
case CHANGE_NONE:
break;
}
{
// 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();
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;
}
int PlaybackEngine::get_module_levels(ArrayList<double> *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;
}
// 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
while( !done ) {
// Wait for current command to finish
output_lock->lock("PlaybackEngine::run");
-//printf("PlaybackEngine::run 0 %d\n", curr_command->command);
- if( curr_command->command < 0 ) continue;
-// this covers a glitch that occurs when stop is asserted
-// when the render_engine starting, but not initialized
- if( curr_command->command == STOP && render_engine )
- render_engine->interrupt_playback();
- wait_render_engine();
-
+ if( done ) break;
+//printf("sent command=%d\n", sent_command->command);
// Read the new command
- input_lock->lock("PlaybackEngine::run");
- command->copy_from(curr_command);
- curr_command->command = -1;
+ command->copy_from(sent_command);
input_lock->unlock();
- if( done ) break;
-//printf("PlaybackEngine::run 1 %d\n", command->command);
+
+ interrupt_playback(0);
+ wait_render_engine();
switch( command->command ) {
// Parameter change only
{
transport_stop(wait_tracking);
renderengine_lock->lock("PlaybackEngine::stop_playback");
- if(render_engine)
+ if( render_engine )
render_engine->wait_done();
renderengine_lock->unlock();
}
// Resume or change direction
switch( curr_command ) {
default:
- transport_stop(wait_tracking);
+ transport_stop(0);
do_resume = 1;
// fall through
case STOP:
}
}
-int PlaybackEngine::transport_stop(int wait_tracking)
+int PlaybackEngine::put_command(TransportCommand *command, int reset)
{
- input_lock->lock("PlaybackEngine::transport_stop 1");
- curr_command->copy_from(stop_command);
- interrupt_playback(wait_tracking);
-//printf("send: %d (STOP)\n", STOP);
- input_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();
+ }
+//printf("send: %d (STOP) 0\n", STOP);
return 0;
}
int PlaybackEngine::transport_command(int command, int change_type, EDL *new_edl, int use_inout)
{
- input_lock->lock("PlaybackEngine::transport_command 1");
next_command->command = command;
next_command->change_type |= change_type;
if( new_edl ) {
next_command->set_playback_range(new_edl, use_inout,
preferences->forward_render_displacement);
}
- curr_command->copy_from(next_command);
- next_command->reset();
+ 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",
// "LAST_FRAME" };
-//printf("send= %d (%s)\n", command, types[command]);
- input_lock->unlock();
- output_lock->unlock();
+//printf("send= %d (%s) %d\n", sent_command->command,
+// types[sent_command->command], sent_command->locked);
return 0;
}
projects / goodguy / cinelerra.git / blobdiff