#define WIDTH xS(400)
-#define HEIGHT yS(320)
+#define HEIGHT yS(360)
#define MAX_SCALE 16
ConvertRender::ConvertRender(MWindow *mwindow)
failed = 0; canceled = 0;
result = 0;
beep = 0;
+ to_proxy = 0;
+ renderer = 0;
}
ConvertRender::~ConvertRender()
{
+ if( running() ) {
+ canceled = 1;
+ if( renderer )
+ renderer->set_result(1);
+ cancel();
+ join();
+ }
+ delete renderer;
delete [] suffix;
delete progress;
delete counter_lock;
void ConvertRender::to_convert_path(char *new_path, Indexable *idxbl)
{
- strcpy(new_path, idxbl->path);
+ if( to_proxy ) {
+ char *bp = idxbl->path, *cp = strrchr(bp, '/');
+ if( cp ) bp = cp+1;
+ char filename[BCTEXTLEN], proxy_path[BCTEXTLEN];
+ strcpy(filename, bp);
+ File::getenv_path(proxy_path, mwindow->preferences->nested_proxy_path);
+ sprintf(new_path, "%s/%s", proxy_path, filename);
+ }
+ else
+ strcpy(new_path, idxbl->path);
int n = strlen(suffix);
char *ep = new_path + strlen(new_path);
char *sfx = strrchr(new_path, '.');
// render not needed if can use copy
if( ret == FILE_OK ) {
if( match_format(file.asset) ) {
- mwindow->mainindexes->add_next_asset(0, convert);
+ mwindow->mainindexes->add_indexable(convert);
mwindow->mainindexes->start_build();
needed = 0;
}
return count;
}
-void ConvertRender::set_format(Asset *asset, const char *suffix)
+void ConvertRender::set_format(Asset *asset, const char *suffix, int to_proxy)
{
delete [] this->suffix;
this->suffix = cstrdup(suffix);
if( !format_asset )
format_asset = new Asset();
format_asset->copy_from(asset, 0);
+ this->to_proxy = to_proxy;
}
void ConvertRender::start_convert(float beep, int remove_originals)
Asset *needed_copy = needed_copies[i];
EDL *edl = convert_edl(mwindow->edl, orig_idxbl);
double length = get_length(orig_idxbl);
- ConvertPackageRenderer renderer(this);
- renderer.initialize(mwindow, edl, mwindow->preferences, needed_copy);
+ renderer = new ConvertPackageRenderer(this);
+ renderer->initialize(mwindow, edl, mwindow->preferences, needed_copy);
PackageDispatcher dispatcher;
dispatcher.create_packages(mwindow, edl, mwindow->preferences,
SINGLE_PASS, needed_copy, 0, length, 0);
RenderPackage *package = dispatcher.get_package(0);
- if( !renderer.render_package(package) ) {
+ if( !renderer->render_package(package) ) {
Asset *asset = mwindow->edl->assets->update(needed_copy);
- mwindow->mainindexes->add_next_asset(0, asset);
+ mwindow->mainindexes->add_indexable(asset);
mwindow->mainindexes->start_build();
}
else
failed = 1;
+ delete renderer; renderer = 0;
edl->remove_user();
}
add_subwindow(remove_originals = new ConvertRemoveOriginals(this, x, y));
x = lmargin;
y += remove_originals->get_h() + margin;
+ add_subwindow(to_proxy_path = new ConvertToProxyPath(this, x, y));
+ y += to_proxy_path->get_h() + margin;
add_subwindow(beep_on_done = new ConvertBeepOnDone(this, x, y));
x += beep_on_done->get_w() + margin + xS(10);
asset->audio_data = 1;
remove_originals = 1;
beep = 0;
+ to_proxy = 0;
}
ConvertDialog::~ConvertDialog()
asset->load_defaults(mwindow->defaults, "CONVERT_", 1, 1, 0, 1, 0);
remove_originals = mwindow->defaults->get("CONVERT_REMOVE_ORIGINALS", remove_originals);
beep = mwindow->defaults->get("CONVERT_BEEP", beep);
+ to_proxy = mwindow->defaults->get("CONVERT_TO_PROXY", to_proxy);
mwindow->defaults->get("CONVERT_SUFFIX", suffix);
mwindow->gui->lock_window("ConvertDialog::new_gui");
int cx, cy;
mwindow->defaults->update("CONVERT_SUFFIX", suffix);
mwindow->defaults->update("CONVERT_REMOVE_ORIGINALS", remove_originals);
mwindow->defaults->update("CONVERT_BEEP", beep);
+ mwindow->defaults->update("CONVERT_TO_PROXY", to_proxy);
asset->save_defaults(mwindow->defaults, "CONVERT_", 1, 1, 0, 1, 0);
- mwindow->start_convert(asset, suffix, beep, remove_originals);
+ mwindow->start_convert(asset, suffix, beep, to_proxy, remove_originals);
}
return 1;
}
-ConvertBeepOnDone::ConvertBeepOnDone(ConvertWindow *gui, int x, int y)
- : BC_FPot(x, y, gui->dialog->beep*100.f, 0.f, 100.f)
+ConvertToProxyPath::ConvertToProxyPath(ConvertWindow *gui, int x, int y)
+ : BC_CheckBox(x, y, gui->dialog->to_proxy, _("Into Nested Proxy directory"))
{
this->gui = gui;
}
-int ConvertBeepOnDone::handle_event()
+ConvertToProxyPath::~ConvertToProxyPath()
{
- gui->dialog->beep = get_value()/100.f;
- return 1;
-}
-
-ConvertBeep::ConvertBeep(MWindow *mwindow)
- : Thread(1, 0, 0)
-{
- this->mwindow = mwindow;
- audio = new AudioDevice(mwindow);
- playing_audio = 0;
- interrupted = -1;
-}
-
-ConvertBeep::~ConvertBeep()
-{
- stop(0);
- delete audio;
-}
-
-void ConvertBeep::run()
-{
- int channels = 2;
- int64_t bfrsz = BEEP_SAMPLE_RATE;
- EDL *edl = mwindow->edl;
- EDLSession *session = edl->session;
- AudioOutConfig *aconfig = session->playback_config->aconfig;
- audio->open_output(aconfig, BEEP_SAMPLE_RATE, bfrsz, channels, 0);
- audio->start_playback();
-
- double out0[bfrsz], out1[bfrsz], *out[2] = { out0, out1 };
- const double two_pi = 2*M_PI;
- int64_t audio_len = BEEP_SAMPLE_RATE * secs;
- const double dt = two_pi * freq/BEEP_SAMPLE_RATE;
- double th = 0;
-
- audio_pos = 0;
- playing_audio = 1;
- while( !interrupted ) {
- int len = audio_len - audio_pos;
- if( len <= 0 ) break;
- if( len > bfrsz ) len = bfrsz;
- int k = audio_pos;
- for( int i=0; i<len; ++i,++k,th+=dt ) {
- double t = th - two_pi;
- if( t >= 0 ) th = t;
- out0[i] = out1[i] = sin(th) * gain;
- }
- audio->write_buffer(out, channels, len);
- audio_pos = k;
- }
-
- if( !interrupted )
- audio->set_last_buffer();
- audio->stop_audio(interrupted ? 0 : 1);
- playing_audio = 0;
-
- audio->close_all();
}
-void ConvertBeep::start()
+int ConvertToProxyPath::handle_event()
{
- if( running() ) return;
- audio_pos = -1;
- interrupted = 0;
- Thread::start();
+ gui->dialog->to_proxy = get_value();
+ return 1;
}
-void ConvertBeep::stop(int wait)
+ConvertBeepOnDone::ConvertBeepOnDone(ConvertWindow *gui, int x, int y)
+ : BC_FPot(x, y, gui->dialog->beep*100.f, 0.f, 100.f)
{
- if( running() && !interrupted ) {
- interrupted = 1;
- audio->stop_audio(wait);
- }
- Thread::join();
+ this->gui = gui;
}
-void ConvertBeep::tone(double freq, double secs, double gain)
+int ConvertBeepOnDone::handle_event()
{
- stop(0);
- this->freq = freq;
- this->secs = secs;
- this->gain = gain;
- start();
+ gui->dialog->beep = get_value()/100.f;
+ return 1;
}
projects / goodguy / cinelerra.git / blobdiff