updated .po files (*not* translations, just .po files)

[ardour.git] / libs / ardour / session_process.cc

diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index 6889e714fda67bdd69dfd303dbf901b7f0c3d32f..b18e00f9fd7f1271805428f44c857bfd0b68dfd8 100644 (file)
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -37,7 +37,7 @@
 #include "ardour/slave.h"
 #include "ardour/timestamps.h"
 #include "ardour/graph.h"
-#include "ardour/port.h"
+#include "ardour/audio_port.h"
 
 #include "midi++/manager.h"
 #include "midi++/mmc.h"
@@ -233,11 +233,11 @@ Session::get_track_statistics ()
 void
 Session::process_with_events (nframes_t nframes)
 {
-       SessionEvent*         ev;
+       SessionEvent*  ev;
        nframes_t      this_nframes;
-       nframes_t      end_frame;
+       framepos_t     end_frame;
        bool           session_needs_butler = false;
-       nframes_t      stop_limit;
+       framepos_t     stop_limit;
        framecnt_t     frames_moved;
 
        /* make sure the auditioner is silent */
@@ -316,13 +316,13 @@ Session::process_with_events (nframes_t nframes)
                }
 
                if (actively_recording()) {
-                       stop_limit = max_frames;
+                       stop_limit = max_framepos;
                } else {
 
                        if (Config->get_stop_at_session_end()) {
                                stop_limit = current_end_frame();
                        } else {
-                               stop_limit = max_frames;
+                               stop_limit = max_framepos;
                        }
                }
 
@@ -435,7 +435,7 @@ bool
 Session::follow_slave (nframes_t nframes)
 {
        double slave_speed;
-       nframes64_t slave_transport_frame;
+       framepos_t slave_transport_frame;
        nframes_t this_delta;
        int dir;
 
@@ -722,16 +722,16 @@ Session::follow_slave_silently (nframes_t nframes, float slave_speed)
                } else {
                        increment_transport_position (frames_moved);
                }
-
-               nframes_t stop_limit;
+                
+               framepos_t stop_limit;
 
                if (actively_recording()) {
-                       stop_limit = max_frames;
+                       stop_limit = max_framepos;
                } else {
                        if (Config->get_stop_at_session_end()) {
                                stop_limit = current_end_frame();
                        } else {
-                               stop_limit = max_frames;
+                               stop_limit = max_framepos;
                        }
                }
 
@@ -743,7 +743,7 @@ void
 Session::process_without_events (nframes_t nframes)
 {
        bool session_needs_butler = false;
-       nframes_t stop_limit;
+       framepos_t stop_limit;
        framecnt_t frames_moved;
 
        if (!process_can_proceed()) {
@@ -767,12 +767,12 @@ Session::process_without_events (nframes_t nframes)
        }
 
        if (actively_recording()) {
-               stop_limit = max_frames;
+               stop_limit = max_framepos;
        } else {
                if (Config->get_stop_at_session_end()) {
                        stop_limit = current_end_frame();
                } else {
-                       stop_limit = max_frames;
+                       stop_limit = max_framepos;
                }
        }
 
@@ -884,7 +884,7 @@ Session::maybe_sync_start (nframes_t& nframes)
 
                no_roll (sync_offset);
                nframes -= sync_offset;
-               Port::increment_port_offset (sync_offset);
+               AudioPort::increment_port_offset (sync_offset);
                waiting_for_sync_offset = false;
 
                if (nframes == 0) {