#include "bcsignals.h"
#include "bchash.h"
#include "cache.h"
+#include "cstrdup.h"
#include "clip.h"
#include "clippopup.h"
#include "cursors.h"
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);
icon_vframe = 0;
vicon = 0;
in_use = 1;
+ mtime = 0;
id = 0;
persistent = 0;
}
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;
}
-
+ 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 ) {
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 )
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;
mwindow->theme->get_awindow_sizes(this);
load_defaults(mwindow->defaults);
- int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y + 5;
+ 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);
+ search_text = new AWindowSearchText(mwindow, this, x1, y1+5);
search_text->create_objects();
int dy = search_text->get_h() + 10;
y1 += dy; h1 -= dy;
void AWindowGUI::reposition_objects()
{
- int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y + 5;
+ 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, w1);
+ 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);
{
if( !result ) {
printf(_("remove %s\n"), plugin->path);
+ awindow->gui->lock_window("AWindowRemovePlugin::handle_close_event");
ArrayList<BC_ListBoxItem*> *folder =
plugin->audio ? plugin->transition ?
&awindow->gui->atransitions :
&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;
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;
}
}
}
}
-void AWindowGUI::sort_assets()
+void AWindowGUI::sort_assets(int use_mtime)
{
switch( mwindow->edl->session->awindow_folder ) {
case AW_AEFFECT_FOLDER:
sort_picons(&labellist);
break;
default:
- sort_picons(&assets);
+ sort_picons(&assets, use_mtime);
}
// reset xyposition
asset_list->update_format(asset_list->get_format(), 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] && !strcasestr(picon->get_text(), 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;
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); item1->set_autoplace_icon(1);
}
}
-void AWindowGUI::sort_picons(ArrayList<BC_ListBoxItem*> *src)
+void AWindowGUI::sort_picons(ArrayList<BC_ListBoxItem*> *src, int use_mtime)
{
- 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; i<src->total-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; i<src->total; ++i ) {
+ AssetPicon *item = (AssetPicon *)src->values[i];
+ item->set_autoplace_icon(1);
+ item->set_autoplace_text(1);
+ }
+ }
}
break;
case AW_MEDIA_FOLDER:
case AW_PROXY_FOLDER:
- gui->assetlist_menu->update_titles();
+ gui->assetlist_menu->update_titles(folder==AW_MEDIA_FOLDER);
gui->assetlist_menu->activate_menu();
break;
}
int AWindowListSort::handle_event()
{
- gui->sort_assets();
+ gui->sort_assets(0);
return 1;
}
projects / goodguy / history.git / blobdiff