#include "awindow.h"
#include "awindowgui.h"
#include "bccmodels.h"
-#include "bcsignals.h"
#include "bchash.h"
+#include "bcsignals.h"
+#include "bctimer.h"
#include "binfolder.h"
#include "cache.h"
#include "cstrdup.h"
this->picon = picon;
this->length = length;
temp = 0;
+ broken = 0;
}
AssetVIcon::~AssetVIcon()
{
+ if( picon->gui->vicon_thread->solo == this )
+ picon->gui->vicon_thread->solo = 0;
picon->gui->vicon_thread->del_vicon(this);
delete temp;
}
VFrame *AssetVIcon::frame()
{
+ if( broken ) return 0;
AssetVIconThread *avt = picon->gui->vicon_thread;
- Asset *asset = (Asset *)picon->indexable;
- if( !asset )
- return *images[0];
+ Indexable *idxbl = picon->indexable;
+ Asset *asset = idxbl && idxbl->is_asset ? (Asset *)idxbl : 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();
}
if( seq_no >= images.size() ) {
MWindow *mwindow = picon->mwindow;
- File *file = mwindow->video_cache->check_out(asset, mwindow->edl, 1);
- if( !file ) return 0;
if( temp && (temp->get_w() != asset->width || temp->get_h() != asset->height) ) {
delete temp; temp = 0;
}
if( !temp )
temp = new VFrame(0, -1, asset->width, asset->height, BC_RGB888, -1);
- while( seq_no >= images.size() ) {
- mwindow->video_cache->check_in(asset);
- Thread::yield();
- file = mwindow->video_cache->check_out(asset, mwindow->edl, 0);
- if( !file ) { usleep(1000); continue; }
- file->set_layer(0);
+ File *file = mwindow->video_cache->check_out(asset, mwindow->edl, 1);
+ if( !file ) { broken = 1; return 0; }
+ Timer timer;
+ while( file && seq_no >= images.size() && !avt->interrupted ) {
int64_t pos = images.size() / picon->gui->vicon_thread->refresh_rate * frame_rate;
file->set_video_position(pos,0);
+ file->set_layer(0);
if( file->read_frame(temp) ) temp->clear_frame();
add_image(temp, vw, vh, vicon_cmodel);
+ mwindow->video_cache->check_in(asset);
+ if( timer.get_difference() > 500 ) return 0;
+ Thread::yield();
+ file = mwindow->video_cache->check_out(asset, mwindow->edl, 0);
+ for( int retries=10; !file && --retries>=0; usleep(1000) ) {
+ if( avt->interrupted ) return 0;
+ file = mwindow->video_cache->check_out(asset, mwindow->edl, 0);
+ }
+ if( !file ) return 0;
}
mwindow->video_cache->check_in(asset);
}
+ if( seq_no >= images.size() ) return 0;
return *images[seq_no];
}
{
this->draw_mode = draw_mode;
this->bar_h = (VIEW_POPUP_BAR_H * h) / 200;
+ dragging = 0;
}
AssetViewPopup::~AssetViewPopup()
double total_length = edl->tracks->total_length();
if( !total_length ) total_length = 1;
for( Track *track=edl->tracks->first; track!=0; track=track->next ) {
- if( !track->record ) continue;
+ if( !track->is_armed() ) continue;
for( Edit *edit=track->edits->first; edit!=0; edit=edit->next ) {
Indexable *indexable = (Indexable *)edit->asset;
if( !indexable ) indexable = (Indexable *)edit->nested_edl;
return av_popup;
}
-void AssetVIconThread::close_view_popup()
+void AssetVIconThread::stop_vicon_drawing(int wait)
{
stop_drawing();
- drawing_started(); // waits for draw lock
- drawing_stopped();
+ if( wait ) {
+ drawing_started(); // waits for draw lock
+ drawing_stopped();
+ }
}
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 ) {
- fs.extract_name(name, indexable->path);
+ Asset *asset = 0;
+ EDL *edl = 0;
+ int is_clip = 0;
+
+ if( this->indexable ) {
+ char *cp = name;
+ if( this->indexable->is_asset ) {
+ asset = (Asset *)indexable;
+ if( asset->format == FILE_REF ) {
+ cp += sprintf(cp, "ref:");
+ set_color(get_color() ^ 0x5599CC);
+ }
+ }
+ else {
+ edl = (EDL *)indexable;
+ cp += sprintf(cp, "edl:");
+// set_color(get_color() ^ 0xCC9955);
+ }
+ fs.extract_name(cp, indexable->path);
set_text(name);
}
- else if( edl ) {
- set_text(strcpy(name, edl->local_session->clip_title));
+ else if( this->edl ) {
+ edl = this->edl;
+ 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,
: 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)
+ xS(100), yS(100), 1, 1, 1)
{
this->mwindow = mwindow;
this->awindow = awindow;
vicon_audio = 0;
vicon_drawing = AVICON_FULL_PLAY;
play_off = 0;
+ tip_info = 0;
displayed_folder = AW_NO_FOLDER;
new_folder_thread = 0;
modify_folder_thread = 0;
void AWindowGUI::create_objects()
{
+ int ys5 = yS(5), ys10 = yS(10);
lock_window("AWindowGUI::create_objects");
asset_titles[0] = C_("Title");
asset_titles[1] = _("Comments");
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 = new AWindowSearchText(mwindow, this, x1, y1+ys5);
search_text->create_objects();
- int dy = search_text->get_h() + 10;
+ int dy = search_text->get_h() + ys10;
y1 += dy; h1 -= dy;
add_subwindow(asset_list = new AWindowAssets(mwindow, this, x1, y1, w1, h1));
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(xS(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();
void AWindowGUI::reposition_objects()
{
+ int ys5 = yS(5), ys10 = yS(10);
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;
+ search_text->reposition_window(x1, y1+ys5, w1);
+ int dy = search_text->get_h() + ys10;
y1 += dy; h1 -= dy;
asset_list->reposition_window(x1, y1, w1, h1);
divider->reposition_window(
{
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;
}
-int AWindowGUI::stop_vicon_drawing()
+int AWindowGUI::stop_vicon_drawing(int wait)
{
- if( !vicon_thread->interrupted )
- vicon_thread->stop_drawing();
+ vicon_thread->stop_vicon_drawing(wait);
return 0;
}
-void AWindowGUI::close_view_popup()
-{
- vicon_thread->close_view_popup();
-}
VFrame *AssetPicon::get_vicon_frame()
{
return 1;
}
+void AWindowGUI::hide_tip_info()
+{
+ asset_list->hide_tooltip();
+}
+
+
AWindowRemovePluginGUI::
AWindowRemovePluginGUI(AWindow *awindow, AWindowRemovePlugin *thread,
int x, int y, PluginServer *plugin)
- : BC_Window(_(PROGRAM_NAME ": Remove plugin"), x,y, 500,200, 50, 50, 1, 0, 1, -1, "", 1)
+ : BC_Window(_(PROGRAM_NAME ": Remove plugin"), x,y,
+ xS(500),yS(200), xS(50), yS(50),
+ 1, 0, 1, -1, "", 1)
{
this->awindow = awindow;
this->thread = thread;
void AWindowRemovePluginGUI::create_objects()
{
+ int xs10 = xS(10), xs20 = xS(20);
+ int ys5 = yS(5), ys10 = yS(10);
lock_window("AWindowRemovePluginGUI::create_objects");
BC_Button *ok_button = new BC_OKButton(this);
add_subwindow(ok_button);
BC_Button *cancel_button = new BC_CancelButton(this);
add_subwindow(cancel_button);
- int x = 10, y = 10;
+ int x = xs10, y = ys10;
BC_Title *title = new BC_Title(x, y, _("remove plugin?"));
add_subwindow(title);
- y += title->get_h() + 5;
+ y += title->get_h() + ys5;
list = new BC_ListBox(x, y,
- get_w() - 20, ok_button->get_y() - y - 5, LISTBOX_TEXT, &plugin_list,
+ get_w() - xs20, ok_button->get_y() - y - ys5, LISTBOX_TEXT, &plugin_list,
0, 0, 1, 0, 0, LISTBOX_SINGLE, ICON_LEFT, 0);
add_subwindow(list);
show_window();
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();
return 1;
}
unlock_window();
- mwindow->remove_assets_from_project(1, 1,
+ mwindow->remove_assets_from_project(1, 1, 1,
mwindow->session->drag_assets,
mwindow->session->drag_clips);
lock_window("AWindowGUI::keypress_event 2");
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);
}
}
}
update_assets();
}
-EDL *AWindowGUI::collect_proxy(Indexable *indexable)
+EDL *AWindowGUI::collect_proxy(Asset *proxy_asset)
{
- Asset *proxy_asset = (Asset *)indexable;
char path[BCTEXTLEN];
int proxy_scale = mwindow->edl->session->proxy_scale;
ProxyRender::from_proxy_path(path, proxy_asset, proxy_scale);
- Asset *unproxy_asset = mwindow->edl->assets->get_asset(path);
- if( !unproxy_asset || !unproxy_asset->layers ) return 0;
+ Indexable *unproxy_idxbl =
+ proxy_asset->proxy_edl ?
+ (Indexable *) mwindow->edl->get_nested_edl(path) :
+ (Indexable *) mwindow->edl->assets->get_asset(path);
+ if( !unproxy_idxbl || !unproxy_idxbl->get_video_layers() ) return 0;
// make a clip from proxy video tracks and unproxy audio tracks
EDL *proxy_edl = new EDL(mwindow->edl);
proxy_edl->create_objects();
strcpy(proxy_edl->local_session->clip_title, path);
strcpy(proxy_edl->local_session->clip_notes, _("Proxy clip"));
proxy_edl->session->video_tracks = proxy_asset->layers;
- proxy_edl->session->audio_tracks = unproxy_asset->channels;
+ proxy_edl->session->audio_tracks = unproxy_idxbl->get_audio_channels();
proxy_edl->create_default_tracks();
double length = proxy_asset->frame_rate > 0 ?
( proxy_asset->video_length >= 0 ?
if( current->data_type != TRACK_VIDEO ) continue;
current->insert_asset(proxy_asset, 0, length, 0, vtrack++);
}
- length = (double)unproxy_asset->audio_length / unproxy_asset->sample_rate;
+ int64_t samples = unproxy_idxbl->get_audio_samples();
+ int sample_rate = unproxy_idxbl->get_sample_rate();
+ length = sample_rate > 0 ? (double)samples / sample_rate : 0;
current = proxy_edl->tracks->first;
for( int atrack=0; current; current=NEXT ) {
if( current->data_type != TRACK_AUDIO ) continue;
- current->insert_asset(unproxy_asset, 0, length, 0, atrack++);
+ Asset *asset = unproxy_idxbl->is_asset ? (Asset *)unproxy_idxbl : 0;
+ EDL *nested_edl = unproxy_idxbl->is_asset ? 0 : (EDL *)unproxy_idxbl;
+ current->insert_asset(asset, nested_edl, length, 0, atrack++);
}
proxy_edl->folder_no = AW_PROXY_FOLDER;
return proxy_edl;
Indexable *indexable = result->indexable;
if( proxy && indexable && indexable->is_asset &&
indexable->folder_no == AW_PROXY_FOLDER ) {
- EDL *drag_edl = collect_proxy(indexable);
+ EDL *drag_edl = collect_proxy((Asset*)indexable);
if( drag_edl ) mwindow->session->drag_clips->append(drag_edl);
continue;
}
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 AWindowDivider::cursor_motion_event()
{
if( mwindow->session->current_operation == DRAG_PARTITION ) {
- int wmin = 25;
+ int wmin = xS(25);
int wmax = mwindow->session->awindow_w - mwindow->theme->adivider_w - wmin;
int fw = gui->get_relative_cursor_x();
if( fw > wmax ) fw = wmax;
int AWindowFolders::button_press_event()
{
+ gui->hide_tip_info();
int result = BC_ListBox::button_press_event();
if( !result ) {
char expanders_path[BCTEXTLEN];
mwindow->create_defaults_path(expanders_path, EXPANDERS_FILE);
FILE *fp = fopen(expanders_path, "r");
+ if( !fp ) {
+ snprintf(expanders_path, sizeof(expanders_path), "%s/%s",
+ File::get_cindat_path(), EXPANDERS_FILE);
+ char *cp = strrchr(expanders_path,'.');
+ if( cp ) strcpy(cp+1, mwindow->cin_lang);
+ fp = fopen(expanders_path, "r");
+ }
if( !fp ) {
snprintf(expanders_path, sizeof(expanders_path), "%s/%s",
File::get_cindat_path(), EXPANDERS_FILE);
fp = fopen(expanders_path, "r");
}
-
if( !fp ) return 1;
const char tab = '\t';
char line[BCTEXTLEN]; line[0] = 0;
{
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();
break;
}
if( !vwindow || !vwindow->is_running() ) return 1;
- if( proxy && picon_idxbl ) {
- picon_edl = gui->collect_proxy(picon_idxbl);
+ if( proxy && picon_idxbl && picon_idxbl->is_asset ) {
+ picon_edl = gui->collect_proxy((Asset*)picon_idxbl);
picon_idxbl = 0;
}
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);
}
set_font(LARGEFONT);
int folder = mwindow->edl->session->awindow_folder;
const char *title = mwindow->edl->get_folder_name(folder);
- draw_text(get_w() - get_text_width(LARGEFONT, title) - 4, 30,
+ draw_text(get_w() - get_text_width(LARGEFONT, title) - xS(4), yS(30),
title, -1, get_bg_surface());
}
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)
+{
+ int tw = get_text_width(MEDIUMFONT, info) + TOOLTIP_MARGIN * 2;
+ int th = get_text_height(MEDIUMFONT, info) + TOOLTIP_MARGIN * 2;
+ int tx = get_w() - (tw + xS(28));
+ int ty = get_h() - (th + yS(28));
+ show_tooltip(info, tx, ty, tw, th);
+ info_tip = no;
+}
+
+void AWindowAssets::hide_tip_info()
+{
+ hide_tooltip();
+ info_tip = -1;
}
void AWindowSearchText::create_objects()
{
- int x1 = x, y1 = y, margin = 10;
+ int xs10 = xS(10);
+ int x1 = x, y1 = y;
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;
+ x1 += text_title->get_w() + xs10;
+ int w1 = gui->get_w() - x1 - 2*xs10;
gui->add_subwindow(text_box = new AWindowSearchTextBox(this, x1, y1, w1));
}
int AWindowSearchText::get_w()
{
- return text_box->get_w() + text_title->get_w() + 10;
+ return text_box->get_w() + text_title->get_w() + xS(10);
}
int AWindowSearchText::get_h()
void AWindowSearchText::reposition_window(int x, int y, int w)
{
- int x1 = x, y1 = y, margin = 10;
+ int xs10 = xS(10);
+ int x1 = x, y1 = y;
text_title->reposition_window(x1, y1);
- x1 += text_title->get_w() + margin;
- int w1 = gui->get_w() - x1 - 2*margin;
+ x1 += text_title->get_w() + xs10;
+ int w1 = gui->get_w() - x1 - 2*xs10;
text_box->reposition_window(x1, y1, w1);
}
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