projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bunch-o compiler bitch'n
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
trackcanvas.C
diff --git
a/cinelerra-5.1/cinelerra/trackcanvas.C
b/cinelerra-5.1/cinelerra/trackcanvas.C
index 9f596c26ae7c2cf91457bf561118b902fe72ebfd..e79654d4c9ab82a98f8c4cb2a1c8139f56b4c564 100644
(file)
--- a/
cinelerra-5.1/cinelerra/trackcanvas.C
+++ b/
cinelerra-5.1/cinelerra/trackcanvas.C
@@
-1854,7
+1854,9
@@
void TrackCanvas::draw_loop_points()
void TrackCanvas::draw_brender_range()
{
void TrackCanvas::draw_brender_range()
{
- if(mwindow->preferences->use_brender)
+ if( !mwindow->preferences->use_brender || !mwindow->brender_active ) return;
+ if( mwindow->edl->session->brender_start >= mwindow->edl->session->brender_end ) return;
+ if( mwindow->edl->session->brender_end > 0 )
{
int64_t x1 = Units::round(mwindow->edl->session->brender_start *
mwindow->edl->session->sample_rate /
{
int64_t x1 = Units::round(mwindow->edl->session->brender_start *
mwindow->edl->session->sample_rate /
@@
-4674,7
+4676,8
@@
int TrackCanvas::button_press_event()
activate();
}
activate();
}
- if( get_buttonpress() == LEFT_BUTTON ) {
+ if( get_buttonpress() == LEFT_BUTTON &&
+ gui->mbuttons->transport->engine->command->command != STOP ) {
gui->unlock_window();
gui->mbuttons->transport->handle_transport(STOP, 1, 0, 0);
gui->lock_window("TrackCanvas::button_press_event");
gui->unlock_window();
gui->mbuttons->transport->handle_transport(STOP, 1, 0, 0);
gui->lock_window("TrackCanvas::button_press_event");
@@
-4817,7
+4820,7
@@
int TrackCanvas::button_press_event()
int TrackCanvas::start_selection(double position)
{
int rerender = 0;
int TrackCanvas::start_selection(double position)
{
int rerender = 0;
- position = mwindow->edl->align_to_frame(position,
0
);
+ position = mwindow->edl->align_to_frame(position,
1
);
// Extend a border
// Extend a border