X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.C;h=a88acce6cc95473fa02a2da27cf60d092e69651a;hp=30ae58b39a2f1afcafe649d059c83523b86615a7;hb=05a3780d6edd6a792f0dde46ed69e4b740af5a51;hpb=2292a9b260b7c5f0ee85280823ef760910ace931 diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C index 30ae58b3..a88acce6 100644 --- a/cinelerra-5.1/cinelerra/awindowgui.C +++ b/cinelerra-5.1/cinelerra/awindowgui.C @@ -54,6 +54,7 @@ #include "labels.h" #include "labelpopup.h" #include "localsession.h" +#include "mainerror.h" #include "mainmenu.h" #include "mainsession.h" #include "mwindowgui.h" @@ -94,6 +95,13 @@ const char *AWindowGUI::folder_names[] = N_("Proxy"), }; +const char *AVIconDrawing::avicon_names[] = +{ + N_("Full Play"), + N_("Mouse Over"), + N_("Src Target"), + N_("No Play"), +}; AssetVIcon::AssetVIcon(AssetPicon *picon, int w, int h, double framerate, int64_t length) : VIcon(w, h, framerate), Garbage("AssetVIcon") @@ -111,9 +119,12 @@ AssetVIcon::~AssetVIcon() VFrame *AssetVIcon::frame() { + AssetVIconThread *avt = picon->gui->vicon_thread; Asset *asset = (Asset *)picon->indexable; + if( !asset ) + return *images[0]; if( !asset->video_data && audio_data && audio_size && length > 0 ) { - if( !temp ) temp = new VFrame(0, -1, vw, vh, BC_RGB888, -1); + if( !temp ) temp = new VFrame(0, -1, w, h, BC_RGB888, -1); temp->clear_frame(); int sample_rate = asset->get_sample_rate(); int64_t audio_samples = asset->get_audio_samples(); @@ -134,16 +145,15 @@ VFrame *AssetVIcon::frame() while( i < len ) data[i++] = *audio_data++ * sample_scale; while( i < bfrsz ) data[i++] = 0; picon->draw_wave(temp, data, bfrsz, RED, GREEN); - int x = (vw-1) * line_pos; + int x = (w-1) * line_pos; temp->pixel_rgb = RED; - temp->draw_line(x,0, x,vh); + temp->draw_line(x,0, x,h); return temp; } - int ww = picon->gui->vicon_thread->view_w; - int hh = picon->gui->vicon_thread->view_h; + int vw = avt->vw, vh = avt->vh, vicon_cmodel = avt->vicon_cmodel; if( !asset->video_data ) { if( !temp ) { - temp = new VFrame(0, -1, ww, hh, BC_RGB888, -1); + temp = new VFrame(0, -1, vw, vh, BC_RGB888, -1); temp->clear_frame(); } return temp; @@ -166,7 +176,7 @@ VFrame *AssetVIcon::frame() int64_t pos = images.size() / picon->gui->vicon_thread->refresh_rate * frame_rate; file->set_video_position(pos,0); if( file->read_frame(temp) ) temp->clear_frame(); - add_image(temp, ww, hh, BC_RGB8); + add_image(temp, vw, vh, vicon_cmodel); } mwindow->video_cache->check_in(asset); } @@ -274,7 +284,9 @@ void AssetVIconAudio::start(AssetVIcon *vicon) { if( running() ) return; interrupted = 0; - audio_pos = 0; + double pos = vicon->length > 0 ? (double)vicon->seq_no/vicon->length : 0; + int audio_len = vicon->audio_size/sizeof(vicon_audio_t); + audio_pos = pos * audio_len; this->vicon = vicon; Thread::start(); } @@ -302,21 +314,63 @@ void AssetVIcon::start_audio() void AssetVIcon::stop_audio() { - if( playing_audio > 0 ) + if( playing_audio > 0 ) { picon->gui->vicon_audio->stop(0); - playing_audio = 0; + playing_audio = 0; + } +} + +AssetViewPopup::AssetViewPopup(VIconThread *vt, int draw_mode, + int x, int y, int w, int h) + : ViewPopup(vt, x, y, w, h) +{ + this->draw_mode = draw_mode; + this->bar_h = (VIEW_POPUP_BAR_H * h) / 200; +} + +AssetViewPopup::~AssetViewPopup() +{ } -int AssetVIcon::popup_button_press(int x, int y) +int AssetViewPopup::reposition_window(int x, int y, int w, int h) { - if( playing_audio >= 0 ) return 0; - VIconThread *vt = picon->gui->vicon_thread; - ViewPopup *view_win = vt->view_win; - if( !view_win || !view_win->is_event_win() ) return 0; - int view_w = view_win->get_w(), view_h = view_win->get_h(); + this->bar_h = (VIEW_POPUP_BAR_H * h) / 200; + return ViewPopup::reposition_window(x, y, w, h); +} + +int AssetViewPopup::button_press_event() +{ + if( !is_event_win() ) return 0; + AssetVIconThread *avt = (AssetVIconThread *)vt; + if( !avt->vicon ) return 0; + + int dir = 1; + switch( get_buttonpress() ) { + case LEFT_BUTTON: + break; + case MIDDLE_BUTTON: + avt->set_view_popup(0); + return 1; + case WHEEL_DOWN: + dir = -1; // fall thru + case WHEEL_UP: + switch( draw_mode ) { + case ASSET_VIEW_MEDIA: + case ASSET_VIEW_MEDIA_MAP: + avt->zoom_scale(dir); + return 1; + } // fall thru + default: + return 0; + } + + int x = get_cursor_x(), y = get_cursor_y(); + AssetVIcon *vicon = (AssetVIcon *)avt->vicon; + AssetPicon *picon = vicon->picon; MWindow *mwindow = picon->mwindow; EDL *edl = mwindow->edl; - if( y < VIEW_POPUP_BAR_H ) { + dragging = 0; + if( y < get_h()/2 ) { Indexable *idxbl = picon->indexable ? picon->indexable : picon->edl ? picon->edl : 0; @@ -328,7 +382,7 @@ int AssetVIcon::popup_button_press(int x, int y) double video_length = frame_rate > 0 && idxbl->have_video() ? idxbl->get_video_frames() / frame_rate : 0; double idxbl_length = bmax(audio_length, video_length); - double pos = x * idxbl_length / view_w; + double pos = x * idxbl_length / get_w(); double start = 0, end = idxbl_length; double lt = DBL_MAX, rt = DBL_MAX; for( Track *track=edl->tracks->first; track!=0; track=track->next ) { @@ -357,28 +411,46 @@ int AssetVIcon::popup_button_press(int x, int y) vedl->set_inpoint(start); vedl->set_outpoint(end); vedl->local_session->set_selectionstart(start); - vedl->local_session->set_selectionend(end); - vwindow->update_position(CHANGE_NONE, 0, 1, 0); + vedl->local_session->set_selectionend(start); + vwindow->gui->lock_window("AssetViewPopup::button_press_event"); + vwindow->update_position(); + vwindow->gui->unlock_window(); return 1; } - return y < view_h-VIEW_POPUP_BAR_H ? 0 : popup_cursor_motion(x, y); -} - -int AssetVIcon::popup_cursor_motion(int x, int y) -{ - if( playing_audio >= 0 ) return 0; - VIconThread *vt = picon->gui->vicon_thread; - ViewPopup *view_win = (ViewPopup *)vt->view_win; - if( !view_win || !view_win->is_event_win() || - !view_win->get_button_down() ) return 0; - int view_w = view_win->get_w(), view_h = view_win->get_h(); - MWindow *mwindow = picon->mwindow; - EDL *edl = mwindow->edl; - if( y >= view_h-VIEW_POPUP_BAR_H ) { - double total_length = edl->tracks->total_length(); - double pos = x * total_length / view_w; - mwindow->gui->lock_window("AssetVIcon::popup_cursor_motion"); - mwindow->select_point(pos); + else { + dragging = 1; + if( !ctrl_down() && !shift_down() ) + return cursor_motion_event(); + Indexable *idxbl = + picon->indexable ? picon->indexable : + picon->edl ? picon->edl : 0; + if( !idxbl ) return 0; + double total_length = mwindow->edl->tracks->total_length(); + double pos = x * total_length / get_w(); + double start = 0, end = total_length; + double lt = DBL_MAX, rt = DBL_MAX; + for( Track *track=edl->tracks->first; track!=0; track=track->next ) { + for( Edit *edit=track->edits->first; edit!=0; edit=edit->next ) { + Indexable *indexable = (Indexable *)edit->asset; + if( !indexable ) indexable = (Indexable *)edit->nested_edl; + if( !indexable ) continue; + if( indexable->id == idxbl->id || + (!indexable->is_asset == !idxbl->is_asset && + !strcmp(indexable->path, idxbl->path)) ) { + double start_pos = track->from_units(edit->startproject); + double end_pos = track->from_units(edit->startproject + edit->length); + double dlt = pos - start_pos, drt = end_pos - pos; + if( dlt >= 0 && dlt < lt ) { lt = dlt; start = start_pos; } + else if( dlt < 0 && -dlt < rt ) { rt = -dlt; end = start_pos; } + if( drt >= 0 && drt < rt ) { rt = drt; end = end_pos; } + else if( drt < 0 && -drt < lt ) { lt = -drt; start = end_pos; } + } + } + } + mwindow->gui->lock_window("AssetVIcon::popup_button_press"); + mwindow->select_point(start); + edl->local_session->set_selectionstart(start); + edl->local_session->set_selectionend(!shift_down() ? start : end); mwindow->zoom_sample(edl->local_session->zoom_sample); mwindow->gui->unlock_window(); return 1; @@ -386,6 +458,230 @@ int AssetVIcon::popup_cursor_motion(int x, int y) return 0; } +int AssetViewPopup::button_release_event() +{ + if( !is_event_win() ) return 0; + dragging = 0; + return 1; +} + +int AssetViewPopup::cursor_motion_event() +{ + AssetVIconThread *avt = (AssetVIconThread *)vt; + AssetVIcon *vicon = (AssetVIcon *)avt->vicon; + if( vicon && dragging && is_event_win() && + get_button_down() && get_buttonpress() == LEFT_BUTTON && + !ctrl_down() && !alt_down() && !shift_down() ) { + switch( draw_mode ) { + case ASSET_VIEW_MEDIA_MAP: + case ASSET_VIEW_FULL: + MWindow *mwindow = vicon->picon->mwindow; + EDL *edl = mwindow->edl; + int x = get_cursor_x(); + double total_length = edl->tracks->total_length(); + double pos = x * total_length / get_w(); + mwindow->gui->lock_window("AssetVIcon::popup_cursor_motion"); + mwindow->select_point(pos); + mwindow->zoom_sample(edl->local_session->zoom_sample); + mwindow->gui->unlock_window(); + return 1; + } + } + return 0; +} + +void AssetViewPopup::draw_vframe(VFrame *vframe) +{ + switch( draw_mode ) { + case ASSET_VIEW_MEDIA: + case ASSET_VIEW_ICON: + ViewPopup::draw_vframe(vframe); + case ASSET_VIEW_NONE: + default: + return; + case ASSET_VIEW_MEDIA_MAP: + case ASSET_VIEW_FULL: + break; + } + set_color(BLACK); + draw_box(0,0,get_w(),get_h()); + int y1 = bar_h; + int y2 = get_h()-bar_h; + BC_WindowBase::draw_vframe(vframe, 0,y1, get_w(),y2-y1); + AssetVIconThread *avt = (AssetVIconThread *)vt; + AssetVIcon *vicon = (AssetVIcon *)avt->vicon; + AssetPicon *picon = (AssetPicon *)vicon->picon; + Indexable *idxbl = + picon->indexable ? picon->indexable : + picon->edl ? picon->edl : 0; + if( !idxbl ) return; + double sample_rate = idxbl->get_sample_rate(); + double audio_length = sample_rate > 0 && idxbl->have_audio() ? + idxbl->get_audio_samples() / sample_rate : 0; + double frame_rate = idxbl->get_frame_rate(); + double video_length = frame_rate > 0 && idxbl->have_video() ? + idxbl->get_video_frames() / frame_rate : 0; + double idxbl_length = bmax(audio_length, video_length); + if( !idxbl_length ) idxbl_length = 1; + + EDL *edl = picon->mwindow->edl; + 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; + for( Edit *edit=track->edits->first; edit!=0; edit=edit->next ) { + Indexable *indexable = (Indexable *)edit->asset; + if( !indexable ) indexable = (Indexable *)edit->nested_edl; + if( !indexable ) continue; + if( indexable->id == idxbl->id || + (!indexable->is_asset == !idxbl->is_asset && + !strcmp(indexable->path, idxbl->path)) ) { + double pos1 = track->from_units(edit->startsource); + double pos2 = track->from_units(edit->startsource + edit->length); + double xscale = get_w() / idxbl_length; + int ex1 = pos1 * xscale, ex2 = pos2 * xscale; + set_color(WHITE); + draw_box(ex1,0, ex2-ex1,y1); + set_color(BLACK); + draw_line(ex1,0, ex1,y1); + draw_line(ex2,0, ex2,y1); + pos1 = track->from_units(edit->startproject); + pos2 = track->from_units(edit->startproject + edit->length); + xscale = get_w() / total_length; + int px1 = pos1 * xscale, px2 = pos2 * xscale; + set_color(RED); + draw_box(px1,y2, px2-px1,get_h()-y2); + set_color(BLACK); + draw_line(px1,y2, px1,get_h()-1); + draw_line(px2,y2, px2,get_h()-1); + + set_color(YELLOW); + draw_line(ex1,y1, px1,y2); + draw_line(ex2,y1, px2,y2); + } + } + } +} + +int AssetViewPopup::keypress_event() +{ + int result = 0; + AssetVIconThread *avt = (AssetVIconThread *)vt; + switch( avt->draw_mode ) { + case ASSET_VIEW_MEDIA_MAP: + switch( get_keypress() ) { + case 'f': + case 'F': + avt->draw_mode = ASSET_VIEW_FULL; + result = 1; + } + break; + case ASSET_VIEW_FULL: + avt->draw_mode = ASSET_VIEW_MEDIA_MAP; + result = 1; + } + if( result ) // zero change for refresh + avt->zoom_scale(0); + return ViewPopup::keypress_event(); +} + + +AssetVIconThread::AssetVIconThread(AWindowGUI *gui, Preferences *preferences) + : VIconThread(gui->asset_list, preferences->vicon_size * 16/9, preferences->vicon_size, + 4*preferences->awindow_picon_h * 16/9, 4*preferences->awindow_picon_h) +{ + this->gui = gui; + draw_mode = ASSET_VIEW_NONE; + int vicon_cmodel = BC_RGB8; + switch( preferences->vicon_color_mode ) { + case VICON_COLOR_MODE_LOW: vicon_cmodel = BC_RGB8; break; + case VICON_COLOR_MODE_MED: vicon_cmodel = BC_RGB565; break; + case VICON_COLOR_MODE_HIGH: vicon_cmodel = BC_RGB888; break; + } + this->vicon_cmodel = vicon_cmodel; + this->draw_lock = new Mutex("AssetVIconThread::draw_lock"); +} + +AssetVIconThread::~AssetVIconThread() +{ + delete draw_lock; +} + +void AssetVIconThread::drawing_started() +{ + draw_lock->lock("AssetVIconThread::drawing_started"); +} + +void AssetVIconThread::drawing_stopped() +{ + draw_lock->unlock(); +} + +void AssetVIconThread::set_view_popup(AssetVIcon *v, int draw_mode) +{ + gui->stop_vicon_drawing(); + this->draw_mode = draw_mode; + set_view_popup(v); + gui->start_vicon_drawing(); +} + +void AssetVIconThread::set_view_popup(AssetVIcon *v) +{ + if( !v ) draw_mode = ASSET_VIEW_NONE; + VIconThread::set_view_popup(v); +} + +ViewPopup *AssetVIconThread::new_view_window(ViewPopup *vpopup) +{ + BC_WindowBase *parent = wdw->get_parent(); + int rx = 0, ry = 0, rw = 0, rh = 0; + if( draw_mode != ASSET_VIEW_FULL ) { + XineramaScreenInfo *info = parent->get_xinerama_info(-1); + int cx = info ? info->x_org + info->width/2 : parent->get_root_w(0)/2; + int cy = info ? info->y_org + info->height/2 : parent->get_root_h(0)/2; + int vx = viewing->get_vx(), vy = viewing->get_vy(); + wdw->get_root_coordinates(vx, vy, &rx, &ry); + rx += (rx >= cx ? -view_w+viewing->w/4 : viewing->w-viewing->w/4); + ry += (ry >= cy ? -view_h+viewing->h/4 : viewing->h-viewing->h/4); + rw = view_w; rh = view_h; + } + else + parent->get_fullscreen_geometry(rx, ry, rw, rh); + AssetViewPopup *av_popup = (AssetViewPopup *)vpopup; + if( av_popup ) + av_popup->reposition_window(rx, ry, rw, rh); + else + av_popup = new AssetViewPopup(this, draw_mode, rx, ry, rw, rh); + int playing_audio = gui->play_off ? -1 : 0; + if( !playing_audio ) { + switch( draw_mode ) { + case ASSET_VIEW_NONE: + case ASSET_VIEW_ICON: + case ASSET_VIEW_MEDIA_MAP: + case ASSET_VIEW_FULL: + playing_audio = -1; + break; + case ASSET_VIEW_MEDIA: + switch( gui->vicon_drawing ) { + case AVICON_SRC_TARGET: + case AVICON_NO_PLAY: + playing_audio = -1; + break; + } + } + } + vicon->playing_audio = playing_audio; + wdw->set_active_subwindow(av_popup); + return av_popup; +} + +void AssetVIconThread::close_view_popup() +{ + stop_drawing(); + drawing_started(); // waits for draw lock + drawing_stopped(); +} + AWindowFolderItem::AWindowFolderItem() : BC_ListBoxItem() @@ -610,7 +906,8 @@ void AssetPicon::create_objects() char name[BCTEXTLEN]; int pixmap_w, pixmap_h; - pixmap_h = 50 * BC_WindowBase::get_resources()->icon_scale; + 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); @@ -664,7 +961,8 @@ void AssetPicon::create_objects() icon_vframe = new VFrame(0, -1, pixmap_w, pixmap_h, BC_RGB888, -1); icon_vframe->transfer_from(gui->temp_picon); - if( asset->folder_no == AW_MEDIA_FOLDER ) { + if( asset->folder_no == AW_MEDIA_FOLDER || + asset->folder_no == AW_PROXY_FOLDER ) { // vicon images double framerate = asset->get_frame_rate(); if( !framerate ) framerate = VICON_RATE; @@ -682,27 +980,9 @@ void AssetPicon::create_objects() } gui->vicon_thread->add_vicon(vicon); } - else if( asset->folder_no == AW_PROXY_FOLDER ) { - char unproxy_path[BCTEXTLEN]; - int proxy_scale = mwindow->edl->session->proxy_scale; - if( !ProxyRender::from_proxy_path(unproxy_path, asset, proxy_scale) ) { - Asset *unproxy = mwindow->edl->assets->get_asset(unproxy_path); - if( unproxy ) { - int i = gui->assets.total; - while( --i >= 0 ) { - AssetPicon *picon = (AssetPicon*)gui->assets[i]; - if( picon->id == unproxy->id ) { - vicon = picon->vicon; - if( vicon ) vicon->add_user(); - break; - } - } - } - } - } - } else { + eprintf("Unable to open %s\nin asset: %s",asset->path, get_text()); gui->lock_window("AssetPicon::create_objects 2"); icon = gui->video_icon; icon_vframe = gui->video_vframe; @@ -765,6 +1045,7 @@ void AssetPicon::create_objects() 0, 0, pixmap_w, pixmap_h, 0, 0); } else { + eprintf("Unable to open %s\nin asset: %s",asset->path, get_text()); gui->lock_window("AssetPicon::create_objects 5"); icon = gui->audio_icon; icon_vframe = gui->audio_vframe; @@ -789,32 +1070,26 @@ void AssetPicon::create_objects() if( edl->tracks->playable_video_tracks() ) { if( mwindow->preferences->use_thumbnails ) { gui->unlock_window(); + AssetVIconThread *avt = gui->vicon_thread; char clip_icon_path[BCTEXTLEN]; char *clip_icon = edl->local_session->clip_icon; + VFrame *vframe = 0; if( 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); + vframe = VFramePng::vframe_png(clip_icon_path); } - if( !icon_vframe ) { + if( vframe && + ( vframe->get_w() != avt->vw || vframe->get_h() != avt->vh ) ) { + delete vframe; vframe = 0; + } + int edl_h = edl->get_h(), edl_w = edl->get_w(); + int height = edl_h > 0 ? edl_h : 1; + int width = edl_w > 0 ? edl_w : 1; + int color_model = edl->session->color_model; + if( !vframe ) { //printf("render clip: %s\n", name); - int edl_h = edl->get_h(), edl_w = edl->get_w(); - int height = edl_h > 0 ? edl_h : 1; - int width = edl_w > 0 ? edl_w : 1; - int color_model = edl->session->color_model; - pixmap_w = pixmap_h * width / height; - - if( gui->temp_picon && - (gui->temp_picon->get_color_model() != color_model || - gui->temp_picon->get_w() != width || - gui->temp_picon->get_h() != height) ) { - delete gui->temp_picon; gui->temp_picon = 0; - } - - if( !gui->temp_picon ) { - gui->temp_picon = new VFrame(0, -1, - width, height, color_model, -1); - } + VFrame::get_temp(gui->temp_picon, width, height, color_model); char string[BCTEXTLEN]; sprintf(string, _("Rendering %s"), name); mwindow->gui->lock_window("AssetPicon::create_objects"); @@ -823,15 +1098,17 @@ void AssetPicon::create_objects() open_render_engine(edl, 0); render_video(0, gui->temp_picon); close_render_engine(); - icon_vframe = new VFrame(0, - -1, pixmap_w, pixmap_h, BC_RGB888, -1); - icon_vframe->transfer_from(gui->temp_picon); - if( clip_icon[0] ) icon_vframe->write_png(clip_icon_path); - } - else { - pixmap_w = icon_vframe->get_w(); - pixmap_h = icon_vframe->get_h(); + vframe = new VFrame(avt->vw, avt->vh, BC_RGB888); + vframe->transfer_from(gui->temp_picon); + if( clip_icon[0] ) + vframe->write_png(clip_icon_path); } + pixmap_w = pixmap_h * width / height; + vicon = new AssetVIcon(this, pixmap_w, pixmap_h, VICON_RATE, 1); + vicon->add_image(vframe, avt->vw, avt->vh, avt->vicon_cmodel); + icon_vframe = new VFrame(pixmap_w, pixmap_h, BC_RGB888); + icon_vframe->transfer_from(vframe); + delete vframe; gui->lock_window("AssetPicon::create_objects 0"); icon = new BC_Pixmap(gui, pixmap_w, pixmap_h); icon->draw_vframe(icon_vframe, @@ -975,14 +1252,6 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow) video_vframe = 0; video_icon = 0; label_vframe = 0; label_icon = 0; - atransition_vframe = 0; atransition_icon = 0; - vtransition_vframe = 0; vtransition_icon = 0; - aeffect_vframe = 0; aeffect_icon = 0; - ladspa_vframe = 0; ladspa_icon = 0; - veffect_vframe = 0; veffect_icon = 0; - ff_aud_vframe = 0; ff_aud_icon = 0; - ff_vid_vframe = 0; ff_vid_icon = 0; - aeffect_folder_vframe = 0; aeffect_folder_icon = 0; atransition_folder_vframe = 0; atransition_folder_icon = 0; clip_folder_vframe = 0; clip_folder_icon = 0; @@ -1016,7 +1285,8 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow) remove_plugin = 0; vicon_thread = 0; vicon_audio = 0; - vicon_drawing = 1; + vicon_drawing = AVICON_FULL_PLAY; + play_off = 0; displayed_folder = AW_NO_FOLDER; new_folder_thread = 0; modify_folder_thread = 0; @@ -1201,7 +1471,7 @@ void AWindowGUI::create_objects() y1 += dy; h1 -= dy; add_subwindow(asset_list = new AWindowAssets(mwindow, this, x1, y1, w1, h1)); - vicon_thread = new VIconThread(asset_list); + vicon_thread = new AssetVIconThread(this, mwindow->preferences); asset_list->update_vicon_area(); vicon_thread->start(); vicon_audio = new AssetVIconAudio(this); @@ -1214,9 +1484,16 @@ void AWindowGUI::create_objects() 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"); - AVIconDrawing::calculate_geometry(this, images, &avicon_w, &avicon_h); - add_subwindow(avicon_drawing = new AVIconDrawing(this, fw-avicon_w, fy, images)); + int n = sizeof(AVIconDrawing::avicon_names)/sizeof(AVIconDrawing::avicon_names[0]); + int tw = 0; const char **av_names = AVIconDrawing::avicon_names; + for( int i=0; icreate_objects(); 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(); @@ -1314,7 +1591,7 @@ void AWindowGUI::reposition_objects() int fx = mwindow->theme->afolders_x, fy = mwindow->theme->afolders_y; int fw = mwindow->theme->afolders_w, fh = mwindow->theme->afolders_h; add_tools->resize_event(fw-avicon_w, add_tools->get_h()); - avicon_drawing->reposition_window(fw-avicon_w, fy); + avicon_drawing->reposition_window(fw-avicon_drawing->get_w(), fy); fy += add_tools->get_h(); fh -= add_tools->get_h(); folder_list->reposition_window(fx, fy, fw, fh); } @@ -1349,11 +1626,23 @@ int AWindowGUI::close_event() return 1; } -void AWindowGUI::start_vicon_drawing() +int AWindowGUI::start_vicon_drawing() { - if( !vicon_drawing || !vicon_thread->interrupted ) return; + if( play_off ) return stop_vicon_drawing(); + if( !vicon_thread->interrupted ) return 1; + switch( vicon_drawing ) { + case AVICON_FULL_PLAY: // all vicons, viewing, target + break; + case AVICON_MOUSE_OVER: // one vicon, viewing, target + if( vicon_thread->solo ) break; + // fall thru + case AVICON_SRC_TARGET: // no vicons, no view, target + case AVICON_NO_PLAY: // no vicons, no view, no target + return 0; + } if( mwindow->edl->session->awindow_folder == AW_MEDIA_FOLDER || mwindow->edl->session->awindow_folder == AW_PROXY_FOLDER || + mwindow->edl->session->awindow_folder == AW_CLIP_FOLDER || mwindow->edl->session->awindow_folder >= AWINDOW_USER_FOLDERS ) { switch( mwindow->edl->session->assetlist_format ) { case ASSETS_ICONS: @@ -1366,12 +1655,19 @@ void AWindowGUI::start_vicon_drawing() break; } } + return 1; } -void AWindowGUI::stop_vicon_drawing() +int AWindowGUI::stop_vicon_drawing() { - if( vicon_thread->interrupted ) return; - vicon_thread->stop_drawing(); + if( !vicon_thread->interrupted ) + vicon_thread->stop_drawing(); + return 0; +} + +void AWindowGUI::close_view_popup() +{ + vicon_thread->close_view_popup(); } VFrame *AssetPicon::get_vicon_frame() @@ -1381,7 +1677,7 @@ VFrame *AssetPicon::get_vicon_frame() VFrame *frame = vicon->frame(); if( !frame ) return 0; if( !vicon_frame ) - vicon_frame = new VFrame(vicon->vw, vicon->vh, frame->get_color_model()); + vicon_frame = new VFrame(vicon->w, vicon->h, frame->get_color_model()); vicon_frame->transfer_from(frame); return vicon_frame; } @@ -2236,7 +2532,7 @@ int AWindowFolders::selection_changed() gui->stop_vicon_drawing(); - if( get_button_down() && get_buttonpress() == 3 ) { + if( get_button_down() && get_buttonpress() == RIGHT_BUTTON ) { gui->folderlist_menu->update_titles(); gui->folderlist_menu->activate_menu(); } @@ -2252,19 +2548,17 @@ int AWindowFolders::selection_changed() int AWindowFolders::button_press_event() { - int result = 0; - - result = BC_ListBox::button_press_event(); + int result = BC_ListBox::button_press_event(); if( !result ) { - if( get_buttonpress() == 3 && is_event_win() && cursor_inside() ) { + if( get_buttonpress() == RIGHT_BUTTON && + is_event_win() && cursor_inside() ) { gui->folderlist_menu->update_titles(); gui->folderlist_menu->activate_menu(); result = 1; } } - return result; } @@ -2377,7 +2671,6 @@ AWindowAssets::AWindowAssets(MWindow *mwindow, AWindowGUI *gui, int x, int y, in this->gui = gui; set_drag_scroll(0); set_scroll_stretch(1, 1); - draw_func = 0; } AWindowAssets::~AWindowAssets() @@ -2386,11 +2679,23 @@ AWindowAssets::~AWindowAssets() int AWindowAssets::button_press_event() { - int result = 0; + AssetVIconThread *avt = gui->vicon_thread; + if( avt->draw_mode != ASSET_VIEW_NONE && is_event_win() ) { + int dir = 1, button = get_buttonpress(); + switch( button ) { + case WHEEL_DOWN: dir = -1; // fall thru + case WHEEL_UP: { + int x = get_cursor_x(), y = get_cursor_y(); + if( avt->cursor_inside(x, y) && avt->view_win ) + avt->zoom_scale(dir); + return 1; } + } + } - result = BC_ListBox::button_press_event(); + int result = BC_ListBox::button_press_event(); - if( !result && get_buttonpress() == 3 && is_event_win() && cursor_inside() ) { + if( !result && get_buttonpress() == RIGHT_BUTTON && + is_event_win() && cursor_inside() ) { BC_ListBox::deactivate_selection(); int folder = mwindow->edl->session->awindow_folder; switch( folder ) { @@ -2462,9 +2767,9 @@ int AWindowAssets::selection_changed() { // Show popup window AssetPicon *item; - if( get_button_down() && get_buttonpress() == 3 && + int folder = mwindow->edl->session->awindow_folder; + if( get_button_down() && get_buttonpress() == RIGHT_BUTTON && (item = (AssetPicon*)get_selection(0, 0)) ) { - int folder = mwindow->edl->session->awindow_folder; switch( folder ) { case AW_AEFFECT_FOLDER: case AW_VEFFECT_FOLDER: @@ -2496,89 +2801,46 @@ int AWindowAssets::selection_changed() deactivate_selection(); } - else if( gui->vicon_drawing && get_button_down() && - ( get_buttonpress() == 1 || get_buttonpress() == 2 ) && - ( mwindow->edl->session->awindow_folder == AW_MEDIA_FOLDER || - mwindow->edl->session->awindow_folder == AW_PROXY_FOLDER || - mwindow->edl->session->awindow_folder >= AWINDOW_USER_FOLDERS ) && - (item = (AssetPicon*)get_selection(0, 0)) != 0 ) { - VIcon *vicon = 0; - if( !gui->vicon_thread->vicon ) { - vicon = item->vicon; + 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) ) { + switch( folder ) { + case AW_MEDIA_FOLDER: + case AW_PROXY_FOLDER: + case AWINDOW_USER_FOLDERS: + if( get_buttonpress() == LEFT_BUTTON || + get_buttonpress() == MIDDLE_BUTTON ) { + AssetVIcon *vicon = 0; + AssetVIconThread *avt = gui->vicon_thread; + if( !avt->vicon && gui->vicon_drawing != AVICON_NO_PLAY ) + vicon = item->vicon; + int draw_mode = !vicon ? + ASSET_VIEW_NONE : + get_buttonpress() == MIDDLE_BUTTON ? + ASSET_VIEW_MEDIA_MAP : ASSET_VIEW_MEDIA; + avt->set_view_popup(vicon, draw_mode); + } + break; + case AW_CLIP_FOLDER: + if( get_buttonpress() == LEFT_BUTTON ) { + AssetVIcon *vicon = 0; + if( !gui->vicon_thread->vicon ) + vicon = item->vicon; + gui->vicon_thread->set_view_popup(vicon, ASSET_VIEW_ICON); + } + break; + } } - if( vicon && get_buttonpress() == 2 ) { - vicon->playing_audio = -1; - draw_func = AWindowAssets::draw_vframe; + else { + gui->vicon_thread->set_view_popup(0); + if( gui->vicon_drawing != AVICON_FULL_PLAY ) + gui->stop_vicon_drawing(); } - else - draw_func = 0; - gui->vicon_thread->set_view_popup(vicon, draw_func); } return 1; } -void AWindowAssets::draw_vframe(BC_WindowBase *wdw, VFrame *vframe) -{ - int y1 = VIEW_POPUP_BAR_H; - int y2 = wdw->get_h()-VIEW_POPUP_BAR_H; - wdw->set_color(BLACK); - wdw->draw_box(0,0,wdw->get_w(),wdw->get_h()); - wdw->draw_vframe(vframe, 0,y1, wdw->get_w(),y2-y1); - ViewPopup *view_popup = (ViewPopup *)wdw; - VIconThread *vt = view_popup->vt; - AssetVIcon *vicon = (AssetVIcon *)vt->vicon; - AssetPicon *picon = (AssetPicon *)vicon->picon; - Indexable *idxbl = - picon->indexable ? picon->indexable : - picon->edl ? picon->edl : 0; - if( !idxbl ) return; - double sample_rate = idxbl->get_sample_rate(); - double audio_length = sample_rate > 0 && idxbl->have_audio() ? - idxbl->get_audio_samples() / sample_rate : 0; - double frame_rate = idxbl->get_frame_rate(); - double video_length = frame_rate > 0 && idxbl->have_video() ? - idxbl->get_video_frames() / frame_rate : 0; - double idxbl_length = bmax(audio_length, video_length); - if( !idxbl_length ) idxbl_length = 1; - - EDL *edl = picon->mwindow->edl; - double total_length = edl->tracks->total_length(); - if( !total_length ) total_length = 1; - for( Track *track=edl->tracks->first; track!=0; track=track->next ) { - for( Edit *edit=track->edits->first; edit!=0; edit=edit->next ) { - Indexable *indexable = (Indexable *)edit->asset; - if( !indexable ) indexable = (Indexable *)edit->nested_edl; - if( !indexable ) continue; - if( indexable->id == idxbl->id || - (!indexable->is_asset == !idxbl->is_asset && - !strcmp(indexable->path, idxbl->path)) ) { - double pos1 = track->from_units(edit->startsource); - double pos2 = track->from_units(edit->startsource + edit->length); - double xscale = wdw->get_w() / idxbl_length; - int ex1 = pos1 * xscale, ex2 = pos2 * xscale; - wdw->set_color(WHITE); - wdw->draw_box(ex1,0, ex2-ex1,y1); - wdw->set_color(BLACK); - wdw->draw_line(ex1,0, ex1,y1); - wdw->draw_line(ex2,0, ex2,y1); - pos1 = track->from_units(edit->startproject); - pos2 = track->from_units(edit->startproject + edit->length); - xscale = wdw->get_w() / total_length; - int px1 = pos1 * xscale, px2 = pos2 * xscale; - wdw->set_color(RED); - wdw->draw_box(px1,y2, px2-px1,wdw->get_h()-y2); - wdw->set_color(BLACK); - wdw->draw_line(px1,y2, px1,wdw->get_h()-1); - wdw->draw_line(px2,y2, px2,wdw->get_h()-1); - - wdw->set_color(YELLOW); - wdw->draw_line(ex1,y1, px1,y2); - wdw->draw_line(ex2,y1, px2,y2); - } - } - } -} - void AWindowAssets::draw_background() { clear_box(0,0,get_w(),get_h(),get_bg_surface()); @@ -2592,6 +2854,7 @@ void AWindowAssets::draw_background() int AWindowAssets::drag_start_event() { + gui->vicon_thread->set_view_popup(0); int collect_pluginservers = 0; int collect_assets = 0, proxy = 0; @@ -2744,34 +3007,37 @@ int AWindowAssets::column_resize_event() return 1; } -int AWindowAssets::focus_in_event() -{ - int ret = BC_ListBox::focus_in_event(); - gui->start_vicon_drawing(); - return ret; -} - -int AWindowAssets::focus_out_event() -{ - gui->stop_vicon_drawing(); - return BC_ListBox::focus_out_event(); -} - int AWindowAssets::cursor_enter_event() { int ret = BC_ListBox::cursor_enter_event(); - gui->start_vicon_drawing(); + switch( gui->vicon_drawing ) { + case AVICON_FULL_PLAY: + gui->start_vicon_drawing(); + break; + case AVICON_MOUSE_OVER: + case AVICON_SRC_TARGET: + case AVICON_NO_PLAY: + default: + break; + } return ret; } int AWindowAssets::cursor_leave_event() { - VIcon *vicon = gui->vicon_thread->vicon; - if( vicon && vicon->playing_audio >= 0 ) + if( !is_event_win() ) return 0; + if( !gui->vicon_thread->viewing ) gui->stop_vicon_drawing(); return BC_ListBox::cursor_leave_event(); } +int AWindowAssets::focus_out_event() +{ + gui->stop_vicon_drawing(); + gui->vicon_thread->set_view_popup(0); + return BC_ListBox::focus_out_event(); +} + void AWindowAssets::update_vicon_area() { int x0 = 0, x1 = get_w(); @@ -2786,14 +3052,28 @@ void AWindowAssets::update_vicon_area() int AWindowAssets::mouse_over_event(int no) { - if( gui->vicon_thread->viewing && - no >= 0 && no < gui->displayed_assets[0].size() ) { - AssetPicon *picon = (AssetPicon *)gui->displayed_assets[0][no]; - VIcon *vicon = picon->vicon; - if( gui->vicon_thread->vicon && - gui->vicon_thread->vicon->playing_audio < 0 ) - vicon->playing_audio = -1; - picon->gui->vicon_thread->set_view_popup(vicon, draw_func); + AssetPicon *picon = no >= 0 && no < gui->displayed_assets[0].size() ? + (AssetPicon *)gui->displayed_assets[0][no] : 0; + AssetVIcon *vicon = !picon ? 0 : picon->vicon; + switch( gui->vicon_drawing ) { + case AVICON_FULL_PLAY: + gui->vicon_thread->solo = 0; + if( vicon && gui->vicon_thread->viewing ) + gui->vicon_thread->set_view_popup(vicon); + break; + case AVICON_MOUSE_OVER: + if( !vicon ) break; + gui->vicon_thread->solo = vicon; + gui->start_vicon_drawing(); + // fall thru + case AVICON_SRC_TARGET: + if( !vicon ) break; + if( gui->vicon_thread->viewing ) + gui->vicon_thread->set_view_popup(vicon); + break; + case AVICON_NO_PLAY: + default: + break; } return 0; } @@ -2957,7 +3237,7 @@ int AWindowView::handle_event() } AddTools::AddTools(MWindow *mwindow, AWindowGUI *gui, int x, int y, const char *title) - : BC_PopupMenu(x, y, BC_Title::calculate_w(gui, title, MEDIUMFONT)+8, title, -1, 0, 4) + : BC_PopupMenu(x, y, title, -1, 0) { this->mwindow = mwindow; this->gui = gui; @@ -3028,36 +3308,71 @@ int AddPluginItem::handle_event() return 1; } -AVIconDrawing::AVIconDrawing(AWindowGUI *agui, int x, int y, VFrame **images) - : BC_Toggle(x, y, images, agui->vicon_drawing) +AVIconDrawingItem::AVIconDrawingItem(AVIconDrawing *avicon, const char *text, int id) + : BC_MenuItem(text) { - this->agui = agui; - set_tooltip(_("Preview")); + this->avicon = avicon; + this->id = id; } -void AVIconDrawing::calculate_geometry(AWindowGUI *agui, VFrame **images, int *ww, int *hh) +int AVIconDrawingItem::handle_event() { - int text_line = -1, toggle_x = -1, toggle_y = -1; - int text_x = -1, text_y = -1, text_w = -1, text_h = -1; - BC_Toggle::calculate_extents(agui, images, 1, - &text_line, ww, hh, &toggle_x, &toggle_y, - &text_x, &text_y, &text_w, &text_h, "", MEDIUMFONT); + for( int i=0; iget_item(i); + item->set_checked(id == i); + } + AWindowGUI *agui = avicon->agui; + agui->play_off = 0; + avicon->set_text(get_text()); + agui->stop_vicon_drawing(); + agui->vicon_thread->set_view_popup(0); + agui->vicon_thread->solo = 0; + agui->vicon_drawing = id; + agui->start_vicon_drawing(); + return 1; +} + +int AVIconDrawing::draw_face(int dx, int color) +{ + int ret = BC_PopupMenu::draw_face(dx, color); + if( agui->play_off ) { + int lx = get_margin(), ly = get_h()/2; + draw_line(lx,ly, get_w()-2*lx,ly); + } + return ret; +} + +AVIconDrawing::AVIconDrawing(AWindowGUI *agui, int x, int y, int w, const char *text) + : BC_PopupMenu(x-w, y, w, text, -1, 0, 4) +{ + this->agui = agui; } AVIconDrawing::~AVIconDrawing() { } -int AVIconDrawing::handle_event() +void AVIconDrawing::create_objects() { - agui->vicon_drawing = get_value(); - if( agui->vicon_drawing ) - agui->start_vicon_drawing(); - else - agui->stop_vicon_drawing(); - return 1; + AVIconDrawingItem *item; + for( int i=0; iset_checked(agui->vicon_drawing == i); + } } +int AVIconDrawing::button_press_event() +{ + if( !is_event_win() ) return 0; + if( get_buttonpress() == MIDDLE_BUTTON ) { + agui->play_off = !agui->play_off ? 1 : 0; + draw_face(0, -1); + flash(1); + agui->start_vicon_drawing(); + return 1; + } + return BC_PopupMenu::button_press_event(); +} AWindowListFormat::AWindowListFormat(MWindow *mwindow, AWindowGUI *gui) : BC_MenuItem("","v",'v')