X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=238c17aa43a09938d5a7bad1ade30d2fdef7e48e;hb=38cb4182e11e57fc426bede3825e825e9d61433b;hp=8824b86872be7cd9430fbdddff51c639a2035935;hpb=9dc94ff0a716a04cdec4ef2466ed20227b79c114;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C index 8824b868..238c17aa 100644 --- a/cinelerra-5.1/cinelerra/mwindow.C +++ b/cinelerra-5.1/cinelerra/mwindow.C @@ -18,6 +18,7 @@ * */ +#include "aboutprefs.h" #include "asset.h" #include "assets.h" #include "atrack.h" @@ -89,6 +90,7 @@ #include "pluginserver.h" #include "pluginset.h" #include "preferences.h" +#include "proxy.h" #include "record.h" #include "recordmonitor.h" #include "recordlabel.h" @@ -297,6 +299,9 @@ MWindow::~MWindow() #endif reset_caches(); dead_plugins->remove_all_objects(); +// must delete theme before destroying plugindb +// theme destructor will be deleted by delete_plugins + delete theme; theme = 0; delete_plugins(); finit_error(); keyframe_threads->remove_all_objects(); @@ -325,7 +330,6 @@ MWindow::~MWindow() delete defaults; defaults = 0; delete assets; assets = 0; delete splash_window; splash_window = 0; -// delete theme; theme = 0; // deleted by delete_plugins if( !edl->Garbage::remove_user() ) edl = 0; delete channeldb_buz; delete channeldb_v4l2jpeg; @@ -733,14 +737,14 @@ void MWindow::add_plugins(ArrayList &plugins) plugins.remove_all(); } -void MWindow::init_plugin_tips(ArrayList &plugins) +void MWindow::init_plugin_tips(ArrayList &plugins, const char *lang) { const char *cfg_path = File::get_cindat_path(); char msg_path[BCTEXTLEN]; int txt = 0; FILE *fp = 0; if( BC_Resources::language[0] ) { snprintf(msg_path, sizeof(msg_path), "%s/info/plugins.%s", - cfg_path, BC_Resources::language); + cfg_path, lang); fp = fopen(msg_path, "r"); } if( !fp ) { @@ -893,6 +897,7 @@ void MWindow::init_preferences() } BC_WindowBase::get_resources()->popupmenu_btnup = preferences->popupmenu_btnup; BC_WindowBase::get_resources()->textbox_focus_policy = preferences->textbox_focus_policy; + BC_WindowBase::get_resources()->grab_input_focus = preferences->grab_input_focus; } void MWindow::clean_indexes() @@ -1492,14 +1497,10 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__); if(load_mode != LOADMODE_RESOURCESONLY) { -SET_TRACE RecordLabels *labels = edl->session->label_cells ? new RecordLabels(new_file) : 0; -SET_TRACE asset_to_edl(new_edl, new_asset, labels); -SET_TRACE new_edls.append(new_edl); -SET_TRACE new_asset->Garbage::remove_user(); delete labels; new_asset = 0; @@ -1802,10 +1803,6 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__); show_plugin(plugin); } } - else - { - plugin->show = 0; - } plugin = (Plugin*)plugin->next; } @@ -1819,6 +1816,9 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__); ( load_mode == LOADMODE_REPLACE || load_mode == LOADMODE_REPLACE_CONCATENATE ) ) { select_asset(0, 0); + edl->session->proxy_scale = 1; + edl->session->proxy_use_scaler = 0; + edl->session->proxy_auto_scale = 0; edl->local_session->preview_start = 0; edl->local_session->preview_end = edl->tracks->total_playable_length(); edl->local_session->loop_playback = 0; @@ -1829,6 +1829,29 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__); goto_start(); } + if( ( edl->session->proxy_auto_scale && edl->session->proxy_scale != 1 ) && + ( load_mode != LOADMODE_REPLACE && load_mode != LOADMODE_REPLACE_CONCATENATE ) ) { + ArrayList orig_idxbls; + for( int i=0; itracks->first; track; track=track->next ) { + if( track->data_type != TRACK_VIDEO ) continue; + for( Edit *edit=track->edits->first; edit; edit=edit->next ) { + Indexable *idxbl = (Indexable *)edit->asset; + if( !idxbl ) continue; + if( !idxbl->have_video() ) continue; + if( edit->channel != 0 ) continue; // first layer only + orig_idxbls.append(edit->asset); + } + } + } + gui->unlock_window(); // to update progress bar + render_proxy(orig_idxbls); + gui->lock_window("MWindow::load_filenames"); + } + // need to update undo before project, since mwindow is unlocked & a new load // can begin here. Should really prevent loading until we're done. if(debug) printf("MWindow::load_filenames %d\n", __LINE__); @@ -1873,8 +1896,35 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__); return 0; } +void MWindow::render_proxy(ArrayList &new_idxbls) +{ + Asset *format_asset = new Asset; + format_asset->format = FILE_FFMPEG; + format_asset->load_defaults(defaults, "PROXY_", 1, 1, 0, 0, 0); + ProxyRender proxy_render(this, format_asset); + int new_scale = edl->session->proxy_scale; + int use_scaler = edl->session->proxy_use_scaler; + for( int i=0; ipath) > 0 ? 1 : 0; + int got_it = exists && // if proxy exists, and is newer than orig + fs.get_date(proxy->path) > fs.get_date(orig->path) ? 1 : 0; + if( got_it ) continue; + proxy_render.add_needed(orig, proxy); + } +// render needed proxies + int result = proxy_render.create_needed_proxies(new_scale); + if( !result ) { + add_proxy(use_scaler, + &proxy_render.orig_idxbls, &proxy_render.orig_proxies); + } + format_asset->remove_user(); +} void MWindow::test_plugins(EDL *new_edl, char *path) { @@ -1987,7 +2037,6 @@ void MWindow::create_objects(int want_gui, int want_new, char *config_path) { - FileSystem fs; const int debug = 0; if(debug) PRINT_TRACE @@ -2011,7 +2060,7 @@ void MWindow::create_objects(int want_gui, if(debug) PRINT_TRACE init_ladspa_plugins(this, preferences); if(debug) PRINT_TRACE - init_plugin_tips(*plugindb); + init_plugin_tips(*plugindb, cin_lang); if(splash_window) splash_window->operation->update(_("Initializing GUI")); if(debug) PRINT_TRACE @@ -2568,12 +2617,11 @@ SET_TRACE SET_TRACE //printf("MWindow::show_plugin 1\n"); - if(!done) - { - if(!plugin->track) - { - printf("MWindow::show_plugin track not defined.\n"); - } + if( !done && !plugin->track ) { + printf("MWindow::show_plugin track not defined.\n"); + done = 1; + } + if( !done ) { PluginServer *server = scan_plugindb(plugin->title, plugin->track->data_type); @@ -2952,7 +3000,7 @@ void MWindow::update_project(int load_mode) const int debug = 0; if(debug) PRINT_TRACE - restart_brender(); + init_brender(); edl->tracks->update_y_pixels(theme); if(debug) PRINT_TRACE @@ -3314,7 +3362,8 @@ void MWindow::dump_exe(FILE *fp) char mtime[256]; strftime(mtime, sizeof(mtime), "%F %T", tm); fprintf(fp,"mtime: %s\n", mtime); - +#if 0 +// people hit ctl-c waiting for this int fd = open(proc_path,O_RDONLY+O_NONBLOCK); if( fd < 0 ) { fprintf(fp,"open: %m\n"); return; } uint8_t *bfr = 0; @@ -3339,6 +3388,7 @@ void MWindow::dump_exe(FILE *fp) for( int i=0; i<20; ++i ) fprintf(fp, "%02x", digest[i]); if( ret < 0 ) fprintf(fp, " (ret %d)", ret); if( pos < st.st_size ) fprintf(fp, " (pos %jd)", pos); +#endif fprintf(fp, "\n"); } @@ -3351,7 +3401,7 @@ void MWindow::trap_hook(FILE *fp, void *vp) mwindow->dump_edl(fp); fprintf(fp, "\nUNDO:\n"); mwindow->dump_undo(fp); - fprintf(fp, "\nEXE:\n"); + fprintf(fp, "\nEXE: %s\n", AboutPrefs::build_timestamp); mwindow->dump_exe(fp); } @@ -3617,7 +3667,8 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra int result = file->open_file(preferences, asset, 1, 0); if( !result && delete_tracks > 0 ) undo->update_undo_before(); - if( !result && asset->video_data && asset->get_video_layers() > 0 ) { + int video_layers = asset->get_video_layers(); + if( !result && asset->video_data && vstream < video_layers ) { // try to get asset up to date, may fail file->select_video_stream(asset, vstream); // either way use what was/is there. @@ -3673,7 +3724,7 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra if( !result && asset->audio_data && asset->channels > 0 ) { session->sample_rate = asset->get_sample_rate(); int64_t channel_mask = 0; - int astrm = !asset->video_data ? -1 : + int astrm = !asset->video_data || vstream >= video_layers ? -1 : file->get_audio_for_video(vstream, astream, channel_mask); if( astrm >= 0 ) file->select_audio_stream(asset, astrm); if( astrm < 0 || !channel_mask ) channel_mask = (1<channels)-1;