AssetVIcon::~AssetVIcon()
{
+ if( picon->gui->vicon_thread->solo == this )
+ picon->gui->vicon_thread->solo = 0;
picon->gui->vicon_thread->del_vicon(this);
delete temp;
}
}
if( seq_no >= images.size() ) {
MWindow *mwindow = picon->mwindow;
- File *file = mwindow->video_cache->check_out(asset, mwindow->edl, 1);
- if( !file ) {
- broken = 1;
- return 0;
- }
if( temp && (temp->get_w() != asset->width || temp->get_h() != asset->height) ) {
delete temp; temp = 0;
}
if( !temp )
temp = new VFrame(0, -1, asset->width, asset->height, BC_RGB888, -1);
- while( seq_no >= images.size() ) {
- mwindow->video_cache->check_in(asset);
- Thread::yield();
- file = mwindow->video_cache->check_out(asset, mwindow->edl, 0);
- if( !file ) { usleep(1000); continue; }
- file->set_layer(0);
+ File *file = mwindow->video_cache->check_out(asset, mwindow->edl, 1);
+ while( file && seq_no >= images.size() && !avt->interrupted ) {
int64_t pos = images.size() / picon->gui->vicon_thread->refresh_rate * frame_rate;
file->set_video_position(pos,0);
+ file->set_layer(0);
if( file->read_frame(temp) ) temp->clear_frame();
add_image(temp, vw, vh, vicon_cmodel);
+ mwindow->video_cache->check_in(asset);
+ Thread::yield();
+ file = 0;
+ for( int retries=1000; !file && --retries>=0; usleep(10000) ) {
+ if( avt->interrupted ) return 0;
+ file = mwindow->video_cache->check_out(asset, mwindow->edl, 0);
+ }
}
+ if( !file ) { broken = 1; return 0; }
mwindow->video_cache->check_in(asset);
}
+ if( seq_no >= images.size() ) return 0;
return *images[seq_no];
}
double total_length = edl->tracks->total_length();
if( !total_length ) total_length = 1;
for( Track *track=edl->tracks->first; track!=0; track=track->next ) {
- if( !track->record ) continue;
+ if( !track->is_armed() ) continue;
for( Edit *edit=track->edits->first; edit!=0; edit=edit->next ) {
Indexable *indexable = (Indexable *)edit->asset;
if( !indexable ) indexable = (Indexable *)edit->nested_edl;
char expanders_path[BCTEXTLEN];
mwindow->create_defaults_path(expanders_path, EXPANDERS_FILE);
FILE *fp = fopen(expanders_path, "r");
+ if( !fp ) {
+ snprintf(expanders_path, sizeof(expanders_path), "%s/%s",
+ File::get_cindat_path(), EXPANDERS_FILE);
+ char *cp = strrchr(expanders_path,'.');
+ if( cp ) strcpy(cp+1, mwindow->cin_lang);
+ fp = fopen(expanders_path, "r");
+ }
if( !fp ) {
snprintf(expanders_path, sizeof(expanders_path), "%s/%s",
File::get_cindat_path(), EXPANDERS_FILE);
fp = fopen(expanders_path, "r");
}
-
if( !fp ) return 1;
const char tab = '\t';
char line[BCTEXTLEN]; line[0] = 0;