add proxy index builds, perperual session, backup.prev, disarmed track indication...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / proxy.C

diff --git a/cinelerra-5.1/cinelerra/proxy.C b/cinelerra-5.1/cinelerra/proxy.C
index 90c02a738b157298ed6f6b224e6ab49bd441502e..02eb20fa03c5003e06f375e542c00c6ab1f0ecd4 100644 (file)
--- a/cinelerra-5.1/cinelerra/proxy.C
+++ b/cinelerra-5.1/cinelerra/proxy.C
@@ -33,6 +33,7 @@
 #include "formattools.h"
 #include "language.h"
 #include "mainerror.h"
+#include "mainindexes.h"
 #include "mainprogress.h"
 #include "mainundo.h"
 #include "mutex.h"
@@ -51,10 +52,15 @@
 #define MAX_SCALE 16
 
 ProxyMenuItem::ProxyMenuItem(MWindow *mwindow)
- : BC_MenuItem(_("Proxy settings..."),  _("Alt-P"), 'p')
+ : BC_MenuItem(_("Proxy settings..."),  _("Alt-r"), 'r')
 {
        this->mwindow = mwindow;
        set_alt();
+       dialog = 0;
+}
+ProxyMenuItem::~ProxyMenuItem()
+{
+       delete dialog;
 }
 
 void ProxyMenuItem::create_objects()
@@ -78,7 +84,9 @@ ProxyDialog::ProxyDialog(MWindow *mwindow)
        asset = new Asset;
        bzero(size_text, sizeof(char*) * MAX_SIZES);
        bzero(size_factors, sizeof(int) * MAX_SIZES);
-       total_sizes = 0;
+       size_text[0] = cstrdup(_("Original size"));
+       size_factors[0] = 1;
+       total_sizes = 1;
 }
 
 ProxyDialog::~ProxyDialog()
@@ -94,7 +102,7 @@ BC_Window* ProxyDialog::new_gui()
        asset->load_defaults(mwindow->defaults, "PROXY_", 1, 1, 0, 0, 0);
        mwindow->gui->lock_window("ProxyDialog::new_gui");
        int cx, cy;
-       mwindow->gui->get_abs_cursor_xy(cx, cy);
+       mwindow->gui->get_abs_cursor(cx, cy);
        gui = new ProxyWindow(mwindow, this, cx - WIDTH/2, cy - HEIGHT/2);
        gui->create_objects();
        mwindow->gui->unlock_window();
