X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=e6a40ee551bb01059bb985e9a99f17c2b43f71f7;hp=6e8547d6359f231493c37e64b74b162d6396179a;hb=47f71d004db08fb289428240fb87ce97c64382d2;hpb=e23393f4ff9f772ac8f47926cf490dc87a630ed4 diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C index 6e8547d6..e6a40ee5 100644 --- a/cinelerra-5.1/cinelerra/mwindow.C +++ b/cinelerra-5.1/cinelerra/mwindow.C @@ -102,6 +102,7 @@ #include "savefile.inc" #include "samplescroll.h" #include "sha1.h" +#include "shuttle.h" #include "sighandler.h" #include "splashgui.h" #include "statusbar.h" @@ -198,6 +199,7 @@ MWindow::MWindow() playback_3d = 0; splash_window = 0; undo = 0; + undo_command = COMMAND_NONE; defaults = 0; assets = 0; //commercials = 0; @@ -237,6 +239,7 @@ MWindow::MWindow() in_destructor = 0; speed_edl = 0; proxy_beep = 0; + shuttle = 0; } @@ -254,6 +257,7 @@ MWindow::~MWindow() delete proxy_beep; delete create_bd; create_bd = 0; delete create_dvd; create_dvd = 0; + delete shuttle; shuttle = 0; delete batch_render; batch_render = 0; delete render; render = 0; commit_commercial(); @@ -1255,10 +1259,10 @@ void MWindow::update_mixer_tracks() zwindows_lock->unlock(); } -void MWindow::queue_mixers(EDL *edl, int command, int wait_tracking, - int use_inout, int update_refresh, int toggle_audio, int loop_play) +void MWindow::handle_mixers(EDL *edl, int command, int wait_tracking, + int use_inout, int toggle_audio, int loop_play, float speed) { - zwindows_lock->lock("MWindow::queue_mixers"); + zwindows_lock->lock("MWindow::handle_mixers"); for( int vidx=0; vidxidx < 0 ) continue; @@ -1287,8 +1291,8 @@ void MWindow::queue_mixers(EDL *edl, int command, int wait_tracking, track->record = track->play = 0; } zwindow->change_source(mixer_edl); - zwindow->issue_command(command, - wait_tracking, use_inout, update_refresh, toggle_audio, loop_play); + zwindow->handle_mixer(command, 0, + use_inout, toggle_audio, loop_play, speed); } zwindows_lock->unlock(); } @@ -1296,7 +1300,7 @@ void MWindow::queue_mixers(EDL *edl, int command, int wait_tracking, void MWindow::refresh_mixers(int dir) { int command = dir >= 0 ? CURRENT_FRAME : LAST_FRAME; - queue_mixers(edl,command,0,0,1,0,0); + handle_mixers(edl, command, 0, 0, 0, 0, 0); } void MWindow::stop_mixers() @@ -1304,7 +1308,7 @@ void MWindow::stop_mixers() for( int vidx=0; vidxidx < 0 ) continue; - zwindow->issue_command(STOP, 0, 0, 0, 0, 0); + zwindow->handle_mixer(STOP, 0, 0, 0, 0, 0); } } @@ -1363,7 +1367,7 @@ void MWindow::create_mixers() { if( !session->drag_assets->size() && !session->drag_clips->size() ) return; - undo->update_undo_before(); + undo_before(); select_zwindow(0); ArrayListnew_mixers; @@ -1387,7 +1391,7 @@ void MWindow::create_mixers() refresh_mixers(); save_backup(); - undo->update_undo_after(_("create mixers"), LOAD_ALL); + undo_after(_("create mixers"), LOAD_ALL); restart_brender(); gui->update(1, FORCE_REDRAW, 1, 1, 1, 1, 0); sync_parameters(CHANGE_ALL); @@ -1582,6 +1586,22 @@ void MWindow::init_exportedl() exportedl = new ExportEDL(this); } +void MWindow::init_shuttle() +{ +#ifdef HAVE_SHUTTLE + int ret = Shuttle::probe(); + if( ret >= 0 ) { + shuttle = new Shuttle(this); + if( shuttle->read_config_file() > 0 ) { + printf("shuttle: bad config file\n"); + delete shuttle; shuttle = 0; + return; + } + shuttle->start(ret); + } +#endif +} + void MWindow::init_brender() { if(preferences->use_brender && !brender) @@ -1800,6 +1820,16 @@ void MWindow::stop_transport() gui->stop_transport(gui->get_window_lock() ? "MWindow::stop_transport" : 0); } +void MWindow::undo_before(const char *description, void *creator) +{ + undo->update_undo_before(description, creator); +} + +void MWindow::undo_after(const char *description, uint32_t load_flags, int changes_made) +{ + undo->update_undo_after(description, load_flags, changes_made); +} + void MWindow::beep(double freq, double secs, double gain) { if( !proxy_beep ) proxy_beep = new ProxyBeep(this); @@ -1826,7 +1856,7 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__); gui->lock_window("MWindow::load_filenames 0"); if(debug) printf("MWindow::load_filenames %d\n", __LINE__); - undo->update_undo_before(); + undo_before(); if(debug) printf("MWindow::load_filenames %d\n", __LINE__); @@ -2225,7 +2255,7 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__); // 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__); - undo->update_undo_after(_("load"), LOAD_ALL); + undo_after(_("load"), LOAD_ALL); for(int i = 0; i < new_edls.size(); i++) { @@ -2339,7 +2369,7 @@ int MWindow::to_proxy(Asset *asset, int new_scale, int new_use_scaler) edl->Garbage::add_user(); save_backup(); - undo->update_undo_before(_("proxy"), this); + undo_before(_("proxy"), this); ProxyRender proxy_render(this, asset); // revert project to original size from current size @@ -2452,7 +2482,7 @@ int MWindow::to_proxy(Asset *asset, int new_scale, int new_use_scaler) edl->set_proxy(new_scale, new_use_scaler, &proxy_render.orig_idxbls, &proxy_render.orig_proxies); - undo->update_undo_after(_("proxy"), LOAD_ALL); + undo_after(_("proxy"), LOAD_ALL); edl->Garbage::remove_user(); restart_brender(); @@ -2620,6 +2650,7 @@ void MWindow::create_objects(int want_gui, init_render(); if(debug) printf("MWindow::create_objects %d total_time=%d\n", __LINE__, (int)timer.get_difference()); + init_shuttle(); init_brender(); init_exportedl(); init_commercials(); @@ -2960,18 +2991,15 @@ void MWindow::set_screens(int value) screens = value; } -void MWindow::set_auto_keyframes(int value, int lock_mwindow, int lock_cwindow) +void MWindow::set_auto_keyframes(int value) { - if(lock_mwindow) gui->lock_window("MWindow::set_auto_keyframes"); edl->session->auto_keyframes = value; gui->mbuttons->edit_panel->keyframe->update(value); gui->flush(); - if(lock_mwindow) gui->unlock_window(); - - if(lock_cwindow) cwindow->gui->lock_window("MWindow::set_auto_keyframes"); + cwindow->gui->lock_window("MWindow::set_auto_keyframes"); cwindow->gui->edit_panel->keyframe->update(value); cwindow->gui->flush(); - if(lock_cwindow) cwindow->gui->unlock_window(); + cwindow->gui->unlock_window(); } void MWindow::set_auto_visibility(Autos *autos, int value) @@ -2998,20 +3026,17 @@ void MWindow::set_keyframe_type(int mode) gui->unlock_window(); } -int MWindow::set_editing_mode(int new_editing_mode, int lock_mwindow, int lock_cwindow) +int MWindow::set_editing_mode(int new_editing_mode) { - if(lock_mwindow) gui->lock_window("MWindow::set_editing_mode"); edl->session->editing_mode = new_editing_mode; gui->mbuttons->edit_panel->editing_mode = edl->session->editing_mode; gui->mbuttons->edit_panel->update(); gui->set_editing_mode(1); - if(lock_mwindow) gui->unlock_window(); - - if(lock_cwindow) cwindow->gui->lock_window("MWindow::set_editing_mode"); + cwindow->gui->lock_window("MWindow::set_editing_mode"); cwindow->gui->edit_panel->update(); cwindow->gui->edit_panel->editing_mode = edl->session->editing_mode; - if(lock_cwindow) cwindow->gui->unlock_window(); + cwindow->gui->unlock_window(); return 0; } @@ -3019,9 +3044,9 @@ void MWindow::toggle_editing_mode() { int mode = edl->session->editing_mode; if( mode == EDITING_ARROW ) - set_editing_mode(EDITING_IBEAM, 0, 1); + set_editing_mode(EDITING_IBEAM); else - set_editing_mode(EDITING_ARROW, 0, 1); + set_editing_mode(EDITING_ARROW); } void MWindow::toggle_camera_xyz() @@ -3040,12 +3065,10 @@ void MWindow::toggle_projector_xyz() void MWindow::set_labels_follow_edits(int value) { - gui->lock_window("MWindow::set_labels_follow_edits"); edl->session->labels_follow_edits = value; gui->mbuttons->edit_panel->locklabels->update(value); gui->mainmenu->labels_follow_edits->set_checked(value); gui->flush(); - gui->unlock_window(); } void MWindow::sync_parameters(int change_type) @@ -3053,35 +3076,24 @@ void MWindow::sync_parameters(int change_type) if( in_destructor ) return; // Sync engines which are playing back - if(cwindow->playback_engine->is_playing_back) - { - if(change_type == CHANGE_PARAMS) - { + if( cwindow->playback_engine->is_playing_back ) { + if( change_type == CHANGE_PARAMS ) { // TODO: block keyframes until synchronization is done cwindow->playback_engine->sync_parameters(edl); } - else + else { // Stop and restart - { int command = cwindow->playback_engine->command->command; - cwindow->playback_engine->que->send_command(STOP, - CHANGE_NONE, - 0, - 0); // Waiting for tracking to finish would make the restart position more // accurate but it can't lock the window to stop tracking for some reason. // Not waiting for tracking gives a faster response but restart position is // only as accurate as the last tracking update. - cwindow->playback_engine->interrupt_playback(0); - cwindow->playback_engine->que->send_command(command, - change_type, - edl, - 1, - 0); + cwindow->playback_engine->transport_stop(0); + cwindow->playback_engine->next_command->realtime = 1; + cwindow->playback_engine->transport_command(command, change_type, edl, 0); } } - else - { + else { cwindow->refresh_frame(change_type); } } @@ -3354,7 +3366,7 @@ int MWindow::get_title_color(Edit *edit) else return 0; } - if( !alpha ) + if( alpha == 0xff ) alpha = session->title_bar_alpha*255; return color | (~alpha<<24); } @@ -3781,8 +3793,8 @@ void MWindow::load_backup() void MWindow::save_undo_data() { - undo->update_undo_before(); - undo->update_undo_after(_("perpetual session"), LOAD_ALL); + undo_before(); + undo_after(_("perpetual session"), LOAD_ALL); char perpetual_path[BCTEXTLEN]; snprintf(perpetual_path, sizeof(perpetual_path), "%s/%s", File::get_config_path(), PERPETUAL_FILE); @@ -4116,11 +4128,11 @@ void MWindow::remove_assets_from_project(int push_undo, int redraw, } //printf("MWindow::rebuild_indices 1 %s\n", indexable->path); - if(push_undo) undo->update_undo_before(); + if(push_undo) undo_before(); if(drag_assets) edl->remove_from_project(drag_assets); if(drag_clips) edl->remove_from_project(drag_clips); if(redraw) save_backup(); - if(push_undo) undo->update_undo_after(_("remove assets"), LOAD_ALL); + if(push_undo) undo_after(_("remove assets"), LOAD_ALL); if(redraw) { restart_brender(); @@ -4503,7 +4515,7 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra session->auto_keyframes = 0; int result = file->open_file(preferences, asset, 1, 0); if( !result && delete_tracks > 0 ) - undo->update_undo_before(); + undo_before(); int video_layers = asset->get_video_layers(); if( !result && asset->video_data && vstream < video_layers ) { // try to get asset up to date, may fail @@ -4599,7 +4611,7 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra session->auto_keyframes = old_auto_keyframes; if( !result && delete_tracks > 0 ) { save_backup(); - undo->update_undo_after(_("select asset"), LOAD_ALL); + undo_after(_("select asset"), LOAD_ALL); } resync_guis(); return result;