{
AssetVIconThread *avt = picon->gui->vicon_thread;
Asset *asset = (Asset *)picon->indexable;
- if( !asset )
- return *images[0];
+ if( !asset ) return vframes()>0 ? (VFrame*)*images[0] : 0;
if( !asset->video_data && audio_data && audio_size && length > 0 ) {
if( !temp ) temp = new VFrame(0, -1, w, h, BC_RGB888, -1);
temp->clear_frame();
{
this->draw_mode = draw_mode;
this->bar_h = (VIEW_POPUP_BAR_H * h) / 200;
+ dragging = 0;
}
AssetViewPopup::~AssetViewPopup()
vicon_frame = 0;
in_use = 1;
comments_time = 0;
+ comments_rate = -1;
+ comments_ffmt = ' ';
+ comments_type = "";
id = 0;
persistent = 0;
}
int picon_h = mwindow->preferences->awindow_picon_h;
pixmap_h = picon_h * BC_WindowBase::get_resources()->icon_scale;
- if( indexable ) {
+ Asset *asset = 0;
+ EDL *edl = 0;
+ int is_clip = 0;
+
+ if( this->indexable ) {
fs.extract_name(name, indexable->path);
set_text(name);
+ if( this->indexable->is_asset )
+ asset = (Asset *)indexable;
+ else
+ edl = (EDL *)indexable;
}
- else if( edl ) {
+ else if( this->edl ) {
+ edl = this->edl;
set_text(strcpy(name, edl->local_session->clip_title));
set_text(name);
+ is_clip = 1;
}
- if( indexable && indexable->is_asset ) {
- Asset *asset = (Asset*)indexable;
+ if( asset ) {
if( asset->video_data ) {
if( mwindow->preferences->use_thumbnails ) {
gui->unlock_window();
}
struct stat st;
comments_time = !stat(asset->path, &st) ? st.st_mtime : 0;
+ comments_rate = asset->get_frame_rate();
+ comments_ffmt = asset->format == FILE_FFMPEG ? '=' : '-';
+ comments_type = asset->format == FILE_FFMPEG ?
+ asset->vcodec : File::formattostr(asset->format);
}
- else
- if( indexable && !indexable->is_asset ) {
- icon = gui->video_icon;
- icon_vframe = gui->video_vframe;
- }
- else
- if( edl ) {
+ else if( edl ) {
if( edl->tracks->playable_video_tracks() ) {
if( mwindow->preferences->use_thumbnails ) {
gui->unlock_window();
char clip_icon_path[BCTEXTLEN];
char *clip_icon = edl->local_session->clip_icon;
VFrame *vframe = 0;
- if( clip_icon[0] ) {
+ if( is_clip && clip_icon[0] ) {
snprintf(clip_icon_path, sizeof(clip_icon_path),
"%s/%s", File::get_config_path(), clip_icon);
vframe = VFramePng::vframe_png(clip_icon_path);
close_render_engine();
vframe = new VFrame(avt->vw, avt->vh, BC_RGB888);
vframe->transfer_from(gui->temp_picon);
- if( clip_icon[0] )
+ if( this->edl && clip_icon[0] )
vframe->write_png(clip_icon_path);
}
pixmap_w = pixmap_h * width / height;
icon->draw_vframe(icon_vframe,
0, 0, pixmap_w, pixmap_h, 0, 0);
}
- else {
+ else if( is_clip ) {
icon = gui->clip_icon;
icon_vframe = gui->clip_vframe;
}
+ else {
+ icon = gui->video_icon;
+ icon_vframe = gui->video_vframe;
+ }
}
else
if( edl->tracks->playable_audio_tracks() ) {
gui->unlock_window();
char clip_icon_path[BCTEXTLEN];
char *clip_icon = edl->local_session->clip_icon;
- if( clip_icon[0] ) {
+ if( is_clip && clip_icon[0] ) {
snprintf(clip_icon_path, sizeof(clip_icon_path),
"%s/%s", File::get_config_path(), clip_icon);
icon_vframe = VFramePng::vframe_png(clip_icon_path);
base_colors[i], line_colors[i]);
}
for( int i=0; i<channels; ++i ) delete samples[i];
- if( clip_icon[0] ) icon_vframe->write_png(clip_icon_path);
+ if( is_clip && clip_icon[0] )
+ icon_vframe->write_png(clip_icon_path);
}
else {
pixmap_w = icon_vframe->get_w();
icon->draw_vframe(icon_vframe,
0, 0, pixmap_w, pixmap_h, 0, 0);
}
- else {
+ else if( !indexable ) {
icon = gui->clip_icon;
icon_vframe = gui->clip_vframe;
}
+ else {
+ icon = gui->audio_icon;
+ icon_vframe = gui->audio_vframe;
+ }
}
}
- else
- if( plugin ) {
+ else if( plugin ) {
strcpy(name, _(plugin->title));
set_text(name);
icon_vframe = plugin->get_picon();
}
}
}
- else
- if( label ) {
+ else if( label ) {
Units::totext(name,
label->position,
mwindow->edl->session->time_format,
int nw = get_text_width(MEDIUMFONT, _(av_names[i]));
if( tw < nw ) tw = nw;
}
- int pw = BC_PopupMenu::calculate_w(4, tw, -1) + 16;
+ int pw = BC_PopupMenu::calculate_w(16, tw, 1);
const char *text = _(AVIconDrawing::avicon_names[vicon_drawing]);
add_subwindow(avicon_drawing = new AVIconDrawing(this, fw, fy, pw, text));
avicon_drawing->create_objects();
{
defaults->update("PLUGIN_VISIBILTY", plugin_visibility);
defaults->update("VICON_DRAWING", vicon_drawing);
+ defaults->update("TIP_INFO", tip_info);
return 0;
}
{
plugin_visibility = defaults->get("PLUGIN_VISIBILTY", plugin_visibility);
vicon_drawing = defaults->get("VICON_DRAWING", vicon_drawing);
+ tip_info = defaults->get("TIP_INFO", tip_info);
return 0;
}
return 1;
}
+void AWindowGUI::hide_tip_info()
+{
+ asset_list->hide_tooltip();
+}
+
+
AWindowRemovePluginGUI::
AWindowRemovePluginGUI(AWindow *awindow, AWindowRemovePlugin *thread,
int x, int y, PluginServer *plugin)
return 1;
}
break;
+ case 'i':
+ tip_info = !tip_info ? 1 : 0;
+ if( !tip_info ) hide_tip_info();
+ return 1;
case 'o':
if( !ctrl_down() && !shift_down() ) {
assetlist_menu->load_file->handle_event();
continue;
}
if( picon->indexable && picon->indexable->is_asset ) {
+ Asset *asset = (Asset *)picon->indexable;
struct stat st;
- picon->comments_time = !stat(picon->indexable->path, &st) ?
- st.st_mtime : 0;
+ picon->comments_time = !stat(asset->path, &st) ? st.st_mtime : 0;
+ picon->comments_rate = asset->get_frame_rate();
+ picon->comments_ffmt = asset->format == FILE_FFMPEG ? '=' : '-';
+ picon->comments_type = asset->format == FILE_FFMPEG ?
+ asset->vcodec : File::formattostr(asset->format);
}
}
}
else if( picon->comments_time ) {
char date_time[BCSTRLEN];
struct tm stm; localtime_r(&picon->comments_time, &stm);
- sprintf(date_time,"%04d.%02d.%02d %02d:%02d:%02d",
+ sprintf(date_time,"%04d.%02d.%02d %02d:%02d:%02d @%0.2f %c%s",
stm.tm_year+1900, stm.tm_mon+1, stm.tm_mday,
- stm.tm_hour, stm.tm_min, stm.tm_sec);
+ stm.tm_hour, stm.tm_min, stm.tm_sec,
+ picon->comments_rate, picon->comments_ffmt,
+ picon->comments_type);
dst[1].append(item2 = new BC_ListBoxItem(date_time));
}
else
int AWindowFolders::button_press_event()
{
+ gui->hide_tip_info();
int result = BC_ListBox::button_press_event();
if( !result ) {
{
this->mwindow = mwindow;
this->gui = gui;
+ this->info_tip = -1;
set_drag_scroll(0);
set_scroll_stretch(1, 1);
}
int AWindowAssets::button_press_event()
{
+ hide_tip_info();
AssetVIconThread *avt = gui->vicon_thread;
if( avt->draw_mode != ASSET_VIEW_NONE && is_event_win() ) {
int dir = 1, button = get_buttonpress();
deactivate_selection();
}
- else if( get_button_down() &&
+ else if( get_button_down() && !gui->play_off &&
mwindow->edl->session->assetlist_format != ASSETS_TEXT ) {
item = (AssetPicon*)get_selection(0, 0);
if( item && !get_selection(0, 1) ) {
case AW_CLIP_FOLDER:
if( get_buttonpress() == LEFT_BUTTON ) {
AssetVIcon *vicon = 0;
- if( !gui->vicon_thread->vicon )
+ AssetVIconThread *avt = gui->vicon_thread;
+ if( !avt->vicon && gui->vicon_drawing != AVICON_NO_PLAY )
vicon = item->vicon;
gui->vicon_thread->set_view_popup(vicon, ASSET_VIEW_ICON);
}
int AWindowAssets::drag_start_event()
{
+ gui->vicon_thread->set_view_popup(0);
int collect_pluginservers = 0;
int collect_assets = 0, proxy = 0;
int AWindowAssets::cursor_leave_event()
{
+ hide_tip_info();
if( !is_event_win() ) return 0;
if( !gui->vicon_thread->viewing )
gui->stop_vicon_drawing();
default:
break;
}
- return 0;
+ if( no < 0 && info_tip >= 0 ) {
+ hide_tip_info();
+ }
+ if( gui->tip_info && no >= 0 &&
+ info_tip != no && picon && picon->plugin ) {
+ const char *info = picon->plugin->tip;
+ if( !info ) info = _("No info available");
+ show_tip_info(info, no);
+ }
+ return 1;
+}
+
+void AWindowAssets::show_tip_info(const char *info, int no)
+{
+ show_tooltip(info);
+ info_tip = no;
+}
+
+void AWindowAssets::hide_tip_info()
+{
+ hide_tooltip();
+ info_tip = -1;
}
int AVIconDrawing::draw_face(int dx, int color)
{
int ret = BC_PopupMenu::draw_face(dx, color);
- if( agui->play_off ) {
+ if( agui->play_off && agui->vicon_drawing != AVICON_NO_PLAY ) {
int lx = get_margin(), ly = get_h()/2;
draw_line(lx,ly, get_w()-2*lx,ly);
}
}
AVIconDrawing::AVIconDrawing(AWindowGUI *agui, int x, int y, int w, const char *text)
- : BC_PopupMenu(x-w, y, w, text, -1, 0, 4)
+ : BC_PopupMenu(x-w, y, w, text, 1, 0, 4)
{
this->agui = agui;
}
projects / goodguy / cinelerra.git / blobdiff