Fix broken whitespace. I'd apologize for the compile times if it was my fault :D
[ardour.git] / libs / ardour / session_process.cc
index 9902e5a1e32769141b080794ab4bedeff0c9a4a0..8a677105bd81509398a54829e2ad21c54a0be2f8 100644 (file)
@@ -51,6 +51,7 @@ using namespace std;
 /** Called by the audio engine when there is work to be done with JACK.
  * @param nframes Number of frames to process.
  */
+
 void
 Session::process (pframes_t nframes)
 {
@@ -106,25 +107,26 @@ Session::no_roll (pframes_t nframes)
                _click_io->silence (nframes);
        }
 
-       DEBUG_TRACE(DEBUG::Graph,"calling graph/no-roll\n");
-       route_graph->routes_no_roll( nframes, _transport_frame, end_frame, non_realtime_work_pending(), actively_recording(), declick);
-        /*
-       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+       if (route_graph->threads_in_use() > 0) {
+               DEBUG_TRACE(DEBUG::ProcessThreads,"calling graph/no-roll\n");
+               route_graph->routes_no_roll( nframes, _transport_frame, end_frame, non_realtime_work_pending(), actively_recording(), declick);
+       } else {
+               for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
 
-               if ((*i)->is_hidden()) {
-                       continue;
-               }
+                       if ((*i)->is_hidden()) {
+                               continue;
+                       }
 
-               (*i)->set_pending_declick (declick);
+                       (*i)->set_pending_declick (declick);
 
-               if ((*i)->no_roll (nframes, _transport_frame, end_frame, non_realtime_work_pending(),
-                                  actively_recording(), declick)) {
-                       error << string_compose(_("Session: error in no roll for %1"), (*i)->name()) << endmsg;
-                       ret = -1;
-                       break;
+                       if ((*i)->no_roll (nframes, _transport_frame, end_frame, non_realtime_work_pending(),
+                                          actively_recording(), declick)) {
+                               error << string_compose(_("Session: error in no roll for %1"), (*i)->name()) << endmsg;
+                               ret = -1;
+                               break;
+                       }
                }
        }
-        */
 
        return ret;
 }
@@ -147,25 +149,32 @@ Session::process_routes (pframes_t nframes, bool& need_butler)
        const framepos_t start_frame = _transport_frame;
        const framepos_t end_frame = _transport_frame + floor (nframes * _transport_speed);
 
-       DEBUG_TRACE(DEBUG::Graph,"calling graph/process-routes\n");
-       route_graph->process_routes( nframes, start_frame, end_frame, declick, record_active, rec_monitors, need_butler);
-/*
-       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+       /* XXX this is hack to force use of the graph even if we are only
+          using 1 thread. its needed because otherwise when we remove
+          tracks, the graph never gets updated.
+       */
+       if (1 || route_graph->threads_in_use() > 0) {
+               DEBUG_TRACE(DEBUG::ProcessThreads,"calling graph/process-routes\n");
+               route_graph->process_routes( nframes, start_frame, end_frame, declick, record_active, rec_monitors, need_butler);
+       } else {
 
-               int ret;
+               for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
 
-               if ((*i)->is_hidden()) {
-                       continue;
-               }
+                       int ret;
+
+                       if ((*i)->is_hidden()) {
+                               continue;
+                       }
 
-               (*i)->set_pending_declick (declick);
+                       (*i)->set_pending_declick (declick);
 
-               if ((ret = (*i)->roll (nframes, start_frame, end_frame, declick, record_active, rec_monitors, need_butler)) < 0) {
-                       stop_transport ();
-                       return -1;
+                       if ((ret = (*i)->roll (nframes, start_frame, end_frame, declick, record_active, rec_monitors, need_butler)) < 0) {
+                               stop_transport ();
+                               return -1;
+                       }
                }
        }
-*/
+
        return 0;
 }
 
@@ -185,22 +194,28 @@ Session::silent_process_routes (pframes_t nframes, bool& need_butler)
        const framepos_t start_frame = _transport_frame;
        const framepos_t end_frame = _transport_frame + lrintf(nframes * _transport_speed);
 
-       route_graph->silent_process_routes( nframes, start_frame, end_frame, record_active, rec_monitors, need_butler);
-/*
-       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+       /* XXX this is hack to force use of the graph even if we are only
+          using 1 thread. its needed because otherwise when we remove
+          tracks, the graph never gets updated.
+       */
+       if (1 || route_graph->threads_in_use() > 0) {
+               route_graph->silent_process_routes( nframes, start_frame, end_frame, record_active, rec_monitors, need_butler);
+       } else {
+               for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
 
-               int ret;
+                       int ret;
 
-               if ((*i)->is_hidden()) {
-                       continue;
-               }
+                       if ((*i)->is_hidden()) {
+                               continue;
+                       }
 
-               if ((ret = (*i)->silent_roll (nframes, start_frame, end_frame, record_active, rec_monitors, need_butler)) < 0) {
-                       stop_transport ();
-                       return -1;
+                       if ((ret = (*i)->silent_roll (nframes, start_frame, end_frame, record_active, rec_monitors, need_butler)) < 0) {
+                               stop_transport ();
+                               return -1;
+                       }
                }
        }