@@ -177,13 +185,13 @@ void ProxyDialog::to_proxy()
                for( ; orig_asset; orig_asset=orig_asset->next ) {
                        char new_path[BCTEXTLEN];
                        proxy_render.to_proxy_path(new_path, orig_asset, proxy_scale);
-                       Asset *proxy_asset = edl->assets->get_asset(new_path);
-                       if( !proxy_asset ) continue;
 // test if proxy asset was already added to proxy_assets
                        int got_it = 0;
                        for( int i = 0; !got_it && i<proxy_assets.size(); ++i )
                                got_it = !strcmp(proxy_assets[i]->path, new_path);
                        if( got_it ) continue;
+                       Asset *proxy_asset = edl->assets->get_asset(new_path);
+                       if( !proxy_asset ) continue;
 // add pointer to existing EDL asset if it exists
 // EDL won't delete it unless it's the same pointer.
                        proxy_assets.append(proxy_asset);
@@ -197,8 +205,14 @@ void ProxyDialog::to_proxy()
                mwindow->set_proxy(0, 1, proxy_auto_scale, &proxy_assets, &orig_idxbls);
 
 // remove the references
-               for( int i=0; i<proxy_assets.size(); ++i )
-                       proxy_assets[i]->remove_user();
+               for( int i=0; i<proxy_assets.size(); ++i ) {
+                       Asset *proxy = (Asset *) proxy_assets[i];
+                       proxy->width = proxy->actual_width;
+                       proxy->height = proxy->actual_height;
+                       proxy->remove_user();
+                       mwindow->edl->assets->remove_pointer(proxy);
+                       proxy->remove_user();
+               }
                proxy_assets.remove_all();
                for( int i = 0; i < orig_idxbls.size(); i++ )
                        orig_idxbls[i]->remove_user();
@@ -282,7 +296,7 @@ void ProxyRender::from_proxy_path(char *new_path, Asset *asset, int scale)
        char prxy[BCTEXTLEN];
        int n = sprintf(prxy, ".proxy%d", scale);
        strcpy(new_path, asset->path);
-       char *ptr = strstr(asset->path, prxy);
+       char *ptr = strstr(new_path, prxy);
        if( !ptr || (ptr[n] != '-' && ptr[n] != '.') ) return;
 // remove proxy, path.proxy#-sfx.ext => path.sfx
        char *ext = strrchr(ptr, '.');
@@ -328,26 +342,30 @@ Asset *ProxyRender::add_original(Indexable *idxbl, int new_scale)
        for( int i = 0; !got_it && i<orig_proxies.size(); ++i )
                got_it = !strcmp(orig_proxies[i]->path, new_path);
        if( got_it ) return 0;
-
-// new proxy asset
-       Asset *proxy = new Asset;
+       Assets *edl_assets = mwindow->edl->assets;
+       Asset *proxy = edl_assets->get_asset(new_path);
+       if( !proxy ) {
+               proxy = new Asset(new_path);
 // new compression parameters
-       proxy->copy_format(format_asset, 0);
-       proxy->update_path(new_path);
-       proxy->audio_data = 0;
-       proxy->video_data = 1;
-       proxy->layers = 1;
-       proxy->width = idxbl->get_w() / new_scale;
-       if( proxy->width & 1 ) ++proxy->width;
-       proxy->actual_width = proxy->width;
-       proxy->height = idxbl->get_h() / new_scale;
-       if( proxy->height & 1 ) ++proxy->height;
-       proxy->actual_height = proxy->height;
-       proxy->frame_rate = idxbl->get_frame_rate();
-       proxy->video_length = idxbl->get_video_frames();
+               proxy->copy_format(format_asset, 0);
+               proxy->awindow_folder = AW_PROXY_FOLDER;
+               proxy->audio_data = 0;
+               proxy->video_data = 1;
+               proxy->layers = 1;
+               proxy->width = idxbl->get_w() / new_scale;
+               if( proxy->width & 1 ) ++proxy->width;
+               proxy->actual_width = proxy->width;
+               proxy->height = idxbl->get_h() / new_scale;
+               if( proxy->height & 1 ) ++proxy->height;
+               proxy->actual_height = proxy->height;
+               proxy->frame_rate = idxbl->get_frame_rate();
+               proxy->video_length = idxbl->get_video_frames();
+               edl_assets->append(proxy);
+       }
+       proxy->add_user();
        orig_proxies.append(proxy);
-       orig_idxbls.append(idxbl);
        idxbl->add_user();
+       orig_idxbls.append(idxbl);
        return proxy;
 }
 
@@ -441,9 +459,6 @@ void ProxyWindow::create_objects()
        add_subwindow(text = new BC_Title(x, y, _("Scale factor:")));
        x += text->get_w() + margin;
 
-       dialog->size_text[0] = cstrdup(_("Original size"));
-       dialog->size_factors[0] = 1;
-       dialog->total_sizes = 1;
        int popupmenu_w = BC_PopupMenu::calculate_w(get_text_width(MEDIUMFONT, dialog->size_text[0]));
        add_subwindow(scale_factor = new ProxyMenu(mwindow, this, x, y, popupmenu_w, ""));
        scale_factor->update_sizes();
@@ -666,7 +681,8 @@ void ProxyClient::process_package(LoadPackage *ptr)
        Asset *proxy = package->proxy_asset;
 //printf("%s %s\n", orig->path, proxy->path);
        VRender *vrender = 0;
-       int processors = 1, result = 0;
+       int jobs = proxy_render->needed_proxies.size();
+       int processors = preferences->project_smp / jobs + 1, result = 0;
 
        if( orig->is_asset ) {
                src_file = new File;
@@ -744,6 +760,11 @@ void ProxyClient::process_package(LoadPackage *ptr)
                }
                proxy_render->update_progress();
        }
+       if( !proxy_render->failed && !proxy_render->is_canceled() ) {
+               Asset *asset = mwindow->edl->assets->update(proxy);
+               mwindow->mainindexes->add_next_asset(0, asset);
+               mwindow->mainindexes->start_build();
+       }
 }