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 ) {
+ if( asset->folder_no == AW_MEDIA_FOLDER ) {
// vicon images
double framerate = asset->get_frame_rate();
if( !framerate ) framerate = VICON_RATE;
base_colors[i], line_colors[i]);
}
mwindow->audio_cache->check_in(asset);
- if( asset->awindow_folder == AW_MEDIA_FOLDER ) {
+ if( asset->folder_no == AW_MEDIA_FOLDER ) {
double secs = duration;
if( secs > 5 ) secs = 5;
double refresh_rate = gui->vicon_thread->refresh_rate;
for( int i=0; i<new_assets.size(); ++i ) {
AssetPicon *picon = new_assets[i];
picon->create_objects();
+ if( picon->indexable )
+ picon->foldernum = AW_MEDIA_FOLDER;
+ else if( picon->edl )
+ picon->foldernum = AW_CLIP_FOLDER;
assets.append(picon);
}
if( current->data_type != TRACK_AUDIO ) continue;
current->insert_asset(unproxy_asset, 0, length, 0, atrack++);
}
- proxy_edl->awindow_folder = AW_PROXY_FOLDER;
+ proxy_edl->folder_no = AW_PROXY_FOLDER;
return proxy_edl;
}
while( (result = (AssetPicon*)asset_list->get_selection(0, i++)) != 0 ) {
Indexable *indexable = result->indexable;
if( proxy && indexable && indexable->is_asset &&
- indexable->awindow_folder == AW_PROXY_FOLDER ) {
+ indexable->folder_no == AW_PROXY_FOLDER ) {
EDL *drag_edl = collect_proxy(indexable);
if( drag_edl ) mwindow->session->drag_clips->append(drag_edl);
continue;
}
}
-void AWindowGUI::copy_picons(ArrayList<BC_ListBoxItem*> *dst,
- ArrayList<BC_ListBoxItem*> *src, int folder)
+void AWindowGUI::copy_picons(AssetPicon *picon, ArrayList<BC_ListBoxItem*> *src)
{
// Remove current pointers
+ ArrayList<BC_ListBoxItem*> *dst = displayed_assets;
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;
- }
+
+ AWindowFolderSubItems *sub_items = picon ? picon->sub_items : 0;
+ int folder = mwindow->edl->session->awindow_folder;
BinFolder *bin_folder = folder < AWINDOW_USER_FOLDERS ? 0 :
mwindow->edl->get_folder(folder);
// Create new pointers
for( int i = 0; i < src->total; i++ ) {
- int visible = folder < 0 ? 1 : 0;
- AssetPicon *picon = (AssetPicon*)src->values[i];
+ int visible = folder >= AW_CLIP_FOLDER ? 0 : 1;
+ picon = (AssetPicon*)src->values[i];
picon->sort_key = -1;
if( !visible && bin_folder ) {
Indexable *idxbl = bin_folder->is_clips ? (Indexable *)picon->edl :
visible = 1;
}
}
- if( !visible && picon->indexable && picon->indexable->awindow_folder == folder )
+ if( !visible && picon->indexable && picon->indexable->folder_no == folder )
visible = 1;
- if( !visible && picon->edl && picon->edl->local_session->folder == folder )
+ if( !visible && picon->edl && picon->edl->folder_no == folder )
visible = 1;
if( visible && sub_items ) {
if( !sub_items->matches(picon->get_text()) )
//allow_iconlisting = 1;
asset_titles[0] = C_("Title");
asset_titles[1] = _("Comments");
- int folder = mwindow->edl->session->awindow_folder;
-
- switch( folder ) {
- case AW_AEFFECT_FOLDER:
- copy_picons(displayed_assets, &aeffects, folder);
- break;
- case AW_VEFFECT_FOLDER:
- copy_picons(displayed_assets, &veffects, folder);
- break;
- case AW_ATRANSITION_FOLDER:
- copy_picons(displayed_assets, &atransitions, folder);
- break;
- case AW_VTRANSITION_FOLDER:
- copy_picons(displayed_assets, &vtransitions, folder);
- break;
- case AW_LABEL_FOLDER:
- copy_picons(displayed_assets, &labellist, AW_NO_FOLDER);
- asset_titles[0] = _("Time Stamps");
- asset_titles[1] = C_("Title");
- //allow_iconlisting = 0;
- break;
- default:
- copy_picons(displayed_assets, &assets, mwindow->edl->session->awindow_folder);
- break;
- }
-
- // Ensure the current folder icon is highlighted
+ AssetPicon *picon = 0;
int selected_folder = mwindow->edl->session->awindow_folder;
+ // Ensure the current folder icon is highlighted
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);
+ if( selected ) picon = folder_item;
+ }
+
+ ArrayList<BC_ListBoxItem*> *src = &assets;
+ switch( selected_folder ) {
+ case AW_AEFFECT_FOLDER: src = &aeffects; break;
+ case AW_VEFFECT_FOLDER: src = &veffects; break;
+ case AW_ATRANSITION_FOLDER: src = &atransitions; break;
+ case AW_VTRANSITION_FOLDER: src = &vtransitions; break;
+ case AW_LABEL_FOLDER: src = &labellist;
+ asset_titles[0] = _("Time Stamps");
+ asset_titles[1] = C_("Title");
+ //allow_iconlisting = 0;
+ break;
}
+ copy_picons(picon, src);
}
if( get_hidden() ) return 0;
if( mwindow->session->current_operation == DRAG_ASSET &&
gui->folder_list->cursor_above() ) { // check user folder
- int item_no = gui->folder_list->get_cursor_item();
+ int item_no = gui->folder_list->get_cursor_data_item_no();
AssetPicon *picon = (AssetPicon *)(item_no < 0 ? 0 : gui->folders[item_no]);
if( picon && picon->foldernum >= AWINDOW_USER_FOLDERS ) {
BinFolder *folder = mwindow->edl->get_folder(picon->foldernum);
lock_window("AWindowAssets::drag_motion_event");
if( mwindow->session->current_operation == DRAG_ASSET &&
gui->folder_list->cursor_above() ) { // highlight user folder
- int item_no = gui->folder_list->get_cursor_item();
+ BC_ListBoxItem *item = 0;
+ int item_no = gui->folder_list->get_cursor_data_item_no(&item);
if( item_no >= 0 ) {
AssetPicon *folder = (AssetPicon *)gui->folders[item_no];
if( folder->foldernum < AWINDOW_USER_FOLDERS ) item_no = -1;
}
+ if( item_no >= 0 )
+ item_no = gui->folder_list->item_to_index(&gui->folders, item);
int folder_xposition = gui->folder_list->get_xposition();
int folder_yposition = gui->folder_list->get_yposition();
gui->folder_list->update(&gui->folders, 0, 0, 1,
projects / goodguy / history.git / blobdiff