-*/
+
        return 0;
 }
 
@@ -239,7 +254,6 @@ Session::process_with_events (pframes_t nframes)
        pframes_t      this_nframes;
        framepos_t     end_frame;
        bool           session_needs_butler = false;
-       framepos_t     stop_limit;
        framecnt_t     frames_moved;
 
        /* make sure the auditioner is silent */
@@ -276,12 +290,12 @@ Session::process_with_events (pframes_t nframes)
                        _transport_speed >= (1 - tolerance) &&
                        _transport_speed <= (1 + tolerance)
                        );
-               
+
                if (_send_qf_mtc && !was_sending_qf_mtc) {
                        /* we will re-start quarter-frame MTC this cycle, so send a full update to set things up */
                        _send_timecode_update = true;
                }
-               
+
                if (Config->get_send_mtc() && !_send_qf_mtc && _pframes_since_last_mtc > (frame_rate () / 4)) {
                        /* we're sending MTC, but we're not sending QF MTC at the moment, and it's been
                           a quarter of a second since we sent anything at all, so send a full MTC update
@@ -289,10 +303,10 @@ Session::process_with_events (pframes_t nframes)
                        */
                        _send_timecode_update = true;
                }
-               
+
                _pframes_since_last_mtc += nframes;
        }
-               
+
        /* Events caused a transport change (or we re-started sending
         * MTC), so send an MTC Full Frame (Timecode) message.  This
         * is sent whether rolling or not, to give slaves an idea of
@@ -347,16 +361,7 @@ Session::process_with_events (pframes_t nframes)
                        send_midi_time_code_for_cycle (_transport_frame, end_frame, nframes);
                }
 
-               if (actively_recording()) {
-                       stop_limit = max_framepos;
-               } else {
-
-                       if (Config->get_stop_at_session_end()) {
-                               stop_limit = current_end_frame();
-                       } else {
-                               stop_limit = max_framepos;
-                       }
-               }
+               framepos_t stop_limit = compute_stop_limit ();
 
                if (maybe_stop (stop_limit)) {
                        no_roll (nframes);
@@ -430,7 +435,6 @@ Session::process_with_events (pframes_t nframes)
 
                        /* this is necessary to handle the case of seamless looping */
                        end_frame = _transport_frame + floor (nframes * _transport_speed);
-
                }
 
                set_next_event ();
@@ -524,7 +528,7 @@ Session::follow_slave (pframes_t nframes)
 
        DEBUG_TRACE (DEBUG::Slave, string_compose ("slave state %1 @ %2 speed %3 cur delta %4 avg delta %5\n",
                                                   _slave_state, slave_transport_frame, slave_speed, this_delta, average_slave_delta));
-                    
+
 
        if (_slave_state == Running && !_slave->is_always_synced() && !config.get_timecode_source_is_synced()) {
 
@@ -551,11 +555,11 @@ Session::follow_slave (pframes_t nframes)
                                                                           slave_speed,
                                                                           _transport_speed,
                                                                           _transport_frame,
-                                                                          slave_transport_frame, 
+                                                                          slave_transport_frame,
                                                                           average_slave_delta));
                        }
 #endif
-                       
+
                        if (_slave->give_slave_full_control_over_transport_speed()) {
                                set_transport_speed (slave_speed, false, false);
                                //std::cout << "set speed = " << slave_speed << "\n";
@@ -566,7 +570,7 @@ Session::follow_slave (pframes_t nframes)
                                                                           delta, adjusted_speed, adjusted_speed/slave_speed, _transport_speed,
                                                                           slave_speed));
                        }
