X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fassetpopup.C;h=9eda28d72e521d62e515118400463b5377234b1b;hp=f4364542542808acfe1a6276a8f2c19ffd8b6cdd;hb=HEAD;hpb=3b4b6f588c4f2643316afcbc486ca6a35c16a431 diff --git a/cinelerra-5.1/cinelerra/assetpopup.C b/cinelerra-5.1/cinelerra/assetpopup.C index f4364542..66b3361a 100644 --- a/cinelerra-5.1/cinelerra/assetpopup.C +++ b/cinelerra-5.1/cinelerra/assetpopup.C @@ -99,19 +99,15 @@ void AssetPopup::create_objects() void AssetPopup::paste_assets() { -// Collect items into the drag vectors for temporary storage - gui->lock_window("AssetPopup::paste_assets"); - mwindow->gui->lock_window("AssetPopup::paste_assets"); - mwindow->cwindow->gui->lock_window("AssetPopup::paste_assets"); - int proxy = mwindow->edl->session->awindow_folder == AW_PROXY_FOLDER ? 1 : 0; gui->collect_assets(proxy); +// Collect items into the drag vectors for temporary storage + gui->unlock_window(); + mwindow->gui->lock_window("AssetPopup::paste_assets"); mwindow->paste_assets(mwindow->edl->local_session->get_selectionstart(1), mwindow->edl->tracks->first, 0); // do not overwrite - - gui->unlock_window(); mwindow->gui->unlock_window(); - mwindow->cwindow->gui->unlock_window(); + gui->lock_window("AssetPopup::paste_assets"); } void AssetPopup::match_size() @@ -146,6 +142,28 @@ int AssetPopup::update() format->update(); int proxy = mwindow->edl->session->awindow_folder == AW_PROXY_FOLDER ? 1 : 0; gui->collect_assets(proxy); + int enable_open = 0; + int assets_total = mwindow->session->drag_assets->size(); + Indexable *idxbl = !assets_total ? 0 : + mwindow->session->drag_assets->get(0); + if( idxbl ) { + if( idxbl->is_asset ) { + Asset *asset = (Asset *)idxbl; + if( asset->format == FILE_REF ) + enable_open = 1; + } + else + enable_open = 1; + } + open_edl->set_enabled(enable_open); + int enable_close = mwindow->stack.size() > 0 ? 1 : 0; + close_edl->set_enabled(enable_close); + int enable_clip = 0; + for( int i=0; !enable_clip && isession->drag_assets->get(i); + if( !idxbl->is_asset ) enable_clip = 1; + } + to_clip->set_enabled(enable_clip); return 0; } @@ -195,16 +213,36 @@ AssetPopupOpenEDL::~AssetPopupOpenEDL() int AssetPopupOpenEDL::handle_event() { int assets_total = mwindow->session->drag_assets->size(); - if( assets_total ) { - popup->unlock_window(); - Indexable *idxbl = mwindow->session->drag_assets->get(0); - EDL *edl = idxbl && !idxbl->is_asset ? (EDL *)idxbl : 0; - if( edl ) - mwindow->stack_push(edl); - else - eprintf(_("media is not EDL:\n%s"), idxbl->path); - popup->lock_window("AssetPopupOpenEDL::handle_event"); + if( !assets_total ) return 1; + popup->unlock_window(); + EDL *edl = 0; + Indexable *idxbl = mwindow->session->drag_assets->get(0); + if( idxbl->is_asset ) { + Asset *asset = (Asset *)idxbl; + if( asset->format == FILE_REF ) { + FileXML xml_file; + const char *filename = asset->path; + if( xml_file.read_from_file(filename, 1) ) { + eprintf(_("Error: unable to open:\n %s"), filename); + return 1; + } + edl = new EDL; + edl->create_objects(); + if( edl->load_xml(&xml_file, LOAD_ALL) ) { + eprintf(_("Error: unable to load:\n %s"), filename); + edl->remove_user(); + return 1; + } + } } + else { + edl = (EDL *)idxbl; + } + if( edl ) + mwindow->stack_push(edl, idxbl); + else + eprintf(_("media is not EDL:\n%s"), idxbl->path); + popup->lock_window("AssetPopupOpenEDL::handle_event"); return 1; } @@ -260,8 +298,10 @@ AssetPopupBuildIndex::~AssetPopupBuildIndex() int AssetPopupBuildIndex::handle_event() { + popup->unlock_window(); //printf("AssetPopupBuildIndex::handle_event 1\n"); mwindow->rebuild_indices(); + popup->lock_window("AssetPopupBuildIndex::handle_event"); return 1; } @@ -352,9 +392,11 @@ AssetPopupOpenMixer::~AssetPopupOpenMixer() int AssetPopupOpenMixer::handle_event() { + popup->unlock_window(); mwindow->gui->lock_window("AssetPopupOpenMixer::handle_event"); mwindow->create_mixers(); mwindow->gui->unlock_window(); + popup->lock_window("AssetPopupOpenMixer::handle_event"); return 1; } @@ -371,14 +413,16 @@ AssetPopupInsertMixer::~AssetPopupInsertMixer() int AssetPopupInsertMixer::handle_event() { + popup->unlock_window(); mwindow->gui->lock_window("AssetPopupInsertMixer::handle_event"); mwindow->create_mixers(-1); mwindow->gui->unlock_window(); + popup->lock_window("AssetPopupInsertMixer::handle_event"); return 1; } AssetPopupPaste::AssetPopupPaste(MWindow *mwindow, AssetPopup *popup) - : BC_MenuItem(_("Paste")) + : BC_MenuItem(C_("Paste")) { this->mwindow = mwindow; this->popup = popup; @@ -484,10 +528,6 @@ AssetListMenu::AssetListMenu(MWindow *mwindow, AWindowGUI *gui) AssetListMenu::~AssetListMenu() { - if( !shots_displayed ) { - delete asset_snapshot; - delete asset_grabshot; - } } void AssetListMenu::create_objects() @@ -519,7 +559,7 @@ void AssetListMenu::create_objects() grabshot_submenu->add_submenuitem(new GrabshotMenuItem(grabshot_submenu, _("jpeg"), GRABSHOT_JPEG)); grabshot_submenu->add_submenuitem(new GrabshotMenuItem(grabshot_submenu, _("tiff"), GRABSHOT_TIFF)); grabshot_submenu->add_submenuitem(new GrabshotMenuItem(grabshot_submenu, _("ppm"), GRABSHOT_PPM)); - update_titles(shots_displayed = 1); + update_titles(1); } AssetPopupLoadFile::AssetPopupLoadFile(MWindow *mwindow, AWindowGUI *gui) @@ -542,16 +582,10 @@ int AssetPopupLoadFile::handle_event() void AssetListMenu::update_titles(int shots) { format->update(); - if( shots && !shots_displayed ) { - shots_displayed = 1; - add_item(asset_snapshot); - add_item(asset_grabshot); - } - else if( !shots && shots_displayed ) { - shots_displayed = 0; - remove_item(asset_snapshot); - remove_item(asset_grabshot); - } + int enable_close = mwindow->stack.size() > 0 ? 1 : 0; + close_edl->set_enabled(enable_close); + asset_snapshot->set_enabled(shots); + asset_grabshot->set_enabled(shots); } AssetListCopy::AssetListCopy(MWindow *mwindow, AWindowGUI *gui) @@ -651,6 +685,8 @@ AssetCopyWindow::AssetCopyWindow(AssetCopyDialog *copy_dialog) ACW_W, ACW_H, ACW_W, ACW_H, 1, 0, 1) { this->copy_dialog = copy_dialog; +// *** CONTEXT_HELP *** + context_help_set_keyword("Moving clips"); } AssetCopyWindow::~AssetCopyWindow() @@ -755,7 +791,8 @@ void AssetPasteDialog::handle_done_event(int result) MWindow *mwindow = paste->mwindow; mwindow->interrupt_indexes(); mwindow->gui->lock_window("AssetPasteDialog::handle_done_event"); - result = mwindow->load_filenames(&path_list, LOADMODE_RESOURCESONLY, 0); + result = mwindow->load_filenames(&path_list, + LOADMODE_RESOURCESONLY, LOADMODE_EDL_CLIP, 0); mwindow->gui->unlock_window(); path_list.remove_all_objects(); mwindow->save_backup(); @@ -783,6 +820,8 @@ AssetPasteWindow::AssetPasteWindow(AssetPasteDialog *paste_dialog) APW_W, APW_H, APW_W, APW_H, 1, 0, 1) { this->paste_dialog = paste_dialog; +// *** CONTEXT_HELP *** + context_help_set_keyword("Moving clips"); } AssetPasteWindow::~AssetPasteWindow() @@ -859,12 +898,13 @@ int SnapshotMenuItem::handle_event() if( !edl->have_video() ) return 1; Preferences *preferences = mwindow->preferences; - char filename[BCTEXTLEN]; + char filename[BCTEXTLEN], snapshot_path[BCTEXTLEN]; static const char *exts[] = { "png", "jpg", "tif", "ppm" }; time_t tt; time(&tt); struct tm tm; localtime_r(&tt,&tm); + File::getenv_path(snapshot_path, preferences->snapshot_path); snprintf(filename,sizeof(filename),"%s/%s_%04d%02d%02d-%02d%02d%02d.%s", - preferences->snapshot_path, _("snap"), + snapshot_path, _("snap"), 1900+tm.tm_year,1+tm.tm_mon,tm.tm_mday, tm.tm_hour,tm.tm_min,tm.tm_sec, exts[mode]); char *asset_path = FileSystem::basepath(filename); @@ -909,7 +949,7 @@ int SnapshotMenuItem::handle_event() processors > 1 ? 2 : 1, 0); VFrame ***frames = file.get_video_buffer(); VFrame *frame = frames[0][0]; - TransportCommand command; + TransportCommand command(preferences); //command.command = audio_tracks ? NORMAL_FWD : CURRENT_FRAME; command.command = CURRENT_FRAME; command.get_edl()->copy_all(edl); @@ -917,8 +957,8 @@ int SnapshotMenuItem::handle_event() command.realtime = 0; RenderEngine render_engine(0, preferences, 0, 0); - CICache video_cache(preferences); - render_engine.set_vcache(&video_cache); + CICache *video_cache = new CICache(preferences); + render_engine.set_vcache(video_cache); render_engine.arm_command(&command); double position = edl->local_session->get_selectionstart(1); @@ -928,6 +968,7 @@ int SnapshotMenuItem::handle_event() if( !ret ) ret = file.write_video_buffer(1); file.close_file(); + video_cache->remove_user(); } if( !ret ) { asset->folder_no = AW_MEDIA_FOLDER; @@ -985,111 +1026,34 @@ int GrabshotMenuItem::handle_event() } GrabshotThread::GrabshotThread(MWindow *mwindow) - : Thread(1, 0, 0) + : BC_DragBox(mwindow->gui) { this->mwindow = mwindow; - popup = 0; - done = -1; } + GrabshotThread::~GrabshotThread() { - delete popup; } void GrabshotThread::start(GrabshotMenuItem *menu_item) { - popup = new GrabshotPopup(this, menu_item->mode); - popup->lock_window("GrabshotThread::start"); - for( int i=0; i<4; ++i ) - edge[i] = new BC_Popup(mwindow->gui, 0,0, 1,1, ORANGE, 1); - mwindow->gui->grab_buttons(); - mwindow->gui->grab_cursor(); - popup->grab(mwindow->gui); - popup->create_objects(); - popup->show_window(); - popup->unlock_window(); - done = 0; - Thread::start(); -} - -void GrabshotThread::run() -{ - popup->lock_window("GrabshotThread::run 0"); - while( !done ) { - popup->update(); - popup->unlock_window(); - enable_cancel(); - Timer::delay(200); - disable_cancel(); - popup->lock_window("GrabshotThread::run 1"); - } - mwindow->gui->ungrab_cursor(); - mwindow->gui->ungrab_buttons(); - popup->ungrab(mwindow->gui); - for( int i=0; i<4; ++i ) delete edge[i]; - popup->unlock_window(); - delete popup; popup = 0; -} - -GrabshotPopup::GrabshotPopup(GrabshotThread *grab_thread, int mode) - : BC_Popup(grab_thread->mwindow->gui, 0,0, 16,16, -1,1) -{ - this->grab_thread = grab_thread; - this->mode = mode; - dragging = -1; - grab_color = ORANGE; - x0 = y0 = x1 = y1 = -1; - lx0 = ly0 = lx1 = ly1 = -1; -} -GrabshotPopup::~GrabshotPopup() -{ + mode = menu_item->mode; + start_drag(); } -int GrabshotPopup::grab_event(XEvent *event) +int GrabshotThread::handle_done_event(int x0, int y0, int x1, int y1) { - int cur_drag = dragging; - switch( event->type ) { - case ButtonPress: - if( cur_drag > 0 ) return 1; - x0 = event->xbutton.x_root; - y0 = event->xbutton.y_root; - if( !cur_drag ) { - draw_selection(-1); - if( event->xbutton.button == RIGHT_BUTTON ) break; - if( x0>=get_x() && x0=get_y() && y0 0 ) { - x1 = event->xbutton.x_root; - y1 = event->xbutton.y_root; - draw_selection(0); - } - return 1; - default: - return 0; - } - - int cx = lx0, cy = ly0; - int cw = lx1-lx0, ch = ly1-ly0; - hide_window(); - sync_display(); - grab_thread->done = 1; + int cx = x0, cy = y0; + int cw = x1-x0, ch = y1-y0; - MWindow *mwindow = grab_thread->mwindow; Preferences *preferences = mwindow->preferences; - char filename[BCTEXTLEN]; + char filename[BCTEXTLEN], snapshot_path[BCTEXTLEN]; static const char *exts[] = { "png", "jpg", "tif", "ppm" }; time_t tt; time(&tt); struct tm tm; localtime_r(&tt,&tm); + File::getenv_path(snapshot_path, preferences->snapshot_path); snprintf(filename,sizeof(filename),"%s/%s_%04d%02d%02d-%02d%02d%02d.%s", - preferences->snapshot_path, _("grab"), + snapshot_path, _("grab"), 1900+tm.tm_year,1+tm.tm_mon,tm.tm_mday, tm.tm_hour,tm.tm_min,tm.tm_sec, exts[mode]); char *asset_path = FileSystem::basepath(filename); @@ -1115,12 +1079,13 @@ int GrabshotPopup::grab_event(XEvent *event) } // no odd dimensions - int rw = get_root_w(0), rh = get_root_h(0); + int rw = mwindow->gui->get_root_w(0); + int rh = mwindow->gui->get_root_h(0); if( cx < 0 ) { cw += cx; cx = 0; } if( cy < 0 ) { ch += cy; cy = 0; } if( cx+cw > rw ) cw = rw-cx; if( cy+ch > rh ) ch = rh-cy; - if( !cw || !ch ) return 1; + if( !cw || !ch ) return 0; VFrame vframe(cw,ch, BC_RGB888); if( cx+cw < rw ) ++cw; @@ -1163,37 +1128,3 @@ int GrabshotPopup::grab_event(XEvent *event) return 1; } -void GrabshotPopup::update() -{ - set_color(grab_color ^= GREEN); - draw_box(0,0, get_w(),get_h()); - flash(1); -} - -void GrabshotPopup::draw_selection(int show) -{ - if( show < 0 ) { - for( int i=0; i<4; ++i ) hide_window(0); - flush(); - return; - } - - int nx0 = x0 < x1 ? x0 : x1; - int nx1 = x0 < x1 ? x1 : x0; - int ny0 = y0 < y1 ? y0 : y1; - int ny1 = y0 < y1 ? y1 : y0; - lx0 = nx0; lx1 = nx1; ly0 = ny0; ly1 = ny1; - - --nx0; --ny0; - BC_Popup **edge = grab_thread->edge; - edge[0]->reposition_window(nx0,ny0, nx1-nx0, 1); - edge[1]->reposition_window(nx1,ny0, 1, ny1-ny0); - edge[2]->reposition_window(nx0,ny1, nx1-nx0, 1); - edge[3]->reposition_window(nx0,ny0, 1, ny1-ny0); - - if( show > 0 ) { - for( int i=0; i<4; ++i ) edge[i]->show_window(0); - } - flush(); -} -