#include "formattools.h"
#include "language.h"
#include "mainerror.h"
+#include "mainindexes.h"
#include "mainprogress.h"
#include "mainundo.h"
#include "mutex.h"
#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()
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()
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();
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++ )
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, '.');
proxy = new Asset(new_path);
// new compression parameters
proxy->copy_format(format_asset, 0);
+ proxy->awindow_folder = AW_PROXY_FOLDER;
proxy->audio_data = 0;
proxy->video_data = 1;
proxy->layers = 1;
proxy->video_length = idxbl->get_video_frames();
edl_assets->append(proxy);
}
- else {
- proxy->add_user();
- }
+ proxy->add_user();
orig_proxies.append(proxy);
idxbl->add_user();
orig_idxbls.append(idxbl);
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();
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;
}
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();
+ }
}