#include "awindow.h"
#include "awindowgui.h"
#include "bccmodels.h"
-#include "bcsignals.h"
+#include "bcdisplayinfo.h"
#include "bchash.h"
+#include "bcsignals.h"
+#include "bctimer.h"
#include "binfolder.h"
#include "cache.h"
#include "cstrdup.h"
AssetVIconThread *avt = picon->gui->vicon_thread;
Indexable *idxbl = picon->indexable;
Asset *asset = idxbl && idxbl->is_asset ? (Asset *)idxbl : 0;
- if( !asset ) return vframes()>0 ? (VFrame*)*images[0] : 0;
+ if( !asset ) return vframes()>0 ? images[0]->vfrm : 0;
if( !asset->video_data && audio_data && audio_size && length > 0 ) {
if( !temp ) temp = new VFrame(0, -1, w, h, BC_RGB888, -1);
temp->clear_frame();
if( !temp )
temp = new VFrame(0, -1, asset->width, asset->height, BC_RGB888, -1);
File *file = mwindow->video_cache->check_out(asset, mwindow->edl, 1);
- while( file && seq_no >= images.size() && !avt->interrupted ) {
+ if( !file ) { broken = 1; return 0; }
+ Timer timer;
+ while( file && seq_no >= images.size() ) {
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);
+ if( seq_no < images.size() ) break;
mwindow->video_cache->check_in(asset);
+ if( timer.get_difference() > 500 ) return 0;
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);
+ for( int retries=10; !file && --retries>=0; usleep(1000) ) {
if( avt->interrupted ) return 0;
file = mwindow->video_cache->check_out(asset, mwindow->edl, 0);
}
+ if( !file ) return 0;
}
- if( !file ) { broken = 1; return 0; }
mwindow->video_cache->check_in(asset);
}
if( seq_no >= images.size() ) return 0;
- return *images[seq_no];
+ return images[seq_no]->vfrm;
}
int64_t AssetVIcon::set_seq_no(int64_t no)
case VICON_COLOR_MODE_HIGH: vicon_cmodel = BC_RGB888; break;
}
this->vicon_cmodel = vicon_cmodel;
- this->draw_lock = new Mutex("AssetVIconThread::draw_lock");
}
AssetVIconThread::~AssetVIconThread()
{
- delete draw_lock;
-}
-
-void AssetVIconThread::drawing_started()
-{
- draw_lock->lock("AssetVIconThread::drawing_started");
-}
-
-void AssetVIconThread::drawing_stopped()
-{
- draw_lock->unlock();
}
void AssetVIconThread::set_view_popup(AssetVIcon *v, int draw_mode)
return av_popup;
}
-void AssetVIconThread::close_view_popup()
+void AssetVIconThread::stop_vicon_drawing(int wait)
{
stop_drawing();
- drawing_started(); // waits for draw lock
- drawing_stopped();
+ gui->lock_window("AssetVIconThread::stop_vicon_drawing");
+ gui->unlock_window();
}
if( asset->video_data ) {
if( mwindow->preferences->use_thumbnails ) {
gui->unlock_window();
+ char string[BCTEXTLEN];
+ sprintf(string, _("Reading %s"), name);
+ mwindow->gui->lock_window("AssetPicon::create_objects");
+ mwindow->gui->show_message(string);
+ mwindow->gui->unlock_window();
File *file = mwindow->video_cache->check_out(asset,
mwindow->edl,
1);
asset->width, asset->height,
BC_RGB888, -1);
}
- { char string[BCTEXTLEN];
- sprintf(string, _("Reading %s"), name);
- mwindow->gui->lock_window("AssetPicon::create_objects");
- mwindow->gui->show_message(string);
- mwindow->gui->unlock_window(); }
file->read_frame(gui->temp_picon);
mwindow->video_cache->check_in(asset);
return 1;
}
-int AWindowGUI::stop_vicon_drawing()
+int AWindowGUI::stop_vicon_drawing(int wait)
{
- if( !vicon_thread->interrupted )
- vicon_thread->stop_drawing();
+ vicon_thread->stop_vicon_drawing(wait);
return 0;
}
-void AWindowGUI::close_view_popup()
-{
- vicon_thread->close_view_popup();
-}
VFrame *AssetPicon::get_vicon_frame()
{
AssetPicon *picon = new AssetPicon(mwindow,
this, current);
new_assets.append(picon);
+ if( current->width > ASSET_MAX_WIDTH || current->height > ASSET_MAX_HEIGHT ) {
+ eprintf(_("Warning: %s\n"
+ " dimensions %dx%d exceed asset maximum limits %dx%d\n"),
+ current->path, current->width, current->height,
+ ASSET_MAX_WIDTH, ASSET_MAX_HEIGHT);
+ }
+ else if( mwindow->edl->session->playback_config->vconfig->driver == PLAYBACK_X11_GL ) {
+ int texture_limit = BC_DisplayInfo::get_gl_max_texture_size();
+ if( texture_limit >= 0 &&
+ (current->width >= texture_limit || current->height >= texture_limit) ) {
+ eprintf(_("Warning: %s\n"
+ " dimensions %dx%d exceed OpenGL texture limit %d\n"),
+ current->path, current->width, current->height, texture_limit);
+ }
+ }
}
}
update_assets();
}
-EDL *AWindowGUI::collect_proxy(Indexable *indexable)
+EDL *AWindowGUI::collect_proxy(Asset *proxy_asset)
{
- Asset *proxy_asset = (Asset *)indexable;
char path[BCTEXTLEN];
int proxy_scale = mwindow->edl->session->proxy_scale;
ProxyRender::from_proxy_path(path, proxy_asset, proxy_scale);
- Asset *unproxy_asset = mwindow->edl->assets->get_asset(path);
- if( !unproxy_asset || !unproxy_asset->layers ) return 0;
+ Indexable *unproxy_idxbl =
+ proxy_asset->proxy_edl ?
+ (Indexable *) mwindow->edl->get_nested_edl(path) :
+ (Indexable *) mwindow->edl->assets->get_asset(path);
+ if( !unproxy_idxbl || !unproxy_idxbl->get_video_layers() ) return 0;
// make a clip from proxy video tracks and unproxy audio tracks
EDL *proxy_edl = new EDL(mwindow->edl);
proxy_edl->create_objects();
strcpy(proxy_edl->local_session->clip_title, path);
strcpy(proxy_edl->local_session->clip_notes, _("Proxy clip"));
proxy_edl->session->video_tracks = proxy_asset->layers;
- proxy_edl->session->audio_tracks = unproxy_asset->channels;
+ proxy_edl->session->audio_tracks = unproxy_idxbl->get_audio_channels();
proxy_edl->create_default_tracks();
double length = proxy_asset->frame_rate > 0 ?
( proxy_asset->video_length >= 0 ?
if( current->data_type != TRACK_VIDEO ) continue;
current->insert_asset(proxy_asset, 0, length, 0, vtrack++);
}
- length = (double)unproxy_asset->audio_length / unproxy_asset->sample_rate;
+ int64_t samples = unproxy_idxbl->get_audio_samples();
+ int sample_rate = unproxy_idxbl->get_sample_rate();
+ length = sample_rate > 0 ? (double)samples / sample_rate : 0;
current = proxy_edl->tracks->first;
for( int atrack=0; current; current=NEXT ) {
if( current->data_type != TRACK_AUDIO ) continue;
- current->insert_asset(unproxy_asset, 0, length, 0, atrack++);
+ Asset *asset = unproxy_idxbl->is_asset ? (Asset *)unproxy_idxbl : 0;
+ EDL *nested_edl = unproxy_idxbl->is_asset ? 0 : (EDL *)unproxy_idxbl;
+ current->insert_asset(asset, nested_edl, length, 0, atrack++);
}
proxy_edl->folder_no = AW_PROXY_FOLDER;
return proxy_edl;
Indexable *indexable = result->indexable;
if( proxy && indexable && indexable->is_asset &&
indexable->folder_no == AW_PROXY_FOLDER ) {
- EDL *drag_edl = collect_proxy(indexable);
+ EDL *drag_edl = collect_proxy((Asset*)indexable);
if( drag_edl ) mwindow->session->drag_clips->append(drag_edl);
continue;
}
break;
}
if( !vwindow || !vwindow->is_running() ) return 1;
- if( proxy && picon_idxbl ) {
- picon_edl = gui->collect_proxy(picon_idxbl);
+ if( proxy && picon_idxbl && picon_idxbl->is_asset ) {
+ picon_edl = gui->collect_proxy((Asset*)picon_idxbl);
picon_idxbl = 0;
}
deactivate_selection();
}
+ else if( get_button_down() && get_buttonpress() == LEFT_BUTTON &&
+ get_double_click() ) {
+ item = (AssetPicon*)get_selection(0, 0);
+ if( item ) {
+ switch( folder ) {
+ case AW_LABEL_FOLDER:
+ if( !item->label ) break;
+ mwindow->set_position(item->label->position);
+ break;
+ }
+ }
+ }
else if( get_button_down() && !gui->play_off &&
mwindow->edl->session->assetlist_format != ASSETS_TEXT ) {
item = (AssetPicon*)get_selection(0, 0);