X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.C;h=4688e7bc04cead9a205e6a0fd67288640dc10b25;hp=e8701eaa0f4be841bdc5d98c4368967a0c75ad33;hb=HEAD;hpb=b2dfd8318ea57bbe38e2c61ffd8cda30fb7465c3 diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C index e8701eaa..dfe0163a 100644 --- a/cinelerra-5.1/cinelerra/awindowgui.C +++ b/cinelerra-5.1/cinelerra/awindowgui.C @@ -2,6 +2,7 @@ /* * CINELERRA * Copyright (C) 1997-2012 Adam Williams + * Copyright (C) 2003-2016 Cinelerra CV contributors * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,8 +30,10 @@ #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" @@ -54,6 +57,7 @@ #include "labels.h" #include "labelpopup.h" #include "localsession.h" +#include "mainerror.h" #include "mainmenu.h" #include "mainsession.h" #include "mwindowgui.h" @@ -94,6 +98,13 @@ const char *AWindowGUI::folder_names[] = N_("Proxy"), }; +const char *AVIconDrawing::avicon_names[] = +{ + N_("Full Play"), + N_("Mouse Over"), + N_("Src Target"), + N_("No Play"), +}; AssetVIcon::AssetVIcon(AssetPicon *picon, int w, int h, double framerate, int64_t length) : VIcon(w, h, framerate), Garbage("AssetVIcon") @@ -101,19 +112,26 @@ AssetVIcon::AssetVIcon(AssetPicon *picon, int w, int h, double framerate, int64_ this->picon = picon; this->length = length; temp = 0; + broken = 0; } AssetVIcon::~AssetVIcon() { + if( picon->gui->vicon_thread->solo == this ) + picon->gui->vicon_thread->solo = 0; picon->gui->vicon_thread->del_vicon(this); delete temp; } VFrame *AssetVIcon::frame() { - Asset *asset = (Asset *)picon->indexable; + if( broken ) return 0; + AssetVIconThread *avt = picon->gui->vicon_thread; + Indexable *idxbl = picon->indexable; + Asset *asset = idxbl && idxbl->is_asset ? (Asset *)idxbl : 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, vw, vh, BC_RGB888, -1); + if( !temp ) temp = new VFrame(0, -1, w, h, BC_RGB888, -1); temp->clear_frame(); int sample_rate = asset->get_sample_rate(); int64_t audio_samples = asset->get_audio_samples(); @@ -134,43 +152,51 @@ VFrame *AssetVIcon::frame() while( i < len ) data[i++] = *audio_data++ * sample_scale; while( i < bfrsz ) data[i++] = 0; picon->draw_wave(temp, data, bfrsz, RED, GREEN); - int x = (vw-1) * line_pos; + int x = (w-1) * line_pos; temp->pixel_rgb = RED; - temp->draw_line(x,0, x,vh); + temp->draw_line(x,0, x,h); return temp; } - int ww = picon->gui->vicon_thread->view_w; - int hh = picon->gui->vicon_thread->view_h; + int vw = avt->vw, vh = avt->vh, vicon_cmodel = avt->vicon_cmodel; if( !asset->video_data ) { if( !temp ) { - temp = new VFrame(0, -1, ww, hh, BC_RGB888, -1); + temp = new VFrame(0, -1, vw, vh, BC_RGB888, -1); temp->clear_frame(); } return temp; } if( seq_no >= images.size() ) { MWindow *mwindow = picon->mwindow; - File *file = mwindow->video_cache->check_out(asset, mwindow->edl, 1); - if( !file ) 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); + 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, ww, hh, BC_RGB8); + 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(); + 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; } mwindow->video_cache->check_in(asset); } - return *images[seq_no]; + if( seq_no >= images.size() ) return 0; + return images[seq_no]->vfrm; } int64_t AssetVIcon::set_seq_no(int64_t no) @@ -274,7 +300,9 @@ void AssetVIconAudio::start(AssetVIcon *vicon) { if( running() ) return; interrupted = 0; - audio_pos = 0; + double pos = vicon->length > 0 ? (double)vicon->seq_no/vicon->length : 0; + int audio_len = vicon->audio_size/sizeof(vicon_audio_t); + audio_pos = pos * audio_len; this->vicon = vicon; Thread::start(); } @@ -302,33 +330,64 @@ void AssetVIcon::start_audio() void AssetVIcon::stop_audio() { - if( playing_audio > 0 ) + if( playing_audio > 0 ) { picon->gui->vicon_audio->stop(0); - playing_audio = 0; + playing_audio = 0; + } } +AssetViewPopup::AssetViewPopup(VIconThread *vt, int draw_mode, + int x, int y, int w, int h) + : ViewPopup(vt, x, y, w, h) +{ + this->draw_mode = draw_mode; + this->bar_h = (VIEW_POPUP_BAR_H * h) / 200; + dragging = 0; +} -AssetVIconThread::AssetVIconThread(AWindowAssets *asset_list) - : VIconThread(asset_list) +AssetViewPopup::~AssetViewPopup() { - popup_dragging = 0; } -AssetVIconThread::~AssetVIconThread() +int AssetViewPopup::reposition_window(int x, int y, int w, int h) { + this->bar_h = (VIEW_POPUP_BAR_H * h) / 200; + return ViewPopup::reposition_window(x, y, w, h); } -int AssetVIconThread::popup_button_press(int x, int y) +int AssetViewPopup::button_press_event() { - if( !view_win || !view_win->is_event_win() ) return 0; - if( !vicon || vicon->playing_audio >= 0 ) return 0; - popup_dragging = 0; - int view_w = view_win->get_w(), view_h = view_win->get_h(); - AssetVIcon *vicon = (AssetVIcon *)this->vicon; + if( !is_event_win() ) return 0; + AssetVIconThread *avt = (AssetVIconThread *)vt; + if( !avt->vicon ) return 0; + + int dir = 1; + switch( get_buttonpress() ) { + case LEFT_BUTTON: + break; + case MIDDLE_BUTTON: + avt->set_view_popup(0); + return 1; + case WHEEL_DOWN: + dir = -1; // fall thru + case WHEEL_UP: + switch( draw_mode ) { + case ASSET_VIEW_MEDIA: + case ASSET_VIEW_MEDIA_MAP: + avt->zoom_scale(dir); + return 1; + } // fall thru + default: + return 0; + } + + int x = get_cursor_x(), y = get_cursor_y(); + AssetVIcon *vicon = (AssetVIcon *)avt->vicon; AssetPicon *picon = vicon->picon; MWindow *mwindow = picon->mwindow; EDL *edl = mwindow->edl; - if( y < VIEW_POPUP_BAR_H ) { + dragging = 0; + if( y < get_h()/2 ) { Indexable *idxbl = picon->indexable ? picon->indexable : picon->edl ? picon->edl : 0; @@ -340,7 +399,7 @@ int AssetVIconThread::popup_button_press(int x, int y) double video_length = frame_rate > 0 && idxbl->have_video() ? idxbl->get_video_frames() / frame_rate : 0; double idxbl_length = bmax(audio_length, video_length); - double pos = x * idxbl_length / view_w; + double pos = x * idxbl_length / get_w(); double start = 0, end = idxbl_length; double lt = DBL_MAX, rt = DBL_MAX; for( Track *track=edl->tracks->first; track!=0; track=track->next ) { @@ -369,20 +428,22 @@ int AssetVIconThread::popup_button_press(int x, int y) vedl->set_inpoint(start); vedl->set_outpoint(end); vedl->local_session->set_selectionstart(start); - vedl->local_session->set_selectionend(end); - vwindow->update_position(CHANGE_NONE, 0, 1, 0); + vedl->local_session->set_selectionend(start); + vwindow->gui->lock_window("AssetViewPopup::button_press_event"); + vwindow->update_position(); + vwindow->gui->unlock_window(); return 1; } - if( y >= view_h-VIEW_POPUP_BAR_H ) { - popup_dragging = 1; - if( !view_win->ctrl_down() ) - return popup_cursor_motion(x, y); + else { + dragging = 1; + if( !ctrl_down() && !shift_down() ) + return cursor_motion_event(); Indexable *idxbl = picon->indexable ? picon->indexable : picon->edl ? picon->edl : 0; if( !idxbl ) return 0; double total_length = mwindow->edl->tracks->total_length(); - double pos = x * total_length / view_w; + double pos = x * total_length / get_w(); double start = 0, end = total_length; double lt = DBL_MAX, rt = DBL_MAX; for( Track *track=edl->tracks->first; track!=0; track=track->next ) { @@ -404,11 +465,9 @@ int AssetVIconThread::popup_button_press(int x, int y) } } mwindow->gui->lock_window("AssetVIcon::popup_button_press"); - edl->local_session->set_selectionstart(pos); - edl->local_session->set_selectionend(pos); - mwindow->find_cursor(); + mwindow->select_point(start); edl->local_session->set_selectionstart(start); - edl->local_session->set_selectionend(end); + edl->local_session->set_selectionend(!shift_down() ? start : end); mwindow->zoom_sample(edl->local_session->zoom_sample); mwindow->gui->unlock_window(); return 1; @@ -416,37 +475,218 @@ int AssetVIconThread::popup_button_press(int x, int y) return 0; } -int AssetVIconThread::popup_button_release(int x, int y) +int AssetViewPopup::button_release_event() { - if( !view_win || !view_win->is_event_win() ) return 0; - if( !vicon || vicon->playing_audio >= 0 ) return 0; - popup_dragging = 0; + if( !is_event_win() ) return 0; + dragging = 0; return 1; } -int AssetVIconThread::popup_cursor_motion(int x, int y) -{ - if( !view_win || !view_win->is_event_win() ) return 0; - if( !vicon || vicon->playing_audio >= 0 ) return 0; - if( !view_win->get_button_down() || view_win->get_buttonpress() != 1 || - view_win->ctrl_down() || view_win->alt_down() || view_win->shift_down() ) - return 0; - AssetVIcon *vicon = (AssetVIcon *)this->vicon; - MWindow *mwindow = vicon->picon->mwindow; - EDL *edl = mwindow->edl; - if( popup_dragging ) { - double total_length = edl->tracks->total_length(); - int view_w = view_win->get_w(); - double pos = x * total_length / view_w; - mwindow->gui->lock_window("AssetVIcon::popup_cursor_motion"); - mwindow->select_point(pos); - mwindow->zoom_sample(edl->local_session->zoom_sample); - mwindow->gui->unlock_window(); - return 1; +int AssetViewPopup::cursor_motion_event() +{ + AssetVIconThread *avt = (AssetVIconThread *)vt; + AssetVIcon *vicon = (AssetVIcon *)avt->vicon; + if( vicon && dragging && is_event_win() && + get_button_down() && get_buttonpress() == LEFT_BUTTON && + !ctrl_down() && !alt_down() && !shift_down() ) { + switch( draw_mode ) { + case ASSET_VIEW_MEDIA_MAP: + case ASSET_VIEW_FULL: + MWindow *mwindow = vicon->picon->mwindow; + EDL *edl = mwindow->edl; + int x = get_cursor_x(); + double total_length = edl->tracks->total_length(); + double pos = x * total_length / get_w(); + mwindow->gui->lock_window("AssetVIcon::popup_cursor_motion"); + mwindow->select_point(pos); + mwindow->zoom_sample(edl->local_session->zoom_sample); + mwindow->gui->unlock_window(); + return 1; + } } return 0; } +void AssetViewPopup::draw_vframe(VFrame *vframe) +{ + switch( draw_mode ) { + case ASSET_VIEW_MEDIA: + case ASSET_VIEW_ICON: + ViewPopup::draw_vframe(vframe); + case ASSET_VIEW_NONE: + default: + return; + case ASSET_VIEW_MEDIA_MAP: + case ASSET_VIEW_FULL: + break; + } + set_color(BLACK); + draw_box(0,0,get_w(),get_h()); + int y1 = bar_h; + int y2 = get_h()-bar_h; + BC_WindowBase::draw_vframe(vframe, 0,y1, get_w(),y2-y1); + AssetVIconThread *avt = (AssetVIconThread *)vt; + AssetVIcon *vicon = (AssetVIcon *)avt->vicon; + AssetPicon *picon = (AssetPicon *)vicon->picon; + Indexable *idxbl = + picon->indexable ? picon->indexable : + picon->edl ? picon->edl : 0; + if( !idxbl ) return; + double sample_rate = idxbl->get_sample_rate(); + double audio_length = sample_rate > 0 && idxbl->have_audio() ? + idxbl->get_audio_samples() / sample_rate : 0; + double frame_rate = idxbl->get_frame_rate(); + double video_length = frame_rate > 0 && idxbl->have_video() ? + idxbl->get_video_frames() / frame_rate : 0; + double idxbl_length = bmax(audio_length, video_length); + if( !idxbl_length ) idxbl_length = 1; + + EDL *edl = picon->mwindow->edl; + 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->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; + if( !indexable ) continue; + if( indexable->id == idxbl->id || + (!indexable->is_asset == !idxbl->is_asset && + !strcmp(indexable->path, idxbl->path)) ) { + double pos1 = track->from_units(edit->startsource); + double pos2 = track->from_units(edit->startsource + edit->length); + double xscale = get_w() / idxbl_length; + int ex1 = pos1 * xscale, ex2 = pos2 * xscale; + set_color(WHITE); + draw_box(ex1,0, ex2-ex1,y1); + set_color(BLACK); + draw_line(ex1,0, ex1,y1); + draw_line(ex2,0, ex2,y1); + pos1 = track->from_units(edit->startproject); + pos2 = track->from_units(edit->startproject + edit->length); + xscale = get_w() / total_length; + int px1 = pos1 * xscale, px2 = pos2 * xscale; + set_color(RED); + draw_box(px1,y2, px2-px1,get_h()-y2); + set_color(BLACK); + draw_line(px1,y2, px1,get_h()-1); + draw_line(px2,y2, px2,get_h()-1); + + set_color(YELLOW); + draw_line(ex1,y1, px1,y2); + draw_line(ex2,y1, px2,y2); + } + } + } +} + +int AssetViewPopup::keypress_event() +{ + int result = 0; + AssetVIconThread *avt = (AssetVIconThread *)vt; + switch( avt->draw_mode ) { + case ASSET_VIEW_MEDIA_MAP: + switch( get_keypress() ) { + case 'f': + case 'F': + avt->draw_mode = ASSET_VIEW_FULL; + result = 1; + } + break; + case ASSET_VIEW_FULL: + avt->draw_mode = ASSET_VIEW_MEDIA_MAP; + result = 1; + } + if( result ) // zero change for refresh + avt->zoom_scale(0); + return ViewPopup::keypress_event(); +} + + +AssetVIconThread::AssetVIconThread(AWindowGUI *gui, Preferences *preferences) + : VIconThread(gui->asset_list, preferences->vicon_size * 16/9, preferences->vicon_size, + 4*preferences->awindow_picon_h * 16/9, 4*preferences->awindow_picon_h) +{ + this->gui = gui; + draw_mode = ASSET_VIEW_NONE; + int vicon_cmodel = BC_RGB8; + switch( preferences->vicon_color_mode ) { + case VICON_COLOR_MODE_LOW: vicon_cmodel = BC_RGB8; break; + case VICON_COLOR_MODE_MED: vicon_cmodel = BC_RGB565; break; + case VICON_COLOR_MODE_HIGH: vicon_cmodel = BC_RGB888; break; + } + this->vicon_cmodel = vicon_cmodel; +} + +AssetVIconThread::~AssetVIconThread() +{ +} + +void AssetVIconThread::set_view_popup(AssetVIcon *v, int draw_mode) +{ + gui->stop_vicon_drawing(); + this->draw_mode = draw_mode; + set_view_popup(v); + gui->start_vicon_drawing(); +} + +void AssetVIconThread::set_view_popup(AssetVIcon *v) +{ + if( !v ) draw_mode = ASSET_VIEW_NONE; + VIconThread::set_view_popup(v); +} + +ViewPopup *AssetVIconThread::new_view_window(ViewPopup *vpopup) +{ + BC_WindowBase *parent = wdw->get_parent(); + int rx = 0, ry = 0, rw = 0, rh = 0; + if( draw_mode != ASSET_VIEW_FULL ) { + XineramaScreenInfo *info = parent->get_xinerama_info(-1); + int cx = info ? info->x_org + info->width/2 : parent->get_root_w(0)/2; + int cy = info ? info->y_org + info->height/2 : parent->get_root_h(0)/2; + int vx = viewing->get_vx(), vy = viewing->get_vy(); + wdw->get_root_coordinates(vx, vy, &rx, &ry); + rx += (rx >= cx ? -view_w+viewing->w/4 : viewing->w-viewing->w/4); + ry += (ry >= cy ? -view_h+viewing->h/4 : viewing->h-viewing->h/4); + rw = view_w; rh = view_h; + } + else + parent->get_fullscreen_geometry(rx, ry, rw, rh); + AssetViewPopup *av_popup = (AssetViewPopup *)vpopup; + if( av_popup ) + av_popup->reposition_window(rx, ry, rw, rh); + else + av_popup = new AssetViewPopup(this, draw_mode, rx, ry, rw, rh); + int playing_audio = gui->play_off ? -1 : 0; + if( !playing_audio ) { + switch( draw_mode ) { + case ASSET_VIEW_NONE: + case ASSET_VIEW_ICON: + case ASSET_VIEW_MEDIA_MAP: + case ASSET_VIEW_FULL: + playing_audio = -1; + break; + case ASSET_VIEW_MEDIA: + switch( gui->vicon_drawing ) { + case AVICON_SRC_TARGET: + case AVICON_NO_PLAY: + playing_audio = -1; + break; + } + } + } + vicon->playing_audio = playing_audio; + wdw->set_active_subwindow(av_popup); + return av_popup; +} + +void AssetVIconThread::stop_vicon_drawing(int wait) +{ + stop_drawing(); + gui->lock_window("AssetVIconThread::stop_vicon_drawing"); + gui->unlock_window(); +} + AWindowFolderItem::AWindowFolderItem() : BC_ListBoxItem() @@ -634,13 +874,16 @@ void AssetPicon::reset() vicon_frame = 0; in_use = 1; comments_time = 0; + comments_rate = -1; + comments_ffmt = ' '; + comments_type = ""; id = 0; persistent = 0; } void AssetPicon::open_render_engine(EDL *edl, int is_audio) { - TransportCommand command; + TransportCommand command(mwindow->preferences); command.command = is_audio ? NORMAL_FWD : CURRENT_FRAME; command.get_edl()->copy_all(edl); command.change_type = CHANGE_ALL; @@ -671,22 +914,46 @@ void AssetPicon::create_objects() char name[BCTEXTLEN]; int pixmap_w, pixmap_h; - pixmap_h = 50 * BC_WindowBase::get_resources()->icon_scale; + int picon_h = mwindow->preferences->awindow_picon_h; + pixmap_h = picon_h * BC_WindowBase::get_resources()->icon_scale; - if( indexable ) { - fs.extract_name(name, indexable->path); + Asset *asset = 0; + EDL *edl = 0; + int is_clip = 0; + + if( this->indexable ) { + char *cp = name; + if( this->indexable->is_asset ) { + asset = (Asset *)indexable; + if( asset->format == FILE_REF ) { + cp += sprintf(cp, "ref:"); + set_color(get_color() ^ 0x5599CC); + } + } + else { + edl = (EDL *)indexable; + cp += sprintf(cp, "edl:"); +// set_color(get_color() ^ 0xCC9955); + } + fs.extract_name(cp, indexable->path); set_text(name); } - else if( edl ) { - set_text(strcpy(name, edl->local_session->clip_title)); + else if( this->edl ) { + edl = this->edl; + strcpy(name, edl->local_session->clip_title); set_text(name); + is_clip = 1; } - if( indexable && indexable->is_asset ) { - Asset *asset = (Asset*)indexable; + if( asset ) { 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); @@ -710,11 +977,6 @@ void AssetPicon::create_objects() 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); @@ -725,7 +987,8 @@ void AssetPicon::create_objects() icon_vframe = new VFrame(0, -1, pixmap_w, pixmap_h, BC_RGB888, -1); icon_vframe->transfer_from(gui->temp_picon); - if( asset->folder_no == AW_MEDIA_FOLDER ) { + if( asset->folder_no == AW_MEDIA_FOLDER || + asset->folder_no == AW_PROXY_FOLDER ) { // vicon images double framerate = asset->get_frame_rate(); if( !framerate ) framerate = VICON_RATE; @@ -743,27 +1006,9 @@ void AssetPicon::create_objects() } gui->vicon_thread->add_vicon(vicon); } - else if( asset->folder_no == AW_PROXY_FOLDER ) { - char unproxy_path[BCTEXTLEN]; - int proxy_scale = mwindow->edl->session->proxy_scale; - if( !ProxyRender::from_proxy_path(unproxy_path, asset, proxy_scale) ) { - Asset *unproxy = mwindow->edl->assets->get_asset(unproxy_path); - if( unproxy ) { - int i = gui->assets.total; - while( --i >= 0 ) { - AssetPicon *picon = (AssetPicon*)gui->assets[i]; - if( picon->id == unproxy->id ) { - vicon = picon->vicon; - if( vicon ) vicon->add_user(); - break; - } - } - } - } - } - } else { + eprintf("Unable to open %s\nin asset: %s",asset->path, get_text()); gui->lock_window("AssetPicon::create_objects 2"); icon = gui->video_icon; icon_vframe = gui->video_vframe; @@ -826,6 +1071,7 @@ void AssetPicon::create_objects() 0, 0, pixmap_w, pixmap_h, 0, 0); } else { + eprintf("Unable to open %s\nin asset: %s",asset->path, get_text()); gui->lock_window("AssetPicon::create_objects 5"); icon = gui->audio_icon; icon_vframe = gui->audio_vframe; @@ -839,43 +1085,35 @@ void AssetPicon::create_objects() } struct stat st; comments_time = !stat(asset->path, &st) ? st.st_mtime : 0; + comments_rate = asset->get_frame_rate(); + comments_ffmt = asset->format == FILE_FFMPEG ? '=' : '-'; + comments_type = asset->format == FILE_FFMPEG ? + asset->vcodec : File::formattostr(asset->format); } - else - if( indexable && !indexable->is_asset ) { - icon = gui->video_icon; - icon_vframe = gui->video_vframe; - } - else - if( edl ) { + else if( edl ) { if( edl->tracks->playable_video_tracks() ) { if( mwindow->preferences->use_thumbnails ) { gui->unlock_window(); + AssetVIconThread *avt = gui->vicon_thread; char clip_icon_path[BCTEXTLEN]; char *clip_icon = edl->local_session->clip_icon; - if( clip_icon[0] ) { + VFrame *vframe = 0; + if( is_clip && clip_icon[0] ) { snprintf(clip_icon_path, sizeof(clip_icon_path), "%s/%s", File::get_config_path(), clip_icon); - icon_vframe = VFramePng::vframe_png(clip_icon_path); + vframe = VFramePng::vframe_png(clip_icon_path); } - if( !icon_vframe ) { + if( vframe && + ( vframe->get_w() != avt->vw || vframe->get_h() != avt->vh ) ) { + delete vframe; vframe = 0; + } + int edl_h = edl->get_h(), edl_w = edl->get_w(); + int height = edl_h > 0 ? edl_h : 1; + int width = edl_w > 0 ? edl_w : 1; + int color_model = edl->session->color_model; + if( !vframe ) { //printf("render clip: %s\n", name); - int edl_h = edl->get_h(), edl_w = edl->get_w(); - int height = edl_h > 0 ? edl_h : 1; - int width = edl_w > 0 ? edl_w : 1; - int color_model = edl->session->color_model; - pixmap_w = pixmap_h * width / height; - - if( gui->temp_picon && - (gui->temp_picon->get_color_model() != color_model || - gui->temp_picon->get_w() != width || - gui->temp_picon->get_h() != height) ) { - delete gui->temp_picon; gui->temp_picon = 0; - } - - if( !gui->temp_picon ) { - gui->temp_picon = new VFrame(0, -1, - width, height, color_model, -1); - } + VFrame::get_temp(gui->temp_picon, width, height, color_model); char string[BCTEXTLEN]; sprintf(string, _("Rendering %s"), name); mwindow->gui->lock_window("AssetPicon::create_objects"); @@ -884,24 +1122,30 @@ void AssetPicon::create_objects() open_render_engine(edl, 0); render_video(0, gui->temp_picon); close_render_engine(); - icon_vframe = new VFrame(0, - -1, pixmap_w, pixmap_h, BC_RGB888, -1); - icon_vframe->transfer_from(gui->temp_picon); - if( clip_icon[0] ) icon_vframe->write_png(clip_icon_path); - } - else { - pixmap_w = icon_vframe->get_w(); - pixmap_h = icon_vframe->get_h(); + vframe = new VFrame(avt->vw, avt->vh, BC_RGB888); + vframe->transfer_from(gui->temp_picon); + if( this->edl && clip_icon[0] ) + vframe->write_png(clip_icon_path); } + pixmap_w = pixmap_h * width / height; + vicon = new AssetVIcon(this, pixmap_w, pixmap_h, VICON_RATE, 1); + vicon->add_image(vframe, avt->vw, avt->vh, avt->vicon_cmodel); + icon_vframe = new VFrame(pixmap_w, pixmap_h, BC_RGB888); + icon_vframe->transfer_from(vframe); + delete vframe; gui->lock_window("AssetPicon::create_objects 0"); icon = new BC_Pixmap(gui, pixmap_w, pixmap_h); icon->draw_vframe(icon_vframe, 0, 0, pixmap_w, pixmap_h, 0, 0); } - else { + else if( is_clip ) { icon = gui->clip_icon; icon_vframe = gui->clip_vframe; } + else { + icon = gui->video_icon; + icon_vframe = gui->video_vframe; + } } else if( edl->tracks->playable_audio_tracks() ) { @@ -909,7 +1153,7 @@ void AssetPicon::create_objects() gui->unlock_window(); char clip_icon_path[BCTEXTLEN]; char *clip_icon = edl->local_session->clip_icon; - if( clip_icon[0] ) { + if( is_clip && clip_icon[0] ) { snprintf(clip_icon_path, sizeof(clip_icon_path), "%s/%s", File::get_config_path(), clip_icon); icon_vframe = VFramePng::vframe_png(clip_icon_path); @@ -945,7 +1189,8 @@ void AssetPicon::create_objects() base_colors[i], line_colors[i]); } for( int i=0; iwrite_png(clip_icon_path); + if( is_clip && clip_icon[0] ) + icon_vframe->write_png(clip_icon_path); } else { pixmap_w = icon_vframe->get_w(); @@ -955,14 +1200,17 @@ void AssetPicon::create_objects() icon->draw_vframe(icon_vframe, 0, 0, pixmap_w, pixmap_h, 0, 0); } - else { + else if( !indexable ) { icon = gui->clip_icon; icon_vframe = gui->clip_vframe; } + else { + icon = gui->audio_icon; + icon_vframe = gui->audio_vframe; + } } } - else - if( plugin ) { + else if( plugin ) { strcpy(name, _(plugin->title)); set_text(name); icon_vframe = plugin->get_picon(); @@ -1001,8 +1249,7 @@ void AssetPicon::create_objects() } } } - else - if( label ) { + else if( label ) { Units::totext(name, label->position, mwindow->edl->session->time_format, @@ -1025,7 +1272,7 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow) : BC_Window(_(PROGRAM_NAME ": Resources"), mwindow->session->awindow_x, mwindow->session->awindow_y, mwindow->session->awindow_w, mwindow->session->awindow_h, - 100, 100, 1, 1, 1) + xS(100), yS(100), 1, 1, 1) { this->mwindow = mwindow; this->awindow = awindow; @@ -1036,14 +1283,6 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow) video_vframe = 0; video_icon = 0; label_vframe = 0; label_icon = 0; - atransition_vframe = 0; atransition_icon = 0; - vtransition_vframe = 0; vtransition_icon = 0; - aeffect_vframe = 0; aeffect_icon = 0; - ladspa_vframe = 0; ladspa_icon = 0; - veffect_vframe = 0; veffect_icon = 0; - ff_aud_vframe = 0; ff_aud_icon = 0; - ff_vid_vframe = 0; ff_vid_icon = 0; - aeffect_folder_vframe = 0; aeffect_folder_icon = 0; atransition_folder_vframe = 0; atransition_folder_icon = 0; clip_folder_vframe = 0; clip_folder_icon = 0; @@ -1077,11 +1316,15 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow) remove_plugin = 0; vicon_thread = 0; vicon_audio = 0; - vicon_drawing = 1; + vicon_drawing = AVICON_FULL_PLAY; + play_off = 0; + tip_info = 0; displayed_folder = AW_NO_FOLDER; new_folder_thread = 0; modify_folder_thread = 0; folder_lock = new Mutex("AWindowGUI::folder_lock"); +// *** CONTEXT_HELP *** + context_help_set_keyword("Resources Window"); } AWindowGUI::~AWindowGUI() @@ -1196,6 +1439,7 @@ void AWindowGUI::plugin_icon(VFrame *&vfrm, BC_Pixmap *&icon, const char *fn, un void AWindowGUI::create_objects() { + int ys5 = yS(5), ys10 = yS(10); lock_window("AWindowGUI::create_objects"); asset_titles[0] = C_("Title"); asset_titles[1] = _("Comments"); @@ -1256,13 +1500,13 @@ void AWindowGUI::create_objects() int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y; int w1 = mwindow->theme->alist_w, h1 = mwindow->theme->alist_h; - search_text = new AWindowSearchText(mwindow, this, x1, y1+5); + search_text = new AWindowSearchText(mwindow, this, x1, y1+ys5); search_text->create_objects(); - int dy = search_text->get_h() + 10; + int dy = search_text->get_h() + ys10; y1 += dy; h1 -= dy; add_subwindow(asset_list = new AWindowAssets(mwindow, this, x1, y1, w1, h1)); - vicon_thread = new AssetVIconThread(asset_list); + vicon_thread = new AssetVIconThread(this, mwindow->preferences); asset_list->update_vicon_area(); vicon_thread->start(); vicon_audio = new AssetVIconAudio(this); @@ -1275,9 +1519,16 @@ void AWindowGUI::create_objects() int fx = mwindow->theme->afolders_x, fy = mwindow->theme->afolders_y; int fw = mwindow->theme->afolders_w, fh = mwindow->theme->afolders_h; - VFrame **images = mwindow->theme->get_image_set("playpatch_data"); - AVIconDrawing::calculate_geometry(this, images, &avicon_w, &avicon_h); - add_subwindow(avicon_drawing = new AVIconDrawing(this, fw-avicon_w, fy, images)); + int n = sizeof(AVIconDrawing::avicon_names)/sizeof(AVIconDrawing::avicon_names[0]); + int tw = 0; const char **av_names = AVIconDrawing::avicon_names; + for( int i=0; icreate_objects(); add_subwindow(add_tools = new AddTools(mwindow, this, fx, fy, _("Visibility"))); add_tools->create_objects(); fy += add_tools->get_h(); fh -= add_tools->get_h(); @@ -1363,10 +1614,11 @@ int AWindowGUI::translation_event() void AWindowGUI::reposition_objects() { + int ys5 = yS(5), ys10 = yS(10); int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y; int w1 = mwindow->theme->alist_w, h1 = mwindow->theme->alist_h; - search_text->reposition_window(x1, y1+5, w1); - int dy = search_text->get_h() + 10; + search_text->reposition_window(x1, y1+ys5, w1); + int dy = search_text->get_h() + ys10; y1 += dy; h1 -= dy; asset_list->reposition_window(x1, y1, w1, h1); divider->reposition_window( @@ -1375,7 +1627,7 @@ void AWindowGUI::reposition_objects() int fx = mwindow->theme->afolders_x, fy = mwindow->theme->afolders_y; int fw = mwindow->theme->afolders_w, fh = mwindow->theme->afolders_h; add_tools->resize_event(fw-avicon_w, add_tools->get_h()); - avicon_drawing->reposition_window(fw-avicon_w, fy); + avicon_drawing->reposition_window(fw-avicon_drawing->get_w(), fy); fy += add_tools->get_h(); fh -= add_tools->get_h(); folder_list->reposition_window(fx, fy, fw, fh); } @@ -1384,6 +1636,7 @@ int AWindowGUI::save_defaults(BC_Hash *defaults) { defaults->update("PLUGIN_VISIBILTY", plugin_visibility); defaults->update("VICON_DRAWING", vicon_drawing); + defaults->update("TIP_INFO", tip_info); return 0; } @@ -1391,6 +1644,7 @@ int AWindowGUI::load_defaults(BC_Hash *defaults) { plugin_visibility = defaults->get("PLUGIN_VISIBILTY", plugin_visibility); vicon_drawing = defaults->get("VICON_DRAWING", vicon_drawing); + tip_info = defaults->get("TIP_INFO", tip_info); return 0; } @@ -1410,11 +1664,23 @@ int AWindowGUI::close_event() return 1; } -void AWindowGUI::start_vicon_drawing() +int AWindowGUI::start_vicon_drawing() { - if( !vicon_drawing || !vicon_thread->interrupted ) return; + if( play_off ) return stop_vicon_drawing(); + if( !vicon_thread->interrupted ) return 1; + switch( vicon_drawing ) { + case AVICON_FULL_PLAY: // all vicons, viewing, target + break; + case AVICON_MOUSE_OVER: // one vicon, viewing, target + if( vicon_thread->solo ) break; + // fall thru + case AVICON_SRC_TARGET: // no vicons, no view, target + case AVICON_NO_PLAY: // no vicons, no view, no target + return 0; + } if( mwindow->edl->session->awindow_folder == AW_MEDIA_FOLDER || mwindow->edl->session->awindow_folder == AW_PROXY_FOLDER || + mwindow->edl->session->awindow_folder == AW_CLIP_FOLDER || mwindow->edl->session->awindow_folder >= AWINDOW_USER_FOLDERS ) { switch( mwindow->edl->session->assetlist_format ) { case ASSETS_ICONS: @@ -1427,14 +1693,16 @@ void AWindowGUI::start_vicon_drawing() break; } } + return 1; } -void AWindowGUI::stop_vicon_drawing() +int AWindowGUI::stop_vicon_drawing(int wait) { - if( vicon_thread->interrupted ) return; - vicon_thread->stop_drawing(); + vicon_thread->stop_vicon_drawing(wait); + return 0; } + VFrame *AssetPicon::get_vicon_frame() { if( !vicon ) return 0; @@ -1442,7 +1710,7 @@ VFrame *AssetPicon::get_vicon_frame() VFrame *frame = vicon->frame(); if( !frame ) return 0; if( !vicon_frame ) - vicon_frame = new VFrame(vicon->vw, vicon->vh, frame->get_color_model()); + vicon_frame = new VFrame(vicon->w, vicon->h, frame->get_color_model()); vicon_frame->transfer_from(frame); return vicon_frame; } @@ -1475,10 +1743,18 @@ int AWindowGUI::cycle_assetlist_format() return 1; } +void AWindowGUI::hide_tip_info() +{ + asset_list->hide_tooltip(); +} + + AWindowRemovePluginGUI:: AWindowRemovePluginGUI(AWindow *awindow, AWindowRemovePlugin *thread, int x, int y, PluginServer *plugin) - : BC_Window(_(PROGRAM_NAME ": Remove plugin"), x,y, 500,200, 50, 50, 1, 0, 1, -1, "", 1) + : BC_Window(_(PROGRAM_NAME ": Remove plugin"), x,y, + xS(500),yS(200), xS(50), yS(50), + 1, 0, 1, -1, "", 1) { this->awindow = awindow; this->thread = thread; @@ -1486,6 +1762,8 @@ AWindowRemovePluginGUI(AWindow *awindow, AWindowRemovePlugin *thread, VFrame *vframe = plugin->get_picon(); icon = vframe ? create_pixmap(vframe) : 0; plugin_list.append(new BC_ListBoxItem(plugin->title, icon)); +// *** CONTEXT_HELP *** + context_help_set_keyword("Delete Plugins to save Resources Space"); } AWindowRemovePluginGUI:: @@ -1498,17 +1776,19 @@ AWindowRemovePluginGUI:: void AWindowRemovePluginGUI::create_objects() { + int xs10 = xS(10), xs20 = xS(20); + int ys5 = yS(5), ys10 = yS(10); lock_window("AWindowRemovePluginGUI::create_objects"); BC_Button *ok_button = new BC_OKButton(this); add_subwindow(ok_button); BC_Button *cancel_button = new BC_CancelButton(this); add_subwindow(cancel_button); - int x = 10, y = 10; + int x = xs10, y = ys10; BC_Title *title = new BC_Title(x, y, _("remove plugin?")); add_subwindow(title); - y += title->get_h() + 5; + y += title->get_h() + ys5; list = new BC_ListBox(x, y, - get_w() - 20, ok_button->get_y() - y - 5, LISTBOX_TEXT, &plugin_list, + get_w() - xs20, ok_button->get_y() - y - ys5, LISTBOX_TEXT, &plugin_list, 0, 0, 1, 0, 0, LISTBOX_SINGLE, ICON_LEFT, 0); add_subwindow(list); show_window(); @@ -1597,6 +1877,8 @@ BC_Window* AWindowRemovePlugin::new_gui() int AWindowGUI::keypress_event() { + char title[BCTEXTLEN]; + PluginServer* plugin = 0; switch( get_keypress() ) { case 'w': case 'W': if( ctrl_down() ) { @@ -1604,6 +1886,10 @@ int AWindowGUI::keypress_event() return 1; } break; + case 'i': + tip_info = !tip_info ? 1 : 0; + if( !tip_info ) hide_tip_info(); + return 1; case 'o': if( !ctrl_down() && !shift_down() ) { assetlist_menu->load_file->handle_event(); @@ -1614,7 +1900,7 @@ int AWindowGUI::keypress_event() return cycle_assetlist_format(); case DELETE: if( shift_down() && ctrl_down() ) { - PluginServer* plugin = selected_plugin(); + plugin = selected_plugin(); if( !plugin ) break; remove_plugin = new AWindowRemovePlugin(awindow, plugin); unlock_window(); @@ -1628,7 +1914,7 @@ int AWindowGUI::keypress_event() return 1; } unlock_window(); - mwindow->remove_assets_from_project(1, 1, + mwindow->remove_assets_from_project(1, 1, 1, mwindow->session->drag_assets, mwindow->session->drag_clips); lock_window("AWindowGUI::keypress_event 2"); @@ -1643,7 +1929,30 @@ int AWindowGUI::keypress_event() } break; } - return 0; +// *** CONTEXT_HELP *** + if( get_keypress() != 'h' || ! alt_down() ) return 0; + if( ! is_tooltip_event_win() || ! cursor_inside() ) return 0; + // If some plugin is selected, show its help + // Otherwise show general help + plugin = selected_plugin(); + if( plugin ) { + strcpy(title, plugin->title); + if( ! strcmp(title, "Overlay") ) { + // "Overlay" plugin title is ambiguous + if( plugin->audio ) strcat(title, " \\(Audio\\)"); + if( plugin->video ) strcat(title, " \\(Video\\)"); + } + if( plugin->is_ffmpeg() ) { + // FFmpeg plugins can be audio or video + if( plugin->audio ) + strcpy(title, "FFmpeg Audio Plugins"); + if( plugin->video ) + strcpy(title, "FFmpeg Video Plugins"); + } + context_help_show(title); + } + else context_help_show("Resources Window"); + return 1; } @@ -1797,6 +2106,21 @@ void AWindowGUI::update_asset_list() 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); + } + } } } @@ -1847,9 +2171,13 @@ void AWindowGUI::update_asset_list() continue; } if( picon->indexable && picon->indexable->is_asset ) { + Asset *asset = (Asset *)picon->indexable; struct stat st; - picon->comments_time = !stat(picon->indexable->path, &st) ? - st.st_mtime : 0; + picon->comments_time = !stat(asset->path, &st) ? st.st_mtime : 0; + picon->comments_rate = asset->get_frame_rate(); + picon->comments_ffmt = asset->format == FILE_FFMPEG ? '=' : '-'; + picon->comments_type = asset->format == FILE_FFMPEG ? + asset->vcodec : File::formattostr(asset->format); } } } @@ -1917,14 +2245,16 @@ void AWindowGUI::sort_folders() 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(); @@ -1933,7 +2263,7 @@ EDL *AWindowGUI::collect_proxy(Indexable *indexable) 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 ? @@ -1947,11 +2277,15 @@ EDL *AWindowGUI::collect_proxy(Indexable *indexable) 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; @@ -1967,7 +2301,7 @@ void AWindowGUI::collect_assets(int proxy) 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; } @@ -2035,9 +2369,11 @@ void AWindowGUI::copy_picons(AssetPicon *picon, ArrayList *src) else if( picon->comments_time ) { char date_time[BCSTRLEN]; struct tm stm; localtime_r(&picon->comments_time, &stm); - sprintf(date_time,"%04d.%02d.%02d %02d:%02d:%02d", + sprintf(date_time,"%04d.%02d.%02d %02d:%02d:%02d @%0.2f %c%s", stm.tm_year+1900, stm.tm_mon+1, stm.tm_mday, - stm.tm_hour, stm.tm_min, stm.tm_sec); + stm.tm_hour, stm.tm_min, stm.tm_sec, + picon->comments_rate, picon->comments_ffmt, + picon->comments_type); dst[1].append(item2 = new BC_ListBoxItem(date_time)); } else @@ -2226,7 +2562,7 @@ int AWindowDivider::button_press_event() int AWindowDivider::cursor_motion_event() { if( mwindow->session->current_operation == DRAG_PARTITION ) { - int wmin = 25; + int wmin = xS(25); int wmax = mwindow->session->awindow_w - mwindow->theme->adivider_w - wmin; int fw = gui->get_relative_cursor_x(); if( fw > wmax ) fw = wmax; @@ -2297,7 +2633,7 @@ int AWindowFolders::selection_changed() gui->stop_vicon_drawing(); - if( get_button_down() && get_buttonpress() == 3 ) { + if( get_button_down() && get_buttonpress() == RIGHT_BUTTON ) { gui->folderlist_menu->update_titles(); gui->folderlist_menu->activate_menu(); } @@ -2313,19 +2649,18 @@ int AWindowFolders::selection_changed() int AWindowFolders::button_press_event() { - int result = 0; - - result = BC_ListBox::button_press_event(); + gui->hide_tip_info(); + int result = BC_ListBox::button_press_event(); if( !result ) { - if( get_buttonpress() == 3 && is_event_win() && cursor_inside() ) { + if( get_buttonpress() == RIGHT_BUTTON && + is_event_win() && cursor_inside() ) { gui->folderlist_menu->update_titles(); gui->folderlist_menu->activate_menu(); result = 1; } } - return result; } @@ -2362,12 +2697,18 @@ int AWindowFolders::load_expanders() 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; @@ -2436,9 +2777,9 @@ AWindowAssets::AWindowAssets(MWindow *mwindow, AWindowGUI *gui, int x, int y, in { this->mwindow = mwindow; this->gui = gui; + this->info_tip = -1; set_drag_scroll(0); set_scroll_stretch(1, 1); - draw_func = 0; } AWindowAssets::~AWindowAssets() @@ -2447,11 +2788,24 @@ AWindowAssets::~AWindowAssets() int AWindowAssets::button_press_event() { - int result = 0; + hide_tip_info(); + AssetVIconThread *avt = gui->vicon_thread; + if( avt->draw_mode != ASSET_VIEW_NONE && is_event_win() ) { + int dir = 1, button = get_buttonpress(); + switch( button ) { + case WHEEL_DOWN: dir = -1; // fall thru + case WHEEL_UP: { + int x = get_cursor_x(), y = get_cursor_y(); + if( avt->cursor_inside(x, y) && avt->view_win ) + avt->zoom_scale(dir); + return 1; } + } + } - result = BC_ListBox::button_press_event(); + int result = BC_ListBox::button_press_event(); - if( !result && get_buttonpress() == 3 && is_event_win() && cursor_inside() ) { + if( !result && get_buttonpress() == RIGHT_BUTTON && + is_event_win() && cursor_inside() ) { BC_ListBox::deactivate_selection(); int folder = mwindow->edl->session->awindow_folder; switch( folder ) { @@ -2509,8 +2863,8 @@ int AWindowAssets::handle_event() 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; } @@ -2523,9 +2877,9 @@ int AWindowAssets::selection_changed() { // Show popup window AssetPicon *item; - if( get_button_down() && get_buttonpress() == 3 && + int folder = mwindow->edl->session->awindow_folder; + if( get_button_down() && get_buttonpress() == RIGHT_BUTTON && (item = (AssetPicon*)get_selection(0, 0)) ) { - int folder = mwindow->edl->session->awindow_folder; switch( folder ) { case AW_AEFFECT_FOLDER: case AW_VEFFECT_FOLDER: @@ -2557,87 +2911,57 @@ int AWindowAssets::selection_changed() deactivate_selection(); } - else if( gui->vicon_drawing && get_button_down() && - ( get_buttonpress() == 1 || get_buttonpress() == 2 ) && - ( mwindow->edl->session->awindow_folder == AW_MEDIA_FOLDER || - mwindow->edl->session->awindow_folder == AW_PROXY_FOLDER || - mwindow->edl->session->awindow_folder >= AWINDOW_USER_FOLDERS ) && - (item = (AssetPicon*)get_selection(0, 0)) != 0 ) { - VIcon *vicon = 0; - if( !gui->vicon_thread->vicon ) { - vicon = item->vicon; - } - if( vicon && get_buttonpress() == 2 ) { - vicon->playing_audio = -1; - draw_func = AWindowAssets::draw_vframe; + 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 - draw_func = 0; - gui->vicon_thread->set_view_popup(vicon, draw_func); } - return 1; -} - -void AWindowAssets::draw_vframe(BC_WindowBase *wdw, VFrame *vframe) -{ - int y1 = VIEW_POPUP_BAR_H; - int y2 = wdw->get_h()-VIEW_POPUP_BAR_H; - wdw->set_color(BLACK); - wdw->draw_box(0,0,wdw->get_w(),wdw->get_h()); - wdw->draw_vframe(vframe, 0,y1, wdw->get_w(),y2-y1); - ViewPopup *view_popup = (ViewPopup *)wdw; - AssetVIconThread *vt = (AssetVIconThread *)view_popup->vt; - AssetVIcon *vicon = (AssetVIcon *)vt->vicon; - AssetPicon *picon = (AssetPicon *)vicon->picon; - Indexable *idxbl = - picon->indexable ? picon->indexable : - picon->edl ? picon->edl : 0; - if( !idxbl ) return; - double sample_rate = idxbl->get_sample_rate(); - double audio_length = sample_rate > 0 && idxbl->have_audio() ? - idxbl->get_audio_samples() / sample_rate : 0; - double frame_rate = idxbl->get_frame_rate(); - double video_length = frame_rate > 0 && idxbl->have_video() ? - idxbl->get_video_frames() / frame_rate : 0; - double idxbl_length = bmax(audio_length, video_length); - if( !idxbl_length ) idxbl_length = 1; - - EDL *edl = picon->mwindow->edl; - double total_length = edl->tracks->total_length(); - if( !total_length ) total_length = 1; - for( Track *track=edl->tracks->first; track!=0; track=track->next ) { - for( Edit *edit=track->edits->first; edit!=0; edit=edit->next ) { - Indexable *indexable = (Indexable *)edit->asset; - if( !indexable ) indexable = (Indexable *)edit->nested_edl; - if( !indexable ) continue; - if( indexable->id == idxbl->id || - (!indexable->is_asset == !idxbl->is_asset && - !strcmp(indexable->path, idxbl->path)) ) { - double pos1 = track->from_units(edit->startsource); - double pos2 = track->from_units(edit->startsource + edit->length); - double xscale = wdw->get_w() / idxbl_length; - int ex1 = pos1 * xscale, ex2 = pos2 * xscale; - wdw->set_color(WHITE); - wdw->draw_box(ex1,0, ex2-ex1,y1); - wdw->set_color(BLACK); - wdw->draw_line(ex1,0, ex1,y1); - wdw->draw_line(ex2,0, ex2,y1); - pos1 = track->from_units(edit->startproject); - pos2 = track->from_units(edit->startproject + edit->length); - xscale = wdw->get_w() / total_length; - int px1 = pos1 * xscale, px2 = pos2 * xscale; - wdw->set_color(RED); - wdw->draw_box(px1,y2, px2-px1,wdw->get_h()-y2); - wdw->set_color(BLACK); - wdw->draw_line(px1,y2, px1,wdw->get_h()-1); - wdw->draw_line(px2,y2, px2,wdw->get_h()-1); - - wdw->set_color(YELLOW); - wdw->draw_line(ex1,y1, px1,y2); - wdw->draw_line(ex2,y1, px2,y2); + else if( get_button_down() && !gui->play_off && + mwindow->edl->session->assetlist_format != ASSETS_TEXT ) { + item = (AssetPicon*)get_selection(0, 0); + if( item && !get_selection(0, 1) ) { + switch( folder ) { + case AW_MEDIA_FOLDER: + case AW_PROXY_FOLDER: + case AWINDOW_USER_FOLDERS: + if( get_buttonpress() == LEFT_BUTTON || + get_buttonpress() == MIDDLE_BUTTON ) { + AssetVIcon *vicon = 0; + AssetVIconThread *avt = gui->vicon_thread; + if( !avt->vicon && gui->vicon_drawing != AVICON_NO_PLAY ) + vicon = item->vicon; + int draw_mode = !vicon ? + ASSET_VIEW_NONE : + get_buttonpress() == MIDDLE_BUTTON ? + ASSET_VIEW_MEDIA_MAP : ASSET_VIEW_MEDIA; + avt->set_view_popup(vicon, draw_mode); + } + break; + case AW_CLIP_FOLDER: + if( get_buttonpress() == LEFT_BUTTON ) { + AssetVIcon *vicon = 0; + AssetVIconThread *avt = gui->vicon_thread; + if( !avt->vicon && gui->vicon_drawing != AVICON_NO_PLAY ) + vicon = item->vicon; + gui->vicon_thread->set_view_popup(vicon, ASSET_VIEW_ICON); + } + break; } } + else { + gui->vicon_thread->set_view_popup(0); + if( gui->vicon_drawing != AVICON_FULL_PLAY ) + gui->stop_vicon_drawing(); + } } + return 1; } void AWindowAssets::draw_background() @@ -2647,12 +2971,13 @@ void AWindowAssets::draw_background() set_font(LARGEFONT); int folder = mwindow->edl->session->awindow_folder; const char *title = mwindow->edl->get_folder_name(folder); - draw_text(get_w() - get_text_width(LARGEFONT, title) - 4, 30, + draw_text(get_w() - get_text_width(LARGEFONT, title) - xS(4), yS(30), title, -1, get_bg_surface()); } int AWindowAssets::drag_start_event() { + gui->vicon_thread->set_view_popup(0); int collect_pluginservers = 0; int collect_assets = 0, proxy = 0; @@ -2805,34 +3130,38 @@ int AWindowAssets::column_resize_event() return 1; } -int AWindowAssets::focus_in_event() -{ - int ret = BC_ListBox::focus_in_event(); - gui->start_vicon_drawing(); - return ret; -} - -int AWindowAssets::focus_out_event() -{ - gui->stop_vicon_drawing(); - return BC_ListBox::focus_out_event(); -} - int AWindowAssets::cursor_enter_event() { int ret = BC_ListBox::cursor_enter_event(); - gui->start_vicon_drawing(); + switch( gui->vicon_drawing ) { + case AVICON_FULL_PLAY: + gui->start_vicon_drawing(); + break; + case AVICON_MOUSE_OVER: + case AVICON_SRC_TARGET: + case AVICON_NO_PLAY: + default: + break; + } return ret; } int AWindowAssets::cursor_leave_event() { - VIcon *vicon = gui->vicon_thread->vicon; - if( vicon && vicon->playing_audio >= 0 ) + hide_tip_info(); + if( !is_event_win() ) return 0; + if( !gui->vicon_thread->viewing ) gui->stop_vicon_drawing(); return BC_ListBox::cursor_leave_event(); } +int AWindowAssets::focus_out_event() +{ + gui->stop_vicon_drawing(); + gui->vicon_thread->set_view_popup(0); + return BC_ListBox::focus_out_event(); +} + void AWindowAssets::update_vicon_area() { int x0 = 0, x1 = get_w(); @@ -2847,16 +3176,151 @@ void AWindowAssets::update_vicon_area() int AWindowAssets::mouse_over_event(int no) { - if( gui->vicon_thread->viewing && - no >= 0 && no < gui->displayed_assets[0].size() ) { - AssetPicon *picon = (AssetPicon *)gui->displayed_assets[0][no]; - VIcon *vicon = picon->vicon; - if( gui->vicon_thread->vicon && - gui->vicon_thread->vicon->playing_audio < 0 ) - vicon->playing_audio = -1; - picon->gui->vicon_thread->set_view_popup(vicon, draw_func); + AssetPicon *picon = no >= 0 && no < gui->displayed_assets[0].size() ? + (AssetPicon *)gui->displayed_assets[0][no] : 0; + AssetVIcon *vicon = !picon ? 0 : picon->vicon; + switch( gui->vicon_drawing ) { + case AVICON_FULL_PLAY: + gui->vicon_thread->solo = 0; + if( vicon && gui->vicon_thread->viewing ) + gui->vicon_thread->set_view_popup(vicon); + break; + case AVICON_MOUSE_OVER: + if( !vicon ) break; + gui->vicon_thread->solo = vicon; + gui->start_vicon_drawing(); + // fall thru + case AVICON_SRC_TARGET: + if( !vicon ) break; + if( gui->vicon_thread->viewing ) + gui->vicon_thread->set_view_popup(vicon); + break; + case AVICON_NO_PLAY: + default: + break; } - return 0; + if( no < 0 && info_tip >= 0 ) { + hide_tip_info(); + } + if( gui->tip_info && no >= 0 && + info_tip != no && picon && picon->plugin ) { + const char *info = picon->plugin->tip; + if( !info ) info = _("No info available"); + show_tip_info(info, no); + } + return 1; +} + +void AWindowAssets::show_tip_info(const char *info, int no) +{ + int tw = get_text_width(MEDIUMFONT, info) + TOOLTIP_MARGIN * 2; + int th = get_text_height(MEDIUMFONT, info) + TOOLTIP_MARGIN * 2; + int tx = get_w() - (tw + xS(28)); + int ty = get_h() - (th + yS(28)); + show_tooltip(info, tx, ty, tw, th); + info_tip = no; +} + +void AWindowAssets::hide_tip_info() +{ + hide_tooltip(); + info_tip = -1; +} + +// *** CONTEXT_HELP *** +int AWindowAssets::keypress_event() +{ + int item; + char title[BCTEXTLEN]; + AssetPicon *picon = 0; + PluginServer *plugin = 0; + +// printf("AWindowAssets::keypress_event: %d\n", get_keypress()); + + // If not our context help keystroke, redispatch it + // to the event handler of the base class + if (get_keypress() != 'h' || ! alt_down() || + ! is_tooltip_event_win() || ! cursor_inside()) + return BC_ListBox::keypress_event(); + + switch (mwindow->edl->session->awindow_folder) { + + case AW_AEFFECT_FOLDER: + case AW_VEFFECT_FOLDER: + case AW_ATRANSITION_FOLDER: + case AW_VTRANSITION_FOLDER: + // If plugin tips activated, show help for plugin under mouse + // Otherwise show help for the selected plugin + if (gui->tip_info) { + item = BC_ListBox::get_highlighted_item(); + if (item >= 0 && item < gui->displayed_assets[0].size()) { + picon = (AssetPicon *) gui->displayed_assets[0][item]; + if (picon) plugin = picon->plugin; + } + } + else plugin = gui->selected_plugin(); + // If some plugin is highlighted or selected, show its help + // Otherwise show more general help + if (plugin) { + strcpy(title, plugin->title); + if (! strcmp(title, "Overlay")) { + // "Overlay" plugin title is ambiguous + if (plugin->audio) + strcat(title, " \\(Audio\\)"); + if (plugin->video) + strcat(title, " \\(Video\\)"); + } + if (plugin->is_ffmpeg()) { + // FFmpeg plugins can be audio or video + if (plugin->audio) + strcpy(title, "FFmpeg Audio Plugins"); + if (plugin->video) + strcpy(title, "FFmpeg Video Plugins"); + } + context_help_show(title); + return 1; + } + else { + switch (mwindow->edl->session->awindow_folder) { + case AW_AEFFECT_FOLDER: + context_help_show("Audio Effects"); + return 1; + case AW_VEFFECT_FOLDER: + context_help_show("Video Effects"); + return 1; + case AW_ATRANSITION_FOLDER: + context_help_show("Audio Transitions"); + return 1; + case AW_VTRANSITION_FOLDER: + context_help_show("Video Transitions"); + return 1; + default: + context_help_show("Resources Window"); + return 1; + } + context_help_show("Resources Window"); + return 1; + } + + case AW_LABEL_FOLDER: + context_help_show("Labels"); + return 1; + + case AW_CLIP_FOLDER: + context_help_show("Nested Clips"); + return 1; + + case AW_PROXY_FOLDER: + context_help_show("Proxy"); + return 1; + + default: + context_help_show("Resources Window"); + return 1; + } + + context_help_show("Resources Window"); + return 1; } @@ -2881,10 +3345,11 @@ AWindowSearchText::AWindowSearchText(MWindow *mwindow, AWindowGUI *gui, int x, i void AWindowSearchText::create_objects() { - int x1 = x, y1 = y, margin = 10; + int xs10 = xS(10); + int x1 = x, y1 = y; gui->add_subwindow(text_title = new BC_Title(x1, y1, _("Search:"))); - x1 += text_title->get_w() + margin; - int w1 = gui->get_w() - x1 - 2*margin; + x1 += text_title->get_w() + xs10; + int w1 = gui->get_w() - x1 - 2*xs10; gui->add_subwindow(text_box = new AWindowSearchTextBox(this, x1, y1, w1)); } @@ -2896,7 +3361,7 @@ int AWindowSearchText::handle_event() int AWindowSearchText::get_w() { - return text_box->get_w() + text_title->get_w() + 10; + return text_box->get_w() + text_title->get_w() + xS(10); } int AWindowSearchText::get_h() @@ -2906,10 +3371,11 @@ int AWindowSearchText::get_h() void AWindowSearchText::reposition_window(int x, int y, int w) { - int x1 = x, y1 = y, margin = 10; + int xs10 = xS(10); + int x1 = x, y1 = y; text_title->reposition_window(x1, y1); - x1 += text_title->get_w() + margin; - int w1 = gui->get_w() - x1 - 2*margin; + x1 += text_title->get_w() + xs10; + int w1 = gui->get_w() - x1 - 2*xs10; text_box->reposition_window(x1, y1, w1); } @@ -3018,7 +3484,7 @@ int AWindowView::handle_event() } AddTools::AddTools(MWindow *mwindow, AWindowGUI *gui, int x, int y, const char *title) - : BC_PopupMenu(x, y, BC_Title::calculate_w(gui, title, MEDIUMFONT)+8, title, -1, 0, 4) + : BC_PopupMenu(x, y, title, -1, 0) { this->mwindow = mwindow; this->gui = gui; @@ -3089,36 +3555,71 @@ int AddPluginItem::handle_event() return 1; } -AVIconDrawing::AVIconDrawing(AWindowGUI *agui, int x, int y, VFrame **images) - : BC_Toggle(x, y, images, agui->vicon_drawing) +AVIconDrawingItem::AVIconDrawingItem(AVIconDrawing *avicon, const char *text, int id) + : BC_MenuItem(text) { - this->agui = agui; - set_tooltip(_("Preview")); + this->avicon = avicon; + this->id = id; +} + +int AVIconDrawingItem::handle_event() +{ + for( int i=0; iget_item(i); + item->set_checked(id == i); + } + AWindowGUI *agui = avicon->agui; + agui->play_off = 0; + avicon->set_text(get_text()); + agui->stop_vicon_drawing(); + agui->vicon_thread->set_view_popup(0); + agui->vicon_thread->solo = 0; + agui->vicon_drawing = id; + agui->start_vicon_drawing(); + return 1; +} + +int AVIconDrawing::draw_face(int dx, int color) +{ + int ret = BC_PopupMenu::draw_face(dx, color); + if( agui->play_off && agui->vicon_drawing != AVICON_NO_PLAY ) { + int lx = get_margin(), ly = get_h()/2; + draw_line(lx,ly, get_w()-2*lx,ly); + } + return ret; } -void AVIconDrawing::calculate_geometry(AWindowGUI *agui, VFrame **images, int *ww, int *hh) +AVIconDrawing::AVIconDrawing(AWindowGUI *agui, int x, int y, int w, const char *text) + : BC_PopupMenu(x-w, y, w, text, 1, 0, 4) { - int text_line = -1, toggle_x = -1, toggle_y = -1; - int text_x = -1, text_y = -1, text_w = -1, text_h = -1; - BC_Toggle::calculate_extents(agui, images, 1, - &text_line, ww, hh, &toggle_x, &toggle_y, - &text_x, &text_y, &text_w, &text_h, "", MEDIUMFONT); + this->agui = agui; } AVIconDrawing::~AVIconDrawing() { } -int AVIconDrawing::handle_event() +void AVIconDrawing::create_objects() { - agui->vicon_drawing = get_value(); - if( agui->vicon_drawing ) - agui->start_vicon_drawing(); - else - agui->stop_vicon_drawing(); - return 1; + AVIconDrawingItem *item; + for( int i=0; iset_checked(agui->vicon_drawing == i); + } } +int AVIconDrawing::button_press_event() +{ + if( !is_event_win() ) return 0; + if( get_buttonpress() == MIDDLE_BUTTON ) { + agui->play_off = !agui->play_off ? 1 : 0; + draw_face(0, -1); + flash(1); + agui->start_vicon_drawing(); + return 1; + } + return BC_PopupMenu::button_press_event(); +} AWindowListFormat::AWindowListFormat(MWindow *mwindow, AWindowGUI *gui) : BC_MenuItem("","v",'v')