-                       
+
 #if 1
                        if ((framecnt_t) abs(average_slave_delta) > _slave->resolution()) {
                                cerr << "average slave delta greater than slave resolution (" << _slave->resolution() << "), going to silent motion\n";
@@ -716,7 +720,7 @@ Session::track_slave_state (float slave_speed, framepos_t slave_transport_frame,
 
                if (_transport_speed != 0.0f) {
                        DEBUG_TRACE (DEBUG::Slave, string_compose ("slave stops transport: %1 frame %2 tf %3\n", slave_speed, slave_transport_frame, _transport_frame));
-                       stop_transport();
+                       stop_transport ();
                }
 
                if (slave_transport_frame != _transport_frame) {
@@ -754,19 +758,8 @@ Session::follow_slave_silently (pframes_t nframes, float slave_speed)
                } else {
                        increment_transport_position (frames_moved);
                }
-                
-               framepos_t stop_limit;
-
-               if (actively_recording()) {
-                       stop_limit = max_framepos;
-               } else {
-                       if (Config->get_stop_at_session_end()) {
-                               stop_limit = current_end_frame();
-                       } else {
-                               stop_limit = max_framepos;
-                       }
-               }
 
+               framepos_t const stop_limit = compute_stop_limit ();
                maybe_stop (stop_limit);
        }
 }
@@ -775,7 +768,6 @@ void
 Session::process_without_events (pframes_t nframes)
 {
        bool session_needs_butler = false;
-       framepos_t stop_limit;
        framecnt_t frames_moved;
 
        if (!process_can_proceed()) {
@@ -801,20 +793,12 @@ Session::process_without_events (pframes_t nframes)
                interpolation.set_speed (fabs(_transport_speed));
                frames_moved = (framecnt_t) interpolation.interpolate (0, nframes, 0, 0);
        }
-       
+
        if (!_exporting && !timecode_transmission_suspended()) {
                send_midi_time_code_for_cycle (_transport_frame, _transport_frame + frames_moved, nframes);
        }
 
-       if (actively_recording()) {
-               stop_limit = max_framepos;
-       } else {
-               if (Config->get_stop_at_session_end()) {
-                       stop_limit = current_end_frame();
-               } else {
-                       stop_limit = max_framepos;
-               }
-       }
+       framepos_t const stop_limit = compute_stop_limit ();
 
        if (maybe_stop (stop_limit)) {
                fail_roll (nframes);
@@ -834,6 +818,16 @@ Session::process_without_events (pframes_t nframes)
 
        get_track_statistics ();
 
+       /* XXX: I'm not sure whether this is correct, but at least it
+          matches process_with_events, so that this new frames_moved
+          is -ve when transport speed is -ve.  This means that the
+          transport position is updated correctly when we are in
+          reverse.  It seems a bit wrong that we're not using the
+          interpolator to compute this.
+       */
+
+       frames_moved = (framecnt_t) floor (_transport_speed * nframes);
+
        if (frames_moved < 0) {
                decrement_transport_position (-frames_moved);
        } else {
@@ -869,12 +863,12 @@ Session::process_audition (pframes_t nframes)
                _butler->summon ();
        }
 
-        /* if using a monitor section, run it because otherwise we don't hear anything */
+       /* if using a monitor section, run it because otherwise we don't hear anything */
+
+       if (auditioner->needs_monitor()) {
+               _monitor_out->passthru (_transport_frame, _transport_frame + nframes, nframes, false);
+       }
 
-        if (auditioner->needs_monitor()) {
-                _monitor_out->passthru (_transport_frame, _transport_frame + nframes, nframes, false);
-        }
-        
        /* handle pending events */
 
        while (pending_events.read (&ev, 1) == 1) {
@@ -916,7 +910,7 @@ Session::maybe_sync_start (pframes_t & nframes)
 
                no_roll (sync_offset);
                nframes -= sync_offset;
-               AudioPort::increment_port_offset (sync_offset);
+               Port::increment_global_port_buffer_offset (sync_offset);
                waiting_for_sync_offset = false;
 
                if (nframes == 0) {
@@ -1123,13 +1117,13 @@ Session::process_event (SessionEvent* ev)
                del = false; // other side of RT request needs to clean up
                break;
 
-        case SessionEvent::AdjustPlaybackBuffering:
-                schedule_playback_buffering_adjustment ();
-                break;
+       case SessionEvent::AdjustPlaybackBuffering:
+               schedule_playback_buffering_adjustment ();
+               break;
 
-        case SessionEvent::AdjustCaptureBuffering:
-                schedule_capture_buffering_adjustment ();
-                break;
+       case SessionEvent::AdjustCaptureBuffering:
+               schedule_capture_buffering_adjustment ();
+               break;
 
        case SessionEvent::SetTimecodeTransmission:
                g_atomic_int_set (&_suspend_timecode_transmission, ev->yes_or_no ? 0 : 1);
@@ -1150,3 +1144,14 @@ Session::process_event (SessionEvent* ev)
        }
 }
 
+framepos_t
+Session::compute_stop_limit () const
+{
+       bool const punching = (config.get_punch_in () && _locations->auto_punch_location());
+
+       if (!actively_recording() && !punching && Config->get_stop_at_session_end()) {
+               return current_end_frame ();
+       }
+
+       return max_framepos;
+}