X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.C;h=5bca38f3687eb34c281042fc881da2a708d65fce;hb=3ac72077bee819333ea9e8c3c3307b529ecf3647;hp=8b9a3ff4d2b55376048421541bdbd466c75c1f42;hpb=2f1bbd12877daf745e1d18b62b731f04cece827e;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C index 8b9a3ff4..5bca38f3 100644 --- a/cinelerra-5.1/cinelerra/awindowgui.C +++ b/cinelerra-5.1/cinelerra/awindowgui.C @@ -77,7 +77,6 @@ const char *AWindowGUI::folder_names[] = N_("Clips"), N_("Media"), N_("Proxy"), - N_("User"), }; @@ -137,9 +136,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(); @@ -151,8 +150,7 @@ AssetPicon::AssetPicon(MWindow *mwindow, } AssetPicon::AssetPicon(MWindow *mwindow, - AWindowGUI *gui, - EDL *edl) + AWindowGUI *gui, EDL *edl) : BC_ListBoxItem() { reset(); @@ -165,7 +163,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; @@ -175,18 +175,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(); @@ -195,10 +184,8 @@ AssetPicon::AssetPicon(MWindow *mwindow, this->plugin = plugin; } - AssetPicon::AssetPicon(MWindow *mwindow, - AWindowGUI *gui, - Label *label) + AWindowGUI *gui, Label *label) : BC_ListBoxItem() { reset(); @@ -228,6 +215,7 @@ void AssetPicon::reset() label = 0; indexable = 0; edl = 0; + foldernum = AW_NO_FOLDER; icon = 0; icon_vframe = 0; vicon = 0; @@ -241,27 +229,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; @@ -288,27 +271,26 @@ 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 { @@ -327,9 +309,7 @@ void AssetPicon::create_objects() icon = gui->audio_icon; icon_vframe = BC_WindowBase::get_resources()->type_to_icon[ICON_SOUND]; } -//printf("AssetPicon::create_objects 2\n"); - if( debug ) printf("AssetPicon::create_objects %d\n", __LINE__); } else if( indexable && !indexable->is_asset ) { @@ -338,7 +318,6 @@ void AssetPicon::create_objects() } 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"); @@ -403,26 +382,14 @@ 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; @@ -466,19 +433,19 @@ 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 file_icon; + delete audio_icon; + delete video_icon; + delete folder_icon; + delete clip_icon; + delete label_icon; + delete atransition_icon; + delete vtransition_icon; + delete aeffect_icon; + delete veffect_icon; + delete ladspa_icon; + delete ff_aud_icon; + delete ff_vid_icon; delete newfolder_thread; delete asset_menu; delete clip_menu; @@ -506,7 +473,15 @@ 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) @@ -525,56 +500,66 @@ VFrame *AWindowGUI::get_picon(const char *name) 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[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)); @@ -587,12 +572,10 @@ SET_TRACE 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, @@ -603,7 +586,6 @@ SET_TRACE vicon_thread = new VIconThread(asset_list); vicon_thread->start(); -SET_TRACE add_subwindow(divider = new AWindowDivider(mwindow, this, mwindow->theme->adivider_x, @@ -611,10 +593,8 @@ SET_TRACE 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"); @@ -623,17 +603,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); @@ -652,12 +628,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(); @@ -927,26 +900,18 @@ 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]; @@ -959,19 +924,15 @@ 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 +// Delete unused non-persistent folders for( int i=folders.total; --i>=0; ) { AssetPicon *picon = (AssetPicon*)folders.values[i]; if( !picon->in_use && !picon->persistent ) { @@ -979,9 +940,7 @@ void AWindowGUI::update_folder_list() 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(); } @@ -1017,19 +976,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; @@ -1049,20 +1000,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; @@ -1083,11 +1026,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); } } @@ -1096,9 +1037,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; @@ -1119,36 +1057,23 @@ 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); } } -//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]; @@ -1172,7 +1097,6 @@ void AWindowGUI::update_picon(Indexable *indexable) void AWindowGUI::sort_assets() { -//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); @@ -1196,6 +1120,12 @@ void AWindowGUI::sort_assets() update_assets(); } +void AWindowGUI::sort_folders() +{ + sort_picons(&folders); + update_assets(); +} + void AWindowGUI::collect_assets() { int i = 0; @@ -1219,10 +1149,8 @@ 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) ) { @@ -1237,14 +1165,12 @@ void AWindowGUI::copy_picons(ArrayList *dst, 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()); } } } void AWindowGUI::sort_picons(ArrayList *src) { -//printf("AWindowGUI::sort_picons 1\n") int done = 0; while(!done) { @@ -1308,16 +1234,12 @@ void AWindowGUI::filter_displayed_assets() void AWindowGUI::update_assets() { -//printf("AWindowGUI::update_assets 1\n"); 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"); 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); } @@ -1325,7 +1247,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); } @@ -1339,10 +1260,8 @@ 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"); return; } @@ -1489,8 +1408,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(); @@ -1587,7 +1505,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 ) { @@ -1599,7 +1516,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 )