#include "vwindow.h"
#include "vwindowgui.h"
#include "zoombar.h"
+#include "zwindow.h"
#include "automation.h"
#include "maskautos.h"
// gui->cursor->draw(1);
// gui->canvas->flash();
// gui->canvas->activate();
- cwindow->playback_engine->que->
- send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+ cwindow->refresh_frame(CHANGE_EDL);
}
void MWindow::add_video_track_entry(Track *dst)
// gui->cursor->draw(1);
// gui->canvas->flash();
// gui->canvas->activate();
- cwindow->playback_engine->que->
- send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+ cwindow->refresh_frame(CHANGE_EDL);
save_backup();
}
// gui->cursor->draw(1);
// gui->canvas->flash();
// gui->canvas->activate();
- cwindow->playback_engine->que->
- send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+ cwindow->refresh_frame(CHANGE_EDL);
save_backup();
}
update_plugin_guis();
gui->update(1, 2, 1, 1, 1, 1, 0);
cwindow->update(1, 0, 0, 0, 1);
- cwindow->playback_engine->que->
- send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+ cwindow->refresh_frame(CHANGE_EDL);
}
void MWindow::clear(int clear_handle)
restart_brender();
gui->update(1, 1, 0, 0, 1, 0, 0);
- cwindow->playback_engine->que->
- send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+ cwindow->refresh_frame(CHANGE_EDL);
}
undo->update_undo_after(_("crop"), LOAD_ALL);
restart_brender();
- cwindow->playback_engine->que->
- send_command(CURRENT_FRAME, CHANGE_ALL, edl, 1);
+ cwindow->refresh_frame(CHANGE_ALL);
save_backup();
}
gui->update(1, 2, 1, 1, 1, 1, 0);
cwindow->update(1, 0, 0, 0, 1);
awindow->gui->async_update_assets();
- cwindow->playback_engine->que->
- send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+ cwindow->refresh_frame(CHANGE_EDL);
}
void MWindow::cut(double start, double end, double new_position)
gui->update(1, 2, 1, 1, 1, 1, 0);
cwindow->update(1, 0, 0, 0, 1);
awindow->gui->async_update_assets();
- cwindow->playback_engine->que->
- send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+ cwindow->refresh_frame(CHANGE_EDL);
}
void MWindow::snap_left_edit()
}
-void MWindow::delete_inpoint()
-{
- edl->local_session->unset_inpoint();
- save_backup();
-}
-
-void MWindow::delete_outpoint()
-{
- edl->local_session->unset_outpoint();
- save_backup();
-}
-
-
void MWindow::delete_track()
{
if( edl->tracks->last )
update_plugin_states();
gui->update(1, 1, 1, 0, 1, 0, 0);
- cwindow->playback_engine->que->
- send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+ cwindow->refresh_frame(CHANGE_EDL);
}
void MWindow::delete_track(Track *track)
update_plugin_states();
gui->update(1, 1, 1, 0, 1, 0, 0);
- cwindow->playback_engine->que->
- send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+ cwindow->refresh_frame(CHANGE_EDL);
save_backup();
}
undo->update_undo_after(_("move edit"), LOAD_ALL);
restart_brender();
- cwindow->playback_engine->que->
- send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+ cwindow->refresh_frame(CHANGE_EDL);
update_plugin_guis();
gui->update(1, 1, // 1 for incremental drawing. 2 for full refresh
undo->update_undo_after(_("paste effect"), LOAD_ALL);
restart_brender();
- cwindow->playback_engine->que->
- send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+ cwindow->refresh_frame(CHANGE_EDL);
update_plugin_guis();
gui->update(1, 1, // 1 for incremental drawing. 2 for full refresh
0, 0, 0, 0, 0);
undo->update_undo_after(_("move effect"), LOAD_ALL);
restart_brender();
- cwindow->playback_engine->que->
- send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+ cwindow->refresh_frame(CHANGE_EDL);
update_plugin_guis();
gui->update(1, 1, // 1 for incremental drawing. 2 for full refresh
0, 0, 0, 0, 0);
restart_brender();
update_plugin_guis();
gui->update(1, 2, 1, 1, 1, 1, 0);
- cwindow->playback_engine->que->
- send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+ cwindow->refresh_frame(CHANGE_EDL);
}
}
restart_brender();
gui->update(1, 2, 1, 1, 1, 1, 0);
cwindow->update(1, 0, 0, 0, 1);
- cwindow->playback_engine->que->
- send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+ cwindow->refresh_frame(CHANGE_EDL);
}
void MWindow::detach_transition(Transition *transition)
{
calling_window_gui->unlock_window();
stop_playback(0);
+ if( undo->redo_load_flags() & LOAD_SESSION )
+ close_mixers();
- cwindow->gui->lock_window("MWindow::redo_entry");
+ cwindow->gui->lock_window("MWindow::redo_entry 1");
for( int i = 0; i < vwindows.size(); i++ ) {
if( vwindows.get(i)->is_running() ) {
if( calling_window_gui != vwindows.get(i)->gui ) {
}
}
}
- gui->lock_window();
+ gui->lock_window("MWindow::redo_entry 3");
undo->redo();
save_backup();
+ restart_brender();
update_plugin_states();
update_plugin_guis();
- awindow->gui->async_update_assets();
- restart_brender();
+
gui->update(1, 2, 1, 1, 1, 1, 1);
+ gui->unlock_window();
cwindow->update(1, 1, 1, 1, 1);
-
- if( calling_window_gui != cwindow->gui )
- cwindow->gui->unlock_window();
- if( calling_window_gui != gui )
- gui->unlock_window();
-
+ cwindow->gui->unlock_window();
for( int i = 0; i < vwindows.size(); i++ ) {
if( vwindows.get(i)->is_running() ) {
}
}
- cwindow->playback_engine->que->
- send_command(CURRENT_FRAME, CHANGE_ALL, edl, 1);
+ if( calling_window_gui != gui )
+ gui->unlock_window();
+
+ awindow->gui->async_update_assets();
+
+ cwindow->refresh_frame(CHANGE_ALL);
+ calling_window_gui->lock_window("MWindow::redo_entry 4");
}
}
}
+void MWindow::unset_inoutpoint(int is_mwindow)
+{
+ undo->update_undo_before();
+ edl->unset_inoutpoint();
+ save_backup();
+ undo->update_undo_after(_("clear in/out"), LOAD_TIMEBAR);
+
+ if( !is_mwindow ) {
+ gui->lock_window("MWindow::unset_inoutpoint 1");
+ }
+ gui->update_timebar(1);
+ if( !is_mwindow ) {
+ gui->unlock_window();
+ }
+
+ if( is_mwindow ) {
+ cwindow->gui->lock_window("MWindow::unset_inoutpoint 2");
+ }
+ cwindow->gui->timebar->update(1);
+ if( is_mwindow ) {
+ cwindow->gui->unlock_window();
+ }
+}
+
void MWindow::splice(EDL *source)
{
FileXML file;
cwindow->update(1, 0, 0, 0, 1);
awindow->gui->async_update_assets();
restart_brender();
- cwindow->playback_engine->que->
- send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+ cwindow->refresh_frame(CHANGE_EDL);
}
{
calling_window_gui->unlock_window();
stop_playback(0);
+ if( undo->undo_load_flags() & LOAD_SESSION )
+ close_mixers();
cwindow->gui->lock_window("MWindow::undo_entry 1");
for( int i = 0; i < vwindows.size(); i++ ) {
awindow->gui->async_update_assets();
- cwindow->playback_engine->que->
- send_command(CURRENT_FRAME, CHANGE_ALL, edl, 1);
+ cwindow->refresh_frame(CHANGE_ALL);
calling_window_gui->lock_window("MWindow::undo_entry 4");
}
update_plugin_guis();
gui->update(1, 2, 1, 1, 1, 1, 0);
cwindow->update(1, 0, 0, 0, 1);
- cwindow->playback_engine->que->
- send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+ cwindow->refresh_frame(CHANGE_EDL);
}