X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.C;h=ae74854b19e0517640e164b042943dc5a9c97b42;hp=90287ac94da0f6abfde7fa2f52a59f54962e60ed;hb=723142d62d61cde588e961426440f839ca9dcda9;hpb=78555663c7d2d1148808014cc7ada53255c0c305 diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C index 90287ac9..ae74854b 100644 --- a/cinelerra-5.1/cinelerra/awindowgui.C +++ b/cinelerra-5.1/cinelerra/awindowgui.C @@ -25,10 +25,12 @@ #include "assets.h" #include "awindowgui.h" #include "awindow.h" +#include "bccmodels.h" #include "bcsignals.h" #include "bchash.h" #include "cache.h" -#include "bccmodels.h" +#include "cstrdup.h" +#include "clip.h" #include "clippopup.h" #include "cursors.h" #include "cwindowgui.h" @@ -76,7 +78,7 @@ const char *AWindowGUI::folder_names[] = N_("Labels"), N_("Clips"), N_("Media"), - N_("User") + N_("Proxy"), }; @@ -104,14 +106,14 @@ VFrame *AssetVIcon::frame() delete temp; temp = 0; } if( !temp ) - temp = new VFrame(asset->width, asset->height, BC_RGB888); + temp = new VFrame(0, -1, asset->width, asset->height, BC_RGB888, -1); int ww = picon->gui->vicon_thread->view_w; int hh = picon->gui->vicon_thread->view_h; while( seq_no >= images.size() ) { file->set_layer(0); int64_t pos = images.size() / picon->gui->vicon_thread->refresh_rate * frame_rate; file->set_video_position(pos,0); - file->read_frame(temp); + if( file->read_frame(temp) ) temp->clear_frame(); add_image(temp, ww, hh, BC_RGB8); } mwindow->video_cache->check_in(asset); @@ -136,9 +138,9 @@ int AssetVIcon::get_vy() return lbox->get_item_y(picon) + lbox->get_title_h(); } + AssetPicon::AssetPicon(MWindow *mwindow, - AWindowGUI *gui, - Indexable *indexable) + AWindowGUI *gui, Indexable *indexable) : BC_ListBoxItem() { reset(); @@ -150,8 +152,7 @@ AssetPicon::AssetPicon(MWindow *mwindow, } AssetPicon::AssetPicon(MWindow *mwindow, - AWindowGUI *gui, - EDL *edl) + AWindowGUI *gui, EDL *edl) : BC_ListBoxItem() { reset(); @@ -164,7 +165,9 @@ AssetPicon::AssetPicon(MWindow *mwindow, AssetPicon::AssetPicon(MWindow *mwindow, AWindowGUI *gui, int folder, int persist) - : BC_ListBoxItem(_(AWindowGUI::folder_names[folder]), gui->folder_icon) + : BC_ListBoxItem(_(AWindowGUI::folder_names[folder]), + folder>=0 && folderfolder_icons[folder]: gui->folder_icon) { reset(); foldernum = folder; @@ -174,18 +177,7 @@ AssetPicon::AssetPicon(MWindow *mwindow, } AssetPicon::AssetPicon(MWindow *mwindow, - AWindowGUI *gui, const char *folder_name, int folder_num) - : BC_ListBoxItem(folder_name, gui->folder_icon) -{ - reset(); - foldernum = folder_num; - this->mwindow = mwindow; - this->gui = gui; -} - -AssetPicon::AssetPicon(MWindow *mwindow, - AWindowGUI *gui, - PluginServer *plugin) + AWindowGUI *gui, PluginServer *plugin) : BC_ListBoxItem() { reset(); @@ -194,10 +186,8 @@ AssetPicon::AssetPicon(MWindow *mwindow, this->plugin = plugin; } - AssetPicon::AssetPicon(MWindow *mwindow, - AWindowGUI *gui, - Label *label) + AWindowGUI *gui, Label *label) : BC_ListBoxItem() { reset(); @@ -227,10 +217,12 @@ void AssetPicon::reset() label = 0; indexable = 0; edl = 0; + foldernum = AW_NO_FOLDER; icon = 0; icon_vframe = 0; vicon = 0; in_use = 1; + mtime = 0; id = 0; persistent = 0; } @@ -240,27 +232,22 @@ void AssetPicon::create_objects() FileSystem fs; char name[BCTEXTLEN]; int pixmap_w, pixmap_h; - const int debug = 0; pixmap_h = 50 * BC_WindowBase::get_resources()->icon_scale; - if( debug ) printf("AssetPicon::create_objects %d\n", __LINE__); if( indexable ) { fs.extract_name(name, indexable->path); set_text(name); } if( indexable && indexable->is_asset ) { - if( debug ) printf("AssetPicon::create_objects %d\n", __LINE__); Asset *asset = (Asset*)indexable; if( asset->video_data ) { if( mwindow->preferences->use_thumbnails ) { gui->unlock_window(); - if( debug ) printf("AssetPicon::create_objects %d\n", __LINE__); File *file = mwindow->video_cache->check_out(asset, mwindow->edl, 1); - if( debug ) printf("AssetPicon::create_objects %d\n", __LINE__); if( file ) { int height = asset->height > 0 ? asset->height : 1; @@ -287,64 +274,61 @@ void AssetPicon::create_objects() mwindow->gui->show_message(string); mwindow->gui->unlock_window(); } file->read_frame(gui->temp_picon); - if( debug ) printf("AssetPicon::create_objects %d\n", __LINE__); mwindow->video_cache->check_in(asset); gui->lock_window("AssetPicon::create_objects 1"); icon = new BC_Pixmap(gui, pixmap_w, pixmap_h); icon->draw_vframe(gui->temp_picon, 0, 0, pixmap_w, pixmap_h, 0, 0); -//printf("%d %d\n", gui->temp_picon->get_w(), gui->temp_picon->get_h()); icon_vframe = new VFrame(0, -1, pixmap_w, pixmap_h, BC_RGB888, -1); icon_vframe->transfer_from(gui->temp_picon); + if( asset->awindow_folder == AW_MEDIA_FOLDER ) { // vicon images - double framerate = asset->get_frame_rate(); - if( !framerate ) framerate = VICON_RATE; - int64_t frames = asset->get_video_frames(); - double secs = frames / framerate; - if( secs > 5 ) secs = 5; - int64_t length = secs * gui->vicon_thread->refresh_rate; - vicon = new AssetVIcon(this, pixmap_w, pixmap_h, framerate, length); - gui->vicon_thread->add_vicon(vicon); - if( debug ) printf("AssetPicon::create_objects %d\n", __LINE__); + double framerate = asset->get_frame_rate(); + if( !framerate ) framerate = VICON_RATE; + int64_t frames = asset->get_video_frames(); + double secs = frames / framerate; + if( secs > 5 ) secs = 5; + int64_t length = secs * gui->vicon_thread->refresh_rate; + vicon = new AssetVIcon(this, pixmap_w, pixmap_h, framerate, length); + gui->vicon_thread->add_vicon(vicon); + } } else { gui->lock_window("AssetPicon::create_objects 2"); icon = gui->video_icon; - icon_vframe = BC_WindowBase::get_resources()->type_to_icon[ICON_FILM]; + icon_vframe = gui->video_vframe; } } else { icon = gui->video_icon; - icon_vframe = BC_WindowBase::get_resources()->type_to_icon[ICON_FILM]; + icon_vframe = gui->video_vframe; } } else if( asset->audio_data ) { icon = gui->audio_icon; - icon_vframe = BC_WindowBase::get_resources()->type_to_icon[ICON_SOUND]; + icon_vframe = gui->audio_vframe; } -//printf("AssetPicon::create_objects 2\n"); - - if( debug ) printf("AssetPicon::create_objects %d\n", __LINE__); + struct stat st; + mtime = !stat(asset->path, &st) ? st.st_mtime : 0; } else if( indexable && !indexable->is_asset ) { icon = gui->video_icon; - icon_vframe = BC_WindowBase::get_resources()->type_to_icon[ICON_FILM]; + icon_vframe = gui->video_vframe; } else if( edl ) { -//printf("AssetPicon::create_objects 4 %s\n", edl->local_session->clip_title); set_text(strcpy(name, edl->local_session->clip_title)); icon = gui->clip_icon; - icon_vframe = mwindow->theme->get_image("clip_icon"); + icon_vframe = gui->clip_vframe; } else if( plugin ) { - strcpy(name, plugin->title); + strcpy(name, _(plugin->title)); set_text(name); icon_vframe = plugin->get_picon(); if( icon_vframe ) @@ -392,9 +376,7 @@ void AssetPicon::create_objects() mwindow->edl->session->frames_per_foot); set_text(name); icon = gui->label_icon; - icon_vframe = BC_WindowBase::get_resources()->type_to_icon[ICON_LABEL]; - set_icon(icon); - set_icon_vframe(icon_vframe); + icon_vframe = gui->label_vframe; } if( !icon ) { icon = gui->file_icon; @@ -402,41 +384,50 @@ void AssetPicon::create_objects() } set_icon(icon); set_icon_vframe(icon_vframe); - - if( debug ) printf("AssetPicon::create_objects %d\n", __LINE__); } - - - - - 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) { -// printf("AWindowGUI::AWindowGUI %d %d %d %d\n", -// mwindow->session->awindow_x, -// mwindow->session->awindow_y, -// mwindow->session->awindow_w, -// mwindow->session->awindow_h); this->mwindow = mwindow; this->awindow = awindow; - file_icon = 0; - audio_icon = 0; - video_icon = 0; - folder_icon = 0; - clip_icon = 0; - label_icon = 0; - atransition_icon = 0; atransition_vframe = 0; - vtransition_icon = 0; vtransition_vframe = 0; - aeffect_icon = 0; aeffect_vframe = 0; - ladspa_icon = 0; ladspa_vframe = 0; - veffect_icon = 0; veffect_vframe = 0; - ff_aud_icon = 0; ff_aud_vframe = 0; - ff_vid_icon = 0; ff_vid_vframe = 0; + + file_vframe = 0; file_icon = 0; + folder_vframe = 0; folder_icon = 0; + audio_vframe = 0; audio_icon = 0; + 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; + label_folder_vframe = 0; label_folder_icon = 0; + media_folder_vframe = 0; media_folder_icon = 0; + proxy_folder_vframe = 0; proxy_folder_icon = 0; + veffect_folder_vframe = 0; veffect_folder_icon = 0; + vtransition_folder_vframe = 0; vtransition_folder_icon = 0; + + ladspa_vframe = 0; ladspa_icon = 0; + ff_aud_vframe = 0; ff_aud_icon = 0; + ff_vid_vframe = 0; ff_vid_icon = 0; + + clip_vframe = 0; clip_icon = 0; + atransition_vframe = 0; atransition_icon = 0; + vtransition_vframe = 0; vtransition_icon = 0; + aeffect_vframe = 0; aeffect_icon = 0; + veffect_vframe = 0; veffect_icon = 0; + plugin_visibility = ((uint64_t)1<<(8*sizeof(uint64_t)-1))-1; newfolder_thread = 0; asset_menu = 0; @@ -446,6 +437,7 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow) labellist_menu = 0; folderlist_menu = 0; temp_picon = 0; + search_text = 0; allow_iconlisting = 1; remove_plugin = 0; vicon_thread = 0; @@ -465,20 +457,8 @@ AWindowGUI::~AWindowGUI() displayed_assets[1].remove_all_objects(); delete vicon_thread; - delete file_icon; delete file_res; - delete audio_icon; delete audio_res; - delete video_icon; delete video_res; - delete folder_icon; delete folder_res; - delete clip_icon; delete clip_res; - delete label_icon; delete label_res; - delete atransition_icon; delete atrans_res; - delete vtransition_icon; delete vtrans_res; - delete aeffect_icon; delete aeffect_res; - delete veffect_icon; delete veffect_res; - delete ladspa_icon; delete ladspa_res; - delete ff_aud_icon; delete ff_aud_res; - delete ff_vid_icon; delete ff_vid_res; delete newfolder_thread; + delete asset_menu; delete clip_menu; delete label_menu; @@ -487,8 +467,31 @@ AWindowGUI::~AWindowGUI() delete cliplist_menu; delete labellist_menu; delete folderlist_menu; + delete search_text; delete temp_picon; delete remove_plugin; + + delete file_vframe; delete file_icon; + delete folder_vframe; delete folder_icon; + delete audio_vframe; delete audio_icon; + delete video_vframe; delete video_icon; + delete label_vframe; delete label_icon; + delete clip_vframe; delete clip_icon; + delete aeffect_folder_vframe; delete aeffect_folder_icon; + delete atransition_folder_vframe; delete atransition_folder_icon; + delete veffect_folder_vframe; delete veffect_folder_icon; + delete vtransition_folder_vframe; delete vtransition_folder_icon; + delete clip_folder_vframe; delete clip_folder_icon; + delete label_folder_vframe; delete label_folder_icon; + delete media_folder_vframe; delete media_folder_icon; + delete proxy_folder_vframe; delete proxy_folder_icon; + delete ladspa_vframe; delete ladspa_icon; + delete ff_aud_vframe; delete ff_aud_icon; + delete ff_vid_vframe; delete ff_vid_icon; + delete atransition_vframe; delete atransition_icon; + delete vtransition_vframe; delete vtransition_icon; + delete aeffect_vframe; delete aeffect_icon; + delete veffect_vframe; delete veffect_icon; } bool AWindowGUI::protected_pixmap(BC_Pixmap *icon) @@ -505,75 +508,99 @@ bool AWindowGUI::protected_pixmap(BC_Pixmap *icon) icon == aeffect_icon || icon == ladspa_icon || icon == ff_aud_icon || - icon == ff_vid_icon; + icon == ff_vid_icon || + icon == aeffect_folder_icon || + icon == veffect_folder_icon || + icon == atransition_folder_icon || + icon == vtransition_folder_icon || + icon == label_folder_icon || + icon == clip_folder_icon || + icon == media_folder_icon || + icon == proxy_folder_icon; } VFrame *AWindowGUI::get_picon(const char *name, const char *plugin_icons) { char png_path[BCTEXTLEN]; char *pp = png_path, *ep = pp + sizeof(png_path)-1; - snprintf(pp, ep-pp, "%s/picon_%s/%s.png", + snprintf(pp, ep-pp, "%s/picon/%s/%s.png", File::get_plugin_path(), plugin_icons, name); + if( access(png_path, R_OK) ) return 0; return VFramePng::vframe_png(png_path,0,0); } VFrame *AWindowGUI::get_picon(const char *name) { VFrame *vframe = get_picon(name, mwindow->preferences->plugin_icons); - if( !vframe ) vframe = get_picon(name, DEFAULT_PICON); + if( !vframe ) { + char png_name[BCSTRLEN], *pp = png_name, *ep = pp + sizeof(png_name)-1; + snprintf(pp, ep-pp, "%s.png", name); + unsigned char *data = mwindow->theme->get_image_data(png_name); + if( data ) vframe = new VFramePng(data, 0.); + } return vframe; } -VFrame *AWindowGUI::resource_icon(VFrame *&vfrm, BC_Pixmap *&icon, const char *fn, int idx) +void AWindowGUI::resource_icon(VFrame *&vfrm, BC_Pixmap *&icon, const char *fn, int idx) { - VFrame *ret = vfrm = get_picon(fn); - if( !ret ) vfrm = BC_WindowBase::get_resources()->type_to_icon[idx]; + vfrm = get_picon(fn); + if( !vfrm ) vfrm = BC_WindowBase::get_resources()->type_to_icon[idx]; icon = new BC_Pixmap(this, vfrm, PIXMAP_ALPHA); - return ret; } -VFrame *AWindowGUI::theme_icon(VFrame *&vfrm, BC_Pixmap *&icon, const char *fn) +void AWindowGUI::theme_icon(VFrame *&vfrm, BC_Pixmap *&icon, const char *fn) { - VFrame *ret = vfrm = get_picon(fn); - if( !ret ) vfrm = mwindow->theme->get_image(fn); + vfrm = get_picon(fn); + if( !vfrm ) vfrm = mwindow->theme->get_image(fn); icon = new BC_Pixmap(this, vfrm, PIXMAP_ALPHA); - return ret; } -VFrame *AWindowGUI::plugin_icon(VFrame *&vfrm, BC_Pixmap *&icon, const char *fn, unsigned char *png) +void AWindowGUI::plugin_icon(VFrame *&vfrm, BC_Pixmap *&icon, const char *fn, unsigned char *png) { - VFrame *ret = vfrm = get_picon(fn); - if( !ret ) vfrm = new VFramePng(png); + vfrm = get_picon(fn); + if( !vfrm ) vfrm = new VFramePng(png); icon = new BC_Pixmap(this, vfrm, PIXMAP_ALPHA); - return vfrm; } void AWindowGUI::create_objects() { lock_window("AWindowGUI::create_objects"); -SET_TRACE -//printf("AWindowGUI::create_objects 1\n"); - asset_titles[0] = _("Title"); + asset_titles[0] = C_("Title"); asset_titles[1] = _("Comments"); -SET_TRACE set_icon(mwindow->theme->get_image("awindow_icon")); - file_res = resource_icon(file_vframe, file_icon, "film_icon", ICON_UNKNOWN); - folder_res = resource_icon(folder_vframe, folder_icon, "folder_icon", ICON_FOLDER); - audio_res = resource_icon(audio_vframe, audio_icon, "audio_icon", ICON_SOUND); - video_res = resource_icon(video_vframe, video_icon, "video_icon", ICON_FILM); - label_res = resource_icon(label_vframe, label_icon, "label_icon", ICON_LABEL); - - clip_res = theme_icon(clip_vframe, clip_icon, "clip_icon"); - atrans_res = theme_icon(atransition_vframe, atransition_icon, "atransition_icon"); - vtrans_res = theme_icon(vtransition_vframe, vtransition_icon, "vtransition_icon"); - aeffect_res = theme_icon(aeffect_vframe, aeffect_icon, "aeffect_icon"); - veffect_res = theme_icon(veffect_vframe, veffect_icon, "veffect_icon"); - - ladspa_res = plugin_icon(ladspa_vframe, ladspa_icon, "lad_picon", lad_picon_png); - ff_aud_res = plugin_icon(ff_aud_vframe, ff_aud_icon, "ff_audio", ff_audio_png); - ff_vid_res = plugin_icon(ff_vid_vframe, ff_vid_icon, "ff_video", ff_video_png); - -SET_TRACE + resource_icon(file_vframe, file_icon, "film_icon", ICON_UNKNOWN); + resource_icon(folder_vframe, folder_icon, "folder_icon", ICON_FOLDER); + resource_icon(audio_vframe, audio_icon, "audio_icon", ICON_SOUND); + resource_icon(video_vframe, video_icon, "video_icon", ICON_FILM); + resource_icon(label_vframe, label_icon, "label_icon", ICON_LABEL); + + theme_icon(aeffect_folder_vframe, aeffect_folder_icon, "aeffect_folder"); + theme_icon(atransition_folder_vframe, atransition_folder_icon, "atransition_folder"); + theme_icon(clip_folder_vframe, clip_folder_icon, "clip_folder"); + theme_icon(label_folder_vframe, label_folder_icon, "label_folder"); + theme_icon(media_folder_vframe, media_folder_icon, "media_folder"); + theme_icon(proxy_folder_vframe, proxy_folder_icon, "proxy_folder"); + theme_icon(veffect_folder_vframe, veffect_folder_icon, "veffect_folder"); + theme_icon(vtransition_folder_vframe, vtransition_folder_icon, "vtransition_folder"); + + folder_icons[AW_AEFFECT_FOLDER] = aeffect_folder_icon; + folder_icons[AW_VEFFECT_FOLDER] = veffect_folder_icon; + folder_icons[AW_ATRANSITION_FOLDER] = atransition_folder_icon; + folder_icons[AW_VTRANSITION_FOLDER] = vtransition_folder_icon; + folder_icons[AW_LABEL_FOLDER] = label_folder_icon; + folder_icons[AW_CLIP_FOLDER] = clip_folder_icon; + folder_icons[AW_MEDIA_FOLDER] = media_folder_icon; + folder_icons[AW_PROXY_FOLDER] = proxy_folder_icon; + + theme_icon(clip_vframe, clip_icon, "clip_icon"); + theme_icon(atransition_vframe, atransition_icon, "atransition_icon"); + theme_icon(vtransition_vframe, vtransition_icon, "vtransition_icon"); + theme_icon(aeffect_vframe, aeffect_icon, "aeffect_icon"); + theme_icon(veffect_vframe, veffect_icon, "veffect_icon"); + + plugin_icon(ladspa_vframe, ladspa_icon, "lad_picon", lad_picon_png); + plugin_icon(ff_aud_vframe, ff_aud_icon, "ff_audio", ff_audio_png); + plugin_icon(ff_vid_vframe, ff_vid_icon, "ff_video", ff_video_png); // Mandatory folders folders.append(new AssetPicon(mwindow, this, AW_AEFFECT_FOLDER, 1)); @@ -582,37 +609,31 @@ SET_TRACE folders.append(new AssetPicon(mwindow, this, AW_VTRANSITION_FOLDER, 1)); folders.append(new AssetPicon(mwindow, this, AW_LABEL_FOLDER, 1)); folders.append(new AssetPicon(mwindow, this, AW_CLIP_FOLDER, 1)); + folders.append(new AssetPicon(mwindow, this, AW_PROXY_FOLDER, 1)); folders.append(new AssetPicon(mwindow, this, AW_MEDIA_FOLDER, 1)); create_label_folder(); -SET_TRACE mwindow->theme->get_awindow_sizes(this); load_defaults(mwindow->defaults); -SET_TRACE - add_subwindow(asset_list = new AWindowAssets(mwindow, - this, - mwindow->theme->alist_x, - mwindow->theme->alist_y, - mwindow->theme->alist_w, - mwindow->theme->alist_h)); + 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->create_objects(); + int dy = search_text->get_h() + 10; + y1 += dy; h1 -= dy; + add_subwindow(asset_list = new AWindowAssets(mwindow, this, x1, y1, w1, h1)); vicon_thread = new VIconThread(asset_list); vicon_thread->start(); -SET_TRACE - add_subwindow(divider = new AWindowDivider(mwindow, - this, - mwindow->theme->adivider_x, - mwindow->theme->adivider_y, - mwindow->theme->adivider_w, - mwindow->theme->adivider_h)); + add_subwindow(divider = new AWindowDivider(mwindow, this, + mwindow->theme->adivider_x, mwindow->theme->adivider_y, + mwindow->theme->adivider_w, mwindow->theme->adivider_h)); -SET_TRACE divider->set_cursor(HSEPARATE_CURSOR, 0, 0); -SET_TRACE 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"); @@ -621,17 +642,13 @@ SET_TRACE 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(); -SET_TRACE add_subwindow(folder_list = new AWindowFolders(mwindow, this, fx, fy, fw, fh)); -SET_TRACE update_effects(); -SET_TRACE //int x = mwindow->theme->abuttons_x; //int y = mwindow->theme->abuttons_y; -SET_TRACE newfolder_thread = new NewFolderThread(mwindow, this); @@ -650,12 +667,9 @@ SET_TRACE cliplist_menu->create_objects(); add_subwindow(labellist_menu = new LabelListMenu(mwindow, this)); labellist_menu->create_objects(); -SET_TRACE add_subwindow(folderlist_menu = new FolderListMenu(mwindow, this)); folderlist_menu->create_objects(); -SET_TRACE -//printf("AWindowGUI::create_objects 2\n"); create_custom_xatoms(); unlock_window(); @@ -707,9 +721,12 @@ int AWindowGUI::translation_event() void AWindowGUI::reposition_objects() { - asset_list->reposition_window( - mwindow->theme->alist_x, mwindow->theme->alist_y, - mwindow->theme->alist_w, mwindow->theme->alist_h); + 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; + y1 += dy; h1 -= dy; + asset_list->reposition_window(x1, y1, w1, h1); divider->reposition_window( mwindow->theme->adivider_x, mwindow->theme->adivider_y, mwindow->theme->adivider_w, mwindow->theme->adivider_h); @@ -796,8 +813,8 @@ void AWindowRemovePluginGUI::create_objects() add_subwindow(title); y += title->get_h() + 5; list = new BC_ListBox(x, y, - get_w() - 20, ok_button->get_y() - y - 5, LISTBOX_TEXT, &plugin_list, - 0, 0, 1, 0, 0, LISTBOX_SINGLE, ICON_LEFT, 0); + get_w() - 20, ok_button->get_y() - y - 5, LISTBOX_TEXT, &plugin_list, + 0, 0, 1, 0, 0, LISTBOX_SINGLE, ICON_LEFT, 0); add_subwindow(list); show_window(); } @@ -821,6 +838,7 @@ void AWindowRemovePlugin::handle_close_event(int result) { if( !result ) { printf(_("remove %s\n"), plugin->path); + awindow->gui->lock_window("AWindowRemovePlugin::handle_close_event"); ArrayList *folder = plugin->audio ? plugin->transition ? &awindow->gui->atransitions : @@ -830,26 +848,28 @@ void AWindowRemovePlugin::handle_close_event(int result) &awindow->gui->veffects : 0; if( folder ) remove_plugin(plugin, *folder); + MWindow *mwindow = awindow->mwindow; + awindow->gui->unlock_window(); char plugin_path[BCTEXTLEN]; strcpy(plugin_path, plugin->path); - MWindow *mwindow = awindow->mwindow; mwindow->plugindb->remove(plugin); remove(plugin_path); char index_path[BCTEXTLEN]; - snprintf(index_path, sizeof(index_path), "%s/%s", - mwindow->preferences->plugin_dir, PLUGIN_FILE); + mwindow->create_defaults_path(index_path, PLUGIN_FILE); remove(index_path); + char picon_path[BCTEXTLEN]; FileSystem fs; - fs.update(File::get_plugin_path()); + snprintf(picon_path, sizeof(picon_path), "%s/picon", + File::get_plugin_path()); + char png_name[BCSTRLEN], png_path[BCTEXTLEN]; + plugin->get_plugin_png_name(png_name); + fs.update(picon_path); for( int i=0; ipath; if( !fs.is_dir(fs_path) ) continue; - char *cp = strrchr(fs_path,'/'); - cp = !cp ? fs_path : cp+1; - if( strncmp("picon_", cp, 6) ) continue; - char png_path[BCTEXTLEN]; - if( !plugin->get_plugin_png_path(png_path, cp+6) ) - remove(png_path); + snprintf(png_path, sizeof(picon_path), "%s/%s", + fs_path, png_name); + remove(png_path); } delete plugin; plugin = 0; awindow->gui->async_update_assets(); @@ -925,26 +945,17 @@ void AWindowGUI::async_update_assets() } - - - - - void AWindowGUI::update_folder_list() { - stop_vicon_drawing(); -//printf("AWindowGUI::update_folder_list 1\n"); for( int i = 0; i < folders.total; i++ ) { AssetPicon *picon = (AssetPicon*)folders.values[i]; - picon->in_use--; + picon->in_use = 0; } -//printf("AWindowGUI::update_folder_list 1\n"); // Search assets for folders for( int i = 0; i < mwindow->edl->folders.total; i++ ) { const char *folder = mwindow->edl->folders.values[i]; int exists = 0; -//printf("AWindowGUI::update_folder_list 1.1\n"); for( int j = 0; j < folders.total; j++ ) { AssetPicon *picon = (AssetPicon*)folders.values[j]; @@ -957,30 +968,22 @@ void AWindowGUI::update_folder_list() if( !exists ) { int aw_folder = folder_number(folder); - AssetPicon *picon = aw_folder >= 0 ? - new AssetPicon(mwindow, this, aw_folder, 0) : - new AssetPicon(mwindow, this, folder, AW_USER_FOLDER); - picon->create_objects(); - folders.append(picon); + if( aw_folder >= 0 ) { + AssetPicon *picon = new AssetPicon(mwindow, this, aw_folder, 1); + picon->create_objects(); + folders.append(picon); + } } -//printf("AWindowGUI::update_folder_list 1.3\n"); } -//printf("AWindowGUI::update_folder_list 1\n"); -//for( int i = 0; i < folders.total; i++ ) -// printf("AWindowGUI::update_folder_list %s\n", folders.values[i]->get_text()); -// Delete excess - for( int i = folders.total - 1; i >= 0; i-- ) { +// Delete unused non-persistent folders + for( int i=folders.total; --i>=0; ) { AssetPicon *picon = (AssetPicon*)folders.values[i]; if( !picon->in_use && !picon->persistent ) { delete picon; folders.remove_number(i); } } -//for( int i = 0; i < folders.total; i++ ) -// printf("AWindowGUI::update_folder_list %s\n", folders.values[i]->get_text()); -//printf("AWindowGUI::update_folder_list 2\n"); - start_vicon_drawing(); } void AWindowGUI::create_persistent_folder(ArrayList *output, @@ -1015,19 +1018,11 @@ void AWindowGUI::create_label_folder() void AWindowGUI::update_asset_list() { -//printf("AWindowGUI::update_asset_list 1\n"); for( int i = 0; i < assets.total; i++ ) { AssetPicon *picon = (AssetPicon*)assets.values[i]; - picon->in_use--; + picon->in_use = 0; } - - - - -//printf("AWindowGUI::update_asset_list 2\n"); - - // Synchronize EDL clips for( int i = 0; i < mwindow->edl->clips.total; i++ ) { int exists = 0; @@ -1047,20 +1042,12 @@ void AWindowGUI::update_asset_list() // Create new listitem if( !exists ) { AssetPicon *picon = new AssetPicon(mwindow, - this, - mwindow->edl->clips.values[i]); + this, mwindow->edl->clips.values[i]); picon->create_objects(); assets.append(picon); } } - - - - -//printf("AWindowGUI::update_asset_list %d\n", __LINE__); - - // Synchronize EDL assets for( Asset *current = mwindow->edl->assets->first; current; @@ -1081,11 +1068,9 @@ void AWindowGUI::update_asset_list() // Create new listitem if( !exists ) { -//printf("AWindowGUI::update_asset_list %d\n", __LINE__); - AssetPicon *picon = new AssetPicon(mwindow, this, current); -//printf("AWindowGUI::update_asset_list %d\n", __LINE__); + AssetPicon *picon = new AssetPicon(mwindow, + this, current); picon->create_objects(); -//printf("AWindowGUI::update_asset_list %d\n", __LINE__); assets.append(picon); } } @@ -1094,9 +1079,6 @@ void AWindowGUI::update_asset_list() mwindow->gui->default_message(); mwindow->gui->unlock_window(); -//printf("AWindowGUI::update_asset_list %d\n", __LINE__); - - // Synchronize nested EDLs for( int i = 0; i < mwindow->edl->nested_edls->size(); i++ ) { int exists = 0; @@ -1117,36 +1099,27 @@ void AWindowGUI::update_asset_list() // Create new listitem if( !exists ) { AssetPicon *picon = new AssetPicon(mwindow, - this, - indexable); + this, indexable); picon->create_objects(); assets.append(picon); } } - - - - - - - - -//printf("AWindowGUI::update_asset_list %d\n", __LINE__); for( int i = assets.size() - 1; i >= 0; i-- ) { AssetPicon *picon = (AssetPicon*)assets.get(i); -//printf("AWindowGUI::update_asset_list %s %d\n", picon->asset->path, picon->in_use); if( !picon->in_use ) { delete picon; assets.remove_number(i); + continue; } + if( !picon->indexable || !picon->indexable->is_asset ) continue; + struct stat st; + picon->mtime = !stat(picon->indexable->path, &st) ? st.st_mtime : 0; } -//printf("AWindowGUI::update_asset_list 7 %d\n", assets.total); } void AWindowGUI::update_picon(Indexable *indexable) { -//printf("AWindowGUI::update_asset_list 1\n"); VIcon *vicon = 0; for( int i = 0; i < assets.total; i++ ) { AssetPicon *picon = (AssetPicon*)assets.values[i]; @@ -1168,9 +1141,8 @@ void AWindowGUI::update_picon(Indexable *indexable) } } -void AWindowGUI::sort_assets() +void AWindowGUI::sort_assets(int use_mtime) { -//printf("AWindowGUI::sort_assets 1 %s\n", mwindow->edl->session->current_folder); switch( mwindow->edl->session->awindow_folder ) { case AW_AEFFECT_FOLDER: sort_picons(&aeffects); @@ -1188,9 +1160,17 @@ void AWindowGUI::sort_assets() sort_picons(&labellist); break; default: - sort_picons(&assets); + sort_picons(&assets, use_mtime); } +// reset xyposition + asset_list->update_format(asset_list->get_format(), 0); + update_assets(); +} +void AWindowGUI::sort_folders() +{ + sort_picons(&folders); + folder_list->update_format(folder_list->get_format(), 0); update_assets(); } @@ -1217,13 +1197,15 @@ void AWindowGUI::copy_picons(ArrayList *dst, dst[1].remove_all_objects(); // Create new pointers -//if( folder ) printf("AWindowGUI::copy_picons 1 %s\n", folder); for( int i = 0; i < src->total; i++ ) { AssetPicon *picon = (AssetPicon*)src->values[i]; -//printf("AWindowGUI::copy_picons 2 %s\n", picon->asset->folder); if( folder < 0 || (picon->indexable && picon->indexable->awindow_folder == folder) || (picon->edl && picon->edl->local_session->awindow_folder == folder) ) { + const char *text = search_text->get_text(); + int hidden = text && text[0] && !bstrcasestr(picon->get_text(), text); + if( picon->vicon ) picon->vicon->hidden = hidden; + if( hidden ) continue; BC_ListBoxItem *item2, *item1; dst[0].append(item1 = picon); if( picon->edl ) @@ -1231,43 +1213,52 @@ void AWindowGUI::copy_picons(ArrayList *dst, else if( picon->label && picon->label->textstr ) dst[1].append(item2 = new BC_ListBoxItem(picon->label->textstr)); + else if( picon->mtime ) { + char date_time[BCSTRLEN]; + struct tm stm; localtime_r(&picon->mtime, &stm); + sprintf(date_time,"%04d.%02d.%02d %02d:%02d:%02d", + stm.tm_year+1900, stm.tm_mon+1, stm.tm_mday, + stm.tm_hour, stm.tm_min, stm.tm_sec); + dst[1].append(item2 = new BC_ListBoxItem(date_time)); + } else dst[1].append(item2 = new BC_ListBoxItem("")); - item1->set_autoplace_text(1); - item2->set_autoplace_text(1); -//printf("AWindowGUI::copy_picons 3 %s\n", picon->get_text()); + item1->set_autoplace_text(1); item1->set_autoplace_icon(1); + item2->set_autoplace_text(1); item2->set_autoplace_icon(1); } } } -void AWindowGUI::sort_picons(ArrayList *src) +void AWindowGUI::sort_picons(ArrayList *src, int use_mtime) { -//printf("AWindowGUI::sort_picons 1\n") - int done = 0; - while(!done) - { + int done = 0, changed = 0; + while( !done ) { done = 1; - for( int i = 0; i < src->total - 1; i++ ) { - BC_ListBoxItem *item1 = src->values[i]; - BC_ListBoxItem *item2 = src->values[i + 1]; - item1->set_autoplace_icon(1); - item2->set_autoplace_icon(1); - item1->set_autoplace_text(1); - item2->set_autoplace_text(1); - if( strcmp(item1->get_text(), item2->get_text()) > 0 ) { + for( int i=0; itotal-1; ++i ) { + AssetPicon *item1 = (AssetPicon *)src->values[i]; + AssetPicon *item2 = (AssetPicon *)src->values[i + 1]; + if( use_mtime ? item1->mtime > item2->mtime : + strcmp(item1->get_text(), item2->get_text()) > 0 ) { src->values[i + 1] = item1; src->values[i] = item2; - done = 0; + done = 0; changed = 1; } } } + if( changed ) { + for( int i=0; itotal; ++i ) { + AssetPicon *item = (AssetPicon *)src->values[i]; + item->set_autoplace_icon(1); + item->set_autoplace_text(1); + } + } } void AWindowGUI::filter_displayed_assets() { //allow_iconlisting = 1; - asset_titles[0] = _("Title"); + asset_titles[0] = C_("Title"); asset_titles[1] = _("Comments"); switch( mwindow->edl->session->awindow_folder ) { @@ -1286,7 +1277,7 @@ void AWindowGUI::filter_displayed_assets() case AW_LABEL_FOLDER: copy_picons(displayed_assets, &labellist, AW_NO_FOLDER); asset_titles[0] = _("Time Stamps"); - asset_titles[1] = _("Title"); + asset_titles[1] = C_("Title"); //allow_iconlisting = 0; break; default: @@ -1295,25 +1286,27 @@ void AWindowGUI::filter_displayed_assets() } // Ensure the current folder icon is highlighted - for( int i = 0; i < folders.total; i++ ) - folders.values[i]->set_selected(0); - - folders.values[mwindow->edl->session->awindow_folder]->set_selected(1); + int selected_folder = mwindow->edl->session->awindow_folder; + for( int i = 0; i < folders.total; i++ ) { + AssetPicon *folder_item = (AssetPicon *)folders.values[i]; + int selected = folder_item->foldernum == selected_folder ? 1 : 0; + folder_item->set_selected(selected); + } } void AWindowGUI::update_assets() { -//printf("AWindowGUI::update_assets 1\n"); + stop_vicon_drawing(); update_folder_list(); -//printf("AWindowGUI::update_assets 2\n"); update_asset_list(); labellist.remove_all_objects(); create_label_folder(); -//printf("AWindowGUI::update_assets 3\n"); + + if( displayed_folder != mwindow->edl->session->awindow_folder ) + search_text->clear(); filter_displayed_assets(); -//printf("AWindowGUI::update_assets 4\n"); if( mwindow->edl->session->folderlist_format != folder_list->get_format() ) { folder_list->update_format(mwindow->edl->session->folderlist_format, 0); } @@ -1321,7 +1314,6 @@ void AWindowGUI::update_assets() int folder_yposition = folder_list->get_yposition(); folder_list->update(&folders, 0, 0, 1, folder_xposition, folder_yposition, -1); -//printf("AWindowGUI::update_assets 5\n"); if( mwindow->edl->session->assetlist_format != asset_list->get_format() ) { asset_list->update_format(mwindow->edl->session->assetlist_format, 0); } @@ -1335,10 +1327,9 @@ void AWindowGUI::update_assets() mwindow->edl->session->asset_columns, ASSET_COLUMNS, asset_xposition, asset_yposition, -1, 0); asset_list->center_selection(); -//printf("AWindowGUI::update_assets 7\n"); flush(); -//printf("AWindowGUI::update_assets 8\n"); + start_vicon_drawing(); return; } @@ -1485,8 +1476,7 @@ int AWindowFolders::selection_changed() gui->folderlist_menu->activate_menu(); } - mwindow->edl->session->awindow_folder = picon->foldernum; -//printf("AWindowFolders::selection_changed 1\n"); + mwindow->edl->session->awindow_folder = picon->foldernum; gui->asset_list->draw_background(); gui->async_update_assets(); @@ -1531,7 +1521,7 @@ AWindowAssets::AWindowAssets(MWindow *mwindow, AWindowGUI *gui, int x, int y, in 0, // If this listbox is a popup window LISTBOX_MULTIPLE, // Select one item or multiple items ICON_TOP, // Position of icon relative to text of each item - 1) // Allow drag + -1) // Allow drags, require shift for scrolling { this->mwindow = mwindow; this->gui = gui; @@ -1569,7 +1559,8 @@ int AWindowAssets::button_press_event() gui->cliplist_menu->activate_menu(); break; case AW_MEDIA_FOLDER: - gui->assetlist_menu->update_titles(); + case AW_PROXY_FOLDER: + gui->assetlist_menu->update_titles(folder==AW_MEDIA_FOLDER); gui->assetlist_menu->activate_menu(); break; } @@ -1582,7 +1573,6 @@ int AWindowAssets::button_press_event() int AWindowAssets::handle_event() { -//printf("AWindowAssets::handle_event 1 %d %d\n", get_buttonpress(), get_selection(0, 0)); AssetPicon *asset_picon = (AssetPicon *)get_selection(0, 0); if( !asset_picon ) return 0; switch( mwindow->edl->session->awindow_folder ) { @@ -1594,7 +1584,6 @@ int AWindowAssets::handle_event() VWindow *vwindow = mwindow->vwindows.size() > DEFAULT_VWINDOW ? mwindow->vwindows.get(DEFAULT_VWINDOW) : 0; if( !vwindow || !vwindow->is_running() ) return 1; -//printf("AWindowAssets::handle_event 2 %d %d\n", get_buttonpress(), get_selection(0, 0)); vwindow->gui->lock_window("AWindowAssets::handle_event"); if( asset_picon->indexable ) @@ -1778,11 +1767,13 @@ int AWindowAssets::drag_stop_event() lock_window("AWindowAssets::drag_stop_event"); - if( result ) get_drag_popup()->set_animation(0); + if( result ) + get_drag_popup()->set_animation(0); BC_ListBox::drag_stop_event(); - mwindow->session->current_operation = ::NO_OPERATION; // since NO_OPERATION is also defined in listbox, we have to reach for global scope... - return 0; +// since NO_OPERATION is also defined in listbox, we have to reach for global scope... + mwindow->session->current_operation = ::NO_OPERATION; + return 1; } int AWindowAssets::column_resize_event() @@ -1804,16 +1795,68 @@ int AWindowAssets::focus_out_event() return BC_ListBox::focus_out_event(); } +AWindowSearchTextBox::AWindowSearchTextBox(AWindowSearchText *search_text, int x, int y, int w) + : BC_TextBox(x, y, w, 1, "") +{ + this->search_text = search_text; +} +int AWindowSearchTextBox::handle_event() +{ + return search_text->handle_event(); +} +AWindowSearchText::AWindowSearchText(MWindow *mwindow, AWindowGUI *gui, int x, int y) +{ + this->mwindow = mwindow; + this->gui = gui; + this->x = x; + this->y = y; +} +void AWindowSearchText::create_objects() +{ + int x1 = x, y1 = y, margin = 10; + 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; + gui->add_subwindow(text_box = new AWindowSearchTextBox(this, x1, y1, w1)); +} +int AWindowSearchText::handle_event() +{ + gui->async_update_assets(); + return 1; +} +int AWindowSearchText::get_w() +{ + return text_box->get_w() + text_title->get_w() + 10; +} +int AWindowSearchText::get_h() +{ + return bmax(text_box->get_h(),text_title->get_h()); +} +void AWindowSearchText::reposition_window(int x, int y, int w) +{ + int x1 = x, y1 = y, margin = 10; + text_title->reposition_window(x1, y1); + x1 += text_title->get_w() + margin; + int w1 = gui->get_w() - x1 - 2*margin; + text_box->reposition_window(x1, y1, w1); +} +const char *AWindowSearchText::get_text() +{ + return text_box->get_text(); +} - +void AWindowSearchText::clear() +{ + text_box->update(""); +} AWindowNewFolder::AWindowNewFolder(MWindow *mwindow, AWindowGUI *gui, int x, int y) : BC_Button(x, y, mwindow->theme->newbin_data) @@ -1885,21 +1928,21 @@ int AWindowDeleteProject::handle_event() return 1; } -AWindowInfo::AWindowInfo(MWindow *mwindow, AWindowGUI *gui, int x, int y) - : BC_Button(x, y, mwindow->theme->infoasset_data) -{ - this->mwindow = mwindow; - this->gui = gui; - set_tooltip(_("Edit information on asset")); -} - -int AWindowInfo::handle_event() -{ - int cur_x, cur_y; - gui->get_abs_cursor_xy(cur_x, cur_y, 0); - gui->awindow->asset_edit->edit_asset(gui->selected_asset(), cur_x, cur_y); - return 1; -} +// AWindowInfo::AWindowInfo(MWindow *mwindow, AWindowGUI *gui, int x, int y) +// : BC_Button(x, y, mwindow->theme->infoasset_data) +// { +// this->mwindow = mwindow; +// this->gui = gui; +// set_tooltip(_("Edit information on asset")); +// } +// +// int AWindowInfo::handle_event() +// { +// int cur_x, cur_y; +// gui->get_abs_cursor(cur_x, cur_y, 0); +// gui->awindow->asset_edit->edit_asset(gui->selected_asset(), cur_x, cur_y); +// return 1; +// } AWindowRedrawIndex::AWindowRedrawIndex(MWindow *mwindow, AWindowGUI *gui, int x, int y) : BC_Button(x, y, mwindow->theme->redrawindex_data) @@ -2005,13 +2048,13 @@ AddPluginItem::AddPluginItem(AddTools *menu, char const *text, int idx) this->idx = idx; uint64_t msk = (uint64_t)1 << idx, vis = menu->gui->plugin_visibility; int chk = (msk & vis) ? 1 : 0; - set_checked(chk); + set_checked(chk); } int AddPluginItem::handle_event() { - int chk = get_checked() ^ 1; - set_checked(chk); + int chk = get_checked() ^ 1; + set_checked(chk); uint64_t msk = (uint64_t)1 << idx, vis = menu->gui->plugin_visibility; menu->gui->plugin_visibility = chk ? vis | msk : vis & ~msk; menu->gui->update_effects(); @@ -2083,8 +2126,8 @@ int AWindowListFormat::handle_event() void AWindowListFormat::update() { - set_text(mwindow->edl->session->assetlist_format == ASSETS_TEXT ? - (char*)_("Display icons") : (char*)_("Display text")); + set_text(mwindow->edl->session->assetlist_format == ASSETS_TEXT ? + (char*)_("Display icons") : (char*)_("Display text")); } AWindowListSort::AWindowListSort(MWindow *mwindow, AWindowGUI *gui) @@ -2096,8 +2139,7 @@ AWindowListSort::AWindowListSort(MWindow *mwindow, AWindowGUI *gui) int AWindowListSort::handle_event() { - gui->sort_assets(); + gui->sort_assets(0); return 1; } -