X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.C;h=218523974a544449663271b79888c6afc7163c59;hp=9f966f75f6a8116087033dd530b7abd62979aa85;hb=ae44cc4a24c9e04ee5e3b38baf6ce529832cfb39;hpb=c279e21fc2394a7908bbd1ba8c79b116fe9fb14a diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C index 9f966f75..21852397 100644 --- a/cinelerra-5.1/cinelerra/awindowgui.C +++ b/cinelerra-5.1/cinelerra/awindowgui.C @@ -153,6 +153,10 @@ VFrame *AssetVIcon::frame() 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); int64_t pos = images.size() / picon->gui->vicon_thread->refresh_rate * frame_rate; file->set_video_position(pos,0); @@ -173,12 +177,12 @@ int64_t AssetVIcon::set_seq_no(int64_t no) int AssetVIcon::get_vx() { BC_ListBox *lbox = picon->gui->asset_list; - return lbox->get_item_x(picon) + ICON_MARGIN; + return lbox->get_icon_x(picon); } int AssetVIcon::get_vy() { BC_ListBox *lbox = picon->gui->asset_list; - return lbox->get_item_y(picon) + ICON_MARGIN; + return lbox->get_icon_y(picon); } void AssetVIcon::load_audio() @@ -296,9 +300,51 @@ void AssetVIcon::stop_audio() playing_audio = 0; } + +AWindowFolderItem::AWindowFolderItem() + : BC_ListBoxItem() +{ + parent = 0; +} + +AWindowFolderItem::AWindowFolderItem(const char *text, int color) + : BC_ListBoxItem(text, color) +{ + parent = 0; +} + +AWindowFolderItem::AWindowFolderItem(const char *text, BC_Pixmap *icon, int color) + : BC_ListBoxItem(text, icon, color) +{ + parent = 0; +} + +AssetPicon *AWindowFolderItem::get_picon() +{ + AWindowFolderItem *item = this; + while( item->parent ) { item = (AWindowFolderItem*)item->parent; } + return (AssetPicon*)item; +} + +int AWindowFolderSubItems::matches(const char *text) +{ + int i = names.size(); + while( --i >= 0 && strcmp(names[i], text) ); + if( i < 0 ) { + ArrayList *sublist = get_sublist(); + i = sublist ? sublist->size() : 0; + while( --i >= 0 ) { + AWindowFolderSubItems *item = (AWindowFolderSubItems *)sublist->get(i); + if( item->matches(text) ) break; + } + } + return i >= 0 ? 1 : 0; +} + + AssetPicon::AssetPicon(MWindow *mwindow, AWindowGUI *gui, Indexable *indexable) - : BC_ListBoxItem() + : AWindowFolderItem() { reset(); this->mwindow = mwindow; @@ -310,7 +356,7 @@ AssetPicon::AssetPicon(MWindow *mwindow, AssetPicon::AssetPicon(MWindow *mwindow, AWindowGUI *gui, EDL *edl) - : BC_ListBoxItem() + : AWindowFolderItem() { reset(); this->mwindow = mwindow; @@ -322,9 +368,9 @@ AssetPicon::AssetPicon(MWindow *mwindow, AssetPicon::AssetPicon(MWindow *mwindow, AWindowGUI *gui, int folder, int persist) - : BC_ListBoxItem(_(AWindowGUI::folder_names[folder]), + : AWindowFolderItem(_(AWindowGUI::folder_names[folder]), folder>=0 && folderfolder_icons[folder]: gui->folder_icon) + gui->folder_icons[folder] : gui->folder_icon) { reset(); foldernum = folder; @@ -335,7 +381,7 @@ AssetPicon::AssetPicon(MWindow *mwindow, AssetPicon::AssetPicon(MWindow *mwindow, AWindowGUI *gui, int folder, const char *title) - : BC_ListBoxItem(title, gui->folder_icon) + : AWindowFolderItem(title, gui->folder_icon) { reset(); foldernum = folder; @@ -346,7 +392,7 @@ AssetPicon::AssetPicon(MWindow *mwindow, AssetPicon::AssetPicon(MWindow *mwindow, AWindowGUI *gui, PluginServer *plugin) - : BC_ListBoxItem() + : AWindowFolderItem() { reset(); this->mwindow = mwindow; @@ -356,7 +402,7 @@ AssetPicon::AssetPicon(MWindow *mwindow, AssetPicon::AssetPicon(MWindow *mwindow, AWindowGUI *gui, Label *label) - : BC_ListBoxItem() + : AWindowFolderItem() { reset(); this->mwindow = mwindow; @@ -371,6 +417,7 @@ AssetPicon::~AssetPicon() { if( vicon ) gui->vicon_thread->del_vicon(vicon); + delete vicon_frame; if( indexable ) indexable->remove_user(); if( edl ) edl->remove_user(); if( icon && !gui->protected_pixmap(icon) ) { @@ -431,11 +478,14 @@ void AssetPicon::reset() label = 0; indexable = 0; edl = 0; + parent = 0; + sub_items = 0; foldernum = AW_NO_FOLDER; sort_key = -1; icon = 0; icon_vframe = 0; vicon = 0; + vicon_frame = 0; in_use = 1; comments_time = 0; id = 0; @@ -1049,8 +1099,7 @@ void AWindowGUI::create_objects() add_subwindow(asset_list = new AWindowAssets(mwindow, this, x1, y1, w1, h1)); vicon_thread = new VIconThread(asset_list); - int x0 = 0, y0 = asset_list->get_title_h(); - vicon_thread->set_drawing_area(x0,y0, get_w(),get_h()); + asset_list->update_vicon_area(); vicon_thread->start(); vicon_audio = new AssetVIconAudio(this); @@ -1071,6 +1120,7 @@ void AWindowGUI::create_objects() add_subwindow(folder_list = new AWindowFolders(mwindow, this, fx, fy, fw, fh)); update_effects(); + folder_list->load_expanders(); //int x = mwindow->theme->abuttons_x; //int y = mwindow->theme->abuttons_y; @@ -1136,10 +1186,7 @@ int AWindowGUI::resize_event(int w, int h) // view->reposition_window(x, y); BC_WindowBase::resize_event(w, h); - int x0 = 0, x1 = asset_list->get_w(); - int y0 = asset_list->get_title_h(); - int y1 = asset_list->get_h(); - vicon_thread->set_drawing_area(x0,y0, x1,y1); + asset_list->update_vicon_area(); return 1; } @@ -1201,13 +1248,14 @@ int AWindowGUI::close_event() void AWindowGUI::start_vicon_drawing() { - if( !vicon_drawing ) return; + if( !vicon_drawing || !vicon_thread->interrupted ) return; if( mwindow->edl->session->awindow_folder == AW_MEDIA_FOLDER || mwindow->edl->session->awindow_folder >= AWINDOW_USER_FOLDERS ) { switch( mwindow->edl->session->assetlist_format ) { case ASSETS_ICONS: case ASSETS_ICONS_PACKED: case ASSETS_ICON_LIST: + asset_list->update_vicon_area(); vicon_thread->start_drawing(); break; default: @@ -1218,9 +1266,22 @@ void AWindowGUI::start_vicon_drawing() void AWindowGUI::stop_vicon_drawing() { + if( vicon_thread->interrupted ) return; vicon_thread->stop_drawing(); } +VFrame *AssetPicon::get_vicon_frame() +{ + if( !vicon ) return 0; + if( gui->vicon_thread->interrupted ) return 0; + 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->transfer_from(frame); + return vicon_frame; +} + int AWindowGUI::cycle_assetlist_format() { EDLSession *session = mwindow->edl->session; @@ -1244,11 +1305,6 @@ int AWindowGUI::cycle_assetlist_format() stop_vicon_drawing(); session->assetlist_format = format; asset_list->update_format(session->assetlist_format, 0); - int x0 = 0; - int x1 = asset_list->get_w(); - int y0 = asset_list->get_title_h(); - int y1 = asset_list->get_h(); - vicon_thread->set_drawing_area(x0,y0, x1,y1); async_update_assets(); start_vicon_drawing(); return 1; @@ -1688,8 +1744,12 @@ EDL *AWindowGUI::collect_proxy(Indexable *indexable) proxy_edl->session->audio_tracks = unproxy_asset->channels; proxy_edl->create_default_tracks(); double length = proxy_asset->frame_rate > 0 ? - (double)proxy_asset->video_length / proxy_asset->frame_rate : - 1.0 / mwindow->edl->session->frame_rate; + ( proxy_asset->video_length >= 0 ? + ( proxy_asset->video_length / proxy_asset->frame_rate ) : + ( proxy_edl->session->si_useduration ? + proxy_edl->session->si_duration : + 1.0 / proxy_asset->frame_rate ) ) : + 1.0 / proxy_edl->session->frame_rate; Track *current = proxy_edl->tracks->first; for( int vtrack=0; current; current=NEXT ) { if( current->data_type != TRACK_VIDEO ) continue; @@ -1706,17 +1766,18 @@ EDL *AWindowGUI::collect_proxy(Indexable *indexable) } -void AWindowGUI::collect_assets() +void AWindowGUI::collect_assets(int proxy) { mwindow->session->drag_assets->remove_all(); mwindow->session->drag_clips->remove_all(); int i = 0; AssetPicon *result; while( (result = (AssetPicon*)asset_list->get_selection(0, i++)) != 0 ) { Indexable *indexable = result->indexable; - if( indexable && indexable->is_asset && + if( proxy && indexable && indexable->is_asset && indexable->awindow_folder == AW_PROXY_FOLDER ) { EDL *drag_edl = collect_proxy(indexable); if( drag_edl ) mwindow->session->drag_clips->append(drag_edl); + continue; } if( indexable ) { mwindow->session->drag_assets->append(indexable); @@ -1735,6 +1796,17 @@ void AWindowGUI::copy_picons(ArrayList *dst, // Remove current pointers dst[0].remove_all(); dst[1].remove_all_objects(); + AWindowFolderSubItems *sub_items = 0; + if( folder >= 0 && folder < AW_LABEL_FOLDER ) { + AssetPicon *picon = 0; + for( int k=folders.size(); --k>=0; ) { + picon = (AssetPicon*)folders[k]; + if( picon->foldernum == folder ) break; + } + if( picon ) + sub_items = picon->sub_items; + folder = AW_NO_FOLDER; + } BinFolder *bin_folder = folder < AWINDOW_USER_FOLDERS ? 0 : mwindow->edl->get_folder(folder); @@ -1744,16 +1816,23 @@ void AWindowGUI::copy_picons(ArrayList *dst, AssetPicon *picon = (AssetPicon*)src->values[i]; picon->sort_key = -1; if( !visible && bin_folder ) { - Indexable *idxbl = bin_folder->is_clips ? picon->edl : picon->indexable; + Indexable *idxbl = bin_folder->is_clips ? (Indexable *)picon->edl : + picon->indexable ? picon->indexable : + picon->edl ? picon->edl->get_proxy_asset() : 0; if( idxbl ) { picon->sort_key = mwindow->edl->folders.matches_indexable(folder, idxbl); - if( picon->sort_key >= 0 ) visible = 1; + if( picon->sort_key < 0 ) continue; + visible = 1; } } if( !visible && picon->indexable && picon->indexable->awindow_folder == folder ) visible = 1; if( !visible && picon->edl && picon->edl->local_session->folder == folder ) visible = 1; + if( visible && sub_items ) { + if( !sub_items->matches(picon->get_text()) ) + visible = 0; + } if( visible ) { const char *text = search_text->get_text(); if( text && text[0] ) @@ -1823,19 +1902,20 @@ void AWindowGUI::filter_displayed_assets() //allow_iconlisting = 1; asset_titles[0] = C_("Title"); asset_titles[1] = _("Comments"); + int folder = mwindow->edl->session->awindow_folder; - switch( mwindow->edl->session->awindow_folder ) { + switch( folder ) { case AW_AEFFECT_FOLDER: - copy_picons(displayed_assets, &aeffects, AW_NO_FOLDER); + copy_picons(displayed_assets, &aeffects, folder); break; case AW_VEFFECT_FOLDER: - copy_picons(displayed_assets, &veffects, AW_NO_FOLDER); + copy_picons(displayed_assets, &veffects, folder); break; case AW_ATRANSITION_FOLDER: - copy_picons(displayed_assets, &atransitions, AW_NO_FOLDER); + copy_picons(displayed_assets, &atransitions, folder); break; case AW_VTRANSITION_FOLDER: - copy_picons(displayed_assets, &vtransitions, AW_NO_FOLDER); + copy_picons(displayed_assets, &vtransitions, folder); break; case AW_LABEL_FOLDER: copy_picons(displayed_assets, &labellist, AW_NO_FOLDER); @@ -1882,11 +1962,6 @@ void AWindowGUI::update_assets() if( mwindow->edl->session->assetlist_format != asset_list->get_format() ) { asset_list->update_format(mwindow->edl->session->assetlist_format, 0); - int x0 = 0; - int x1 = asset_list->get_w(); - int y0 = asset_list->get_title_h(); - int y1 = asset_list->get_h(); - vicon_thread->set_drawing_area(x0,y0, x1,y1); } int asset_xposition = asset_list->get_xposition(); int asset_yposition = asset_list->get_yposition(); @@ -2021,6 +2096,8 @@ AWindowFolders::AWindowFolders(MWindow *mwindow, AWindowGUI *gui, int x, int y, this->mwindow = mwindow; this->gui = gui; set_drag_scroll(0); + last_item0 = 0; + last_item1 = 0; } AWindowFolders::~AWindowFolders() @@ -2029,8 +2106,21 @@ AWindowFolders::~AWindowFolders() int AWindowFolders::selection_changed() { - AssetPicon *picon = (AssetPicon*)get_selection(0, 0); - if( picon ) { + AWindowFolderItem *item0 = (AWindowFolderItem*)get_selection(0, 0); + AWindowFolderItem *item1 = (AWindowFolderItem*)get_selection(0, 1); +// prefer expanded entry + AWindowFolderItem *item = item1 ? item1 : item0; + if( item0 && item1 && last_item0 == item0 && last_item1 == item1 ) { + item1->set_selected(0); + item1 = 0; + item = item0; + } + last_item0 = item0; + last_item1 = item1; + if( item ) { + AssetPicon *picon = item->get_picon(); + picon->sub_items = (AWindowFolderSubItems*)(!item->parent ? 0 : item); + gui->stop_vicon_drawing(); if( get_button_down() && get_buttonpress() == 3 ) { @@ -2078,7 +2168,7 @@ int AWindowFolders::drag_stop() ArrayList *drags = folder->is_clips ? ((ArrayList *)mwindow->session->drag_clips) : ((ArrayList *)mwindow->session->drag_assets); - if( folder && drags && !folder->add_patterns(drags) ) + if( folder && drags && !folder->add_patterns(drags, shift_down()) ) flicker(1,30); mwindow->session->current_operation = ::NO_OPERATION; result = 1; @@ -2087,6 +2177,72 @@ int AWindowFolders::drag_stop() return result; } +AWindowFolderSubItems::AWindowFolderSubItems(AWindowFolderItem *parent, const char *text) + : AWindowFolderItem(text) +{ + this->parent = parent; +} + +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); + fp = fopen(expanders_path, "r"); + } + + if( !fp ) return 1; + const char tab = '\t'; + char line[BCTEXTLEN]; line[0] = 0; + AWindowFolderItem *item = 0, *parent; + AWindowFolderSubItems *sub_items = 0; + int k = 0; + while( fgets(line,sizeof(line),fp) ) { + if( line[0] == '#' ) continue; + int i = strlen(line); + if( i > 0 && line[i-1] == '\n' ) line[--i] = 0; + if( i == 0 ) continue; + i = 0; + for( char *cp=line; *cp==tab; ++cp ) ++i; + if( i == 0 ) { + int i = gui->folders.size(); + while( --i >= 0 ) { + AssetPicon *folder = (AssetPicon *)gui->folders[i]; + if( !strcmp(folder->get_text(),_(line)) ) break; + } + item = (AWindowFolderItem*)(i >= 0 ? gui->folders[i] : 0); + sub_items = 0; + k = 0; + continue; + } + if( i > k+1 ) continue; + if( i == k+1 ) { + if( line[i] != '-' && sub_items ) { + sub_items->names.append(cstrdup(_(&line[i]))); + continue; + } + parent = item; + k = i; + } + else { + while( i < k ) { + item = item->parent; + --k; + } + parent = item->parent; + } + ArrayList *sublist = parent->get_sublist(); + if( !sublist ) sublist = parent->new_sublist(1); + sub_items = new AWindowFolderSubItems(parent, &line[i]); + sublist->append(item = sub_items); + } + fclose(fp); + return 0; +} + AWindowAssets::AWindowAssets(MWindow *mwindow, AWindowGUI *gui, int x, int y, int w, int h) : BC_ListBox(x, y, w, h, !gui->allow_iconlisting ? LISTBOX_TEXT : @@ -2224,20 +2380,19 @@ int AWindowAssets::selection_changed() break; } - BC_ListBox::deactivate_selection(); - return 1; + deactivate_selection(); } - else if( gui->vicon_drawing && - get_button_down() && get_buttonpress() == 1 && - (item = (AssetPicon*)get_selection(0, 0)) ) { + else if( gui->vicon_drawing && get_button_down() && get_buttonpress() == 1 && + ( mwindow->edl->session->awindow_folder == AW_MEDIA_FOLDER || + mwindow->edl->session->awindow_folder >= AWINDOW_USER_FOLDERS ) && + (item = (AssetPicon*)get_selection(0, 0)) != 0 ) { VIcon *vicon = 0; - if( !gui->vicon_thread->viewing ) { + if( !gui->vicon_thread->vicon ) { vicon = item->vicon; } gui->vicon_thread->set_view_popup(vicon); - } - return 0; + return 1; } void AWindowAssets::draw_background() @@ -2254,7 +2409,7 @@ void AWindowAssets::draw_background() int AWindowAssets::drag_start_event() { int collect_pluginservers = 0; - int collect_assets = 0; + int collect_assets = 0, proxy = 0; if( BC_ListBox::drag_start_event() ) { switch( mwindow->edl->session->awindow_folder ) { @@ -2277,6 +2432,8 @@ int AWindowAssets::drag_start_event() case AW_LABEL_FOLDER: // do nothing! break; + case AW_PROXY_FOLDER: + proxy = 1; // fall thru case AW_MEDIA_FOLDER: default: mwindow->session->current_operation = DRAG_ASSET; @@ -2297,7 +2454,7 @@ int AWindowAssets::drag_start_event() } if( collect_assets ) { - gui->collect_assets(); + gui->collect_assets(proxy); } return 1; @@ -2402,8 +2559,9 @@ int AWindowAssets::column_resize_event() int AWindowAssets::focus_in_event() { + int ret = BC_ListBox::focus_in_event(); gui->start_vicon_drawing(); - return 0; + return ret; } int AWindowAssets::focus_out_event() @@ -2412,6 +2570,43 @@ int AWindowAssets::focus_out_event() return BC_ListBox::focus_out_event(); } +int AWindowAssets::cursor_enter_event() +{ + int ret = BC_ListBox::cursor_enter_event(); + gui->start_vicon_drawing(); + return ret; +} + +int AWindowAssets::cursor_leave_event() +{ + gui->stop_vicon_drawing(); + return BC_ListBox::cursor_leave_event(); +} + +void AWindowAssets::update_vicon_area() +{ + int x0 = 0, x1 = get_w(); + int y0 = get_title_h(); + int y1 = get_h(); + if( is_highlighted() ) { + x0 += LISTBOX_BORDER; x1 -= LISTBOX_BORDER; + y0 += LISTBOX_BORDER; y1 -= LISTBOX_BORDER; + } + gui->vicon_thread->set_drawing_area(x0,y0, x1,y1); +} + +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; + picon->gui->vicon_thread->set_view_popup(vicon); + } + return 0; +} + + AWindowSearchTextBox::AWindowSearchTextBox(AWindowSearchText *search_text, int x, int y, int w) : BC_TextBox(x, y, w, 1, "") { @@ -2645,7 +2840,7 @@ AVIconDrawing::AVIconDrawing(AWindowGUI *agui, int x, int y, VFrame **images) : BC_Toggle(x, y, images, agui->vicon_drawing) { this->agui = agui; - set_tooltip(_("draw vicons")); + set_tooltip(_("Preview")); } void AVIconDrawing::calculate_geometry(AWindowGUI *agui, VFrame **images, int *ww, int *hh)