Browse Source

Timeline: Don't die when a punch recording is started with no range defined.

tags/non-daw-v1.2.0
Jonathan Moore Liles 12 years ago
parent
commit
15a78bbfb5
3 changed files with 4 additions and 5 deletions
  1. +2
    -2
      timeline/src/Engine/Timeline.C
  2. +1
    -1
      timeline/src/TLE.fl
  3. +1
    -2
      timeline/src/Timeline.C

+ 2
- 2
timeline/src/Engine/Timeline.C View File

@@ -40,7 +40,7 @@ Timeline::record ( void )

nframes_t frame = transport->frame;

if ( transport->punch_enabled() && frame < range_start() )
if ( transport->punch_enabled() && range_start() != range_end() && frame < range_start() )
frame = range_start();

DMESSAGE( "Going to record starting at frame %lu", (unsigned long)frame );
@@ -64,7 +64,7 @@ Timeline::stop ( void )
{
nframes_t frame = transport->frame;

if ( transport->punch_enabled() && frame > range_end() )
if ( transport->punch_enabled() && range_start() != range_end() && frame > range_end() )
frame = range_end();

for ( int i = tracks->children(); i-- ; )


+ 1
- 1
timeline/src/TLE.fl View File

@@ -856,7 +856,7 @@ if ( engine && engine->zombified() && ! zombie )

solo_blinker->value( Track::soloing() );

if ( transport->punch_enabled() )
if ( transport->punch_enabled() && timeline->range_start() != timeline->range_end() )
rec_blinker->value( transport->rolling &&
transport->rec_enabled() &&
transport->frame >= timeline->range_start() &&


+ 1
- 2
timeline/src/Timeline.C View File

@@ -1068,8 +1068,7 @@ Timeline::redraw_playhead ( void )

if ( transport->rolling &&
transport->rec_enabled() &&
transport->punch_enabled() &&
transport->frame > range_end() )
( ( transport->punch_enabled() && range_start() != range_end() ) && transport->frame > range_end() ) )
transport->stop();

int playhead_x = ts_to_x( transport->frame );


Loading…
Cancel
Save