X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fconvert.C;h=c6ecb0438ad271d89869f82a0357d75a3499164b;hb=9e3d90a964c0fbe97c0b58235336a47111932d5d;hp=370adcc9ca401f7d0f3339f2a46039ed3c06c414;hpb=d17640d4122d028eee849d9fedf8ba35f7f0f6e0;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/convert.C b/cinelerra-5.1/cinelerra/convert.C index 370adcc9..c6ecb043 100644 --- a/cinelerra-5.1/cinelerra/convert.C +++ b/cinelerra-5.1/cinelerra/convert.C @@ -52,7 +52,7 @@ #define WIDTH xS(400) -#define HEIGHT yS(320) +#define HEIGHT yS(360) #define MAX_SCALE 16 ConvertRender::ConvertRender(MWindow *mwindow) @@ -70,6 +70,7 @@ ConvertRender::ConvertRender(MWindow *mwindow) failed = 0; canceled = 0; result = 0; beep = 0; + to_proxy = 0; } ConvertRender::~ConvertRender() @@ -102,7 +103,16 @@ void ConvertRender::reset() 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, '.'); @@ -259,7 +269,7 @@ int ConvertRender::add_original(EDL *edl, Indexable *idxbl) // 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; } @@ -333,13 +343,14 @@ int ConvertRender::find_convertable_assets(EDL *edl) 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) @@ -512,7 +523,7 @@ void ConvertRender::create_copy(int i) RenderPackage *package = dispatcher.get_package(0); 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 @@ -568,6 +579,8 @@ void ConvertWindow::create_objects() 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); @@ -654,6 +667,7 @@ ConvertDialog::ConvertDialog(MWindow *mwindow) asset->audio_data = 1; remove_originals = 1; beep = 0; + to_proxy = 0; } ConvertDialog::~ConvertDialog() @@ -670,6 +684,7 @@ BC_Window* ConvertDialog::new_gui() 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; @@ -686,8 +701,9 @@ void ConvertDialog::handle_close_event(int result) 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); } @@ -707,96 +723,31 @@ int ConvertRemoveOriginals::handle_event() 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) +int ConvertToProxyPath::handle_event() { - 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= 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() -{ - 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; }