projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fullscreen segv fix, popup for 4opts preview, renderfarm print fix, pan widget upgrad...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
vwindowgui.C
diff --git
a/cinelerra-5.1/cinelerra/vwindowgui.C
b/cinelerra-5.1/cinelerra/vwindowgui.C
index 985d484bdf4fa224f8abba96d0da7308b7d691bb..44a9948c28c755c1c3a74b93a0495a0c02f5c57b 100644
(file)
--- a/
cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/
cinelerra-5.1/cinelerra/vwindowgui.C
@@
-358,7
+358,7
@@
int VWindowGUI::keypress_event()
break;
case 'f':
unlock_window();
break;
case 'f':
unlock_window();
- if(
mwindow->session->vwindow_fullscreen
)
+ if(
canvas->get_fullscreen()
)
canvas->stop_fullscreen();
else
canvas->start_fullscreen();
canvas->stop_fullscreen();
else
canvas->start_fullscreen();
@@
-366,7
+366,7
@@
int VWindowGUI::keypress_event()
break;
case ESC:
unlock_window();
break;
case ESC:
unlock_window();
- if(
mwindow->session->vwindow_fullscreen
)
+ if(
canvas->get_fullscreen()
)
canvas->stop_fullscreen();
lock_window("VWindowGUI::keypress_event 2");
break;
canvas->stop_fullscreen();
lock_window("VWindowGUI::keypress_event 2");
break;
@@
-489,7
+489,7
@@
void VWindowGUI::stop_transport()
{
if( !transport->is_stopped() ) {
unlock_window();
{
if( !transport->is_stopped() ) {
unlock_window();
- transport->handle_transport(STOP, 1
, 0, 0
);
+ transport->handle_transport(STOP, 1);
lock_window("VWindowGUI::panel_stop_transport");
}
}
lock_window("VWindowGUI::panel_stop_transport");
}
}
@@
-590,7
+590,7
@@
void VWindowEditing::set_position(double position)
if( position < 0 ) position = 0;
edl->local_session->set_selectionstart(position);
edl->local_session->set_selectionend(position);
if( position < 0 ) position = 0;
edl->local_session->set_selectionstart(position);
edl->local_session->set_selectionend(position);
- vwindow->update_position(
CHANGE_NONE, 0, 1
);
+ vwindow->update_position();
}
}
}
}
@@
-620,9
+620,7
@@
void VWindowEditing::panel_toggle_label()
void VWindowEditing::panel_next_label(int cut)
{
if( !vwindow->get_edl() ) return;
void VWindowEditing::panel_next_label(int cut)
{
if( !vwindow->get_edl() ) return;
- vwindow->gui->unlock_window();
- vwindow->playback_engine->interrupt_playback(1);
- vwindow->gui->lock_window("VWindowEditing::next_label");
+ vwindow->interrupt_playback(1);
EDL *edl = vwindow->get_edl();
Label *current = edl->labels->next_label(
EDL *edl = vwindow->get_edl();
Label *current = edl->labels->next_label(
@@
-631,16
+629,14
@@
void VWindowEditing::panel_next_label(int cut)
edl->tracks->total_length();
edl->local_session->set_selectionstart(position);
edl->local_session->set_selectionend(position);
edl->tracks->total_length();
edl->local_session->set_selectionstart(position);
edl->local_session->set_selectionend(position);
- vwindow->update_position(
CHANGE_NONE, 0, 1, 0
);
+ vwindow->update_position();
vwindow->gui->timebar->update(1);
}
void VWindowEditing::panel_prev_label(int cut)
{
if( !vwindow->get_edl() ) return;
vwindow->gui->timebar->update(1);
}
void VWindowEditing::panel_prev_label(int cut)
{
if( !vwindow->get_edl() ) return;
- vwindow->gui->unlock_window();
- vwindow->playback_engine->interrupt_playback(1);
- vwindow->gui->lock_window("VWindowEditing::prev_label");
+ vwindow->interrupt_playback(1);
EDL *edl = vwindow->get_edl();
Label *current = edl->labels->prev_label(
EDL *edl = vwindow->get_edl();
Label *current = edl->labels->prev_label(
@@
-648,7
+644,7
@@
void VWindowEditing::panel_prev_label(int cut)
double position = !current ? 0 : current->position;
edl->local_session->set_selectionstart(position);
edl->local_session->set_selectionend(position);
double position = !current ? 0 : current->position;
edl->local_session->set_selectionstart(position);
edl->local_session->set_selectionend(position);
- vwindow->update_position(
CHANGE_NONE, 0, 1, 0
);
+ vwindow->update_position();
vwindow->gui->timebar->update(1);
}
vwindow->gui->timebar->update(1);
}
@@
-818,9
+814,7
@@
void VWindowCanvas::zoom_resize_window(float percentage)
void VWindowCanvas::close_source()
{
void VWindowCanvas::close_source()
{
- gui->unlock_window();
- gui->vwindow->playback_engine->interrupt_playback(1);
- gui->lock_window("VWindowCanvas::close_source");
+ gui->vwindow->interrupt_playback(1);
gui->vwindow->delete_source(1, 1);
}
gui->vwindow->delete_source(1, 1);
}
@@
-883,13
+877,3
@@
void VWindowCanvas::draw_overlays()
}
}
}
}
-int VWindowCanvas::get_fullscreen()
-{
- return mwindow->session->vwindow_fullscreen;
-}
-
-void VWindowCanvas::set_fullscreen(int value)
-{
- mwindow->session->vwindow_fullscreen = value;
-}
-