Small cleanup.

git-svn-id: svn://localhost/ardour2/branches/3.0@7867 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index 240448a78b3c65ced1b3b20aa678651b6a315c83..2c1e8b01c12a242a846e428423e2783fe4a6c981 100644 (file)
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -230,7 +230,7 @@ class Diskstream : public SessionObject, public PublicDiskstream
 
        virtual int use_pending_capture_data (XMLNode& node) = 0;
 
-       virtual void check_record_status (framepos_t transport_frame, nframes_t nframes, bool can_record);
+       virtual void check_record_status (framepos_t transport_frame, bool can_record);
        virtual void prepare_record_status (framepos_t /*capture_start_frame*/) {}
        virtual void set_align_style_from_io() {}
        virtual void setup_destructive_playlist () {}

diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index f8bd4f698f8462a894fbfe08a0af60769aa176e8..c88080a3d5a02454a360d5a78d72c7c631b906b8 100644 (file)
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -437,7 +437,7 @@ AudioDiskstream::process (framepos_t transport_frame, nframes_t nframes, bool ca
                return 0;
        }
 
-       check_record_status (transport_frame, nframes, can_record);
+       check_record_status (transport_frame, can_record);
 
        if (nframes == 0) {
                return 0;
@@ -474,7 +474,7 @@ AudioDiskstream::process (framepos_t transport_frame, nframes_t nframes, bool ca
         }
         
         OverlapType ot = coverage (first_recordable_frame, last_recordable_frame, transport_frame, transport_frame + nframes);
-        
+
         calculate_record_range (ot, transport_frame, nframes, rec_nframes, rec_offset);
         
         if (rec_nframes && !was_recording) {

diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc
index 179cf2b2a91ac7a1e1f7ffc408f72d8cd13e41a5..2c1877b7b54e65922ec6fe05b77266591d18f85e 100644 (file)
--- a/libs/ardour/diskstream.cc
+++ b/libs/ardour/diskstream.cc
@@ -506,7 +506,7 @@ Diskstream::move_processor_automation (boost::weak_ptr<Processor> p, list< Evora
 }
 
 void
-Diskstream::check_record_status (framepos_t transport_frame, nframes_t /*nframes*/, bool can_record)
+Diskstream::check_record_status (framepos_t transport_frame, bool can_record)
 {
        int possibly_recording;
        int rolling;

diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index 52b93015c8278003ff86e7f3737f9605fe6f8494..932b9bb2c9332f7c8010d857a6b57e8963445be6 100644 (file)
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -498,7 +498,7 @@ MidiDiskstream::process (framepos_t transport_frame, nframes_t nframes, bool can
 
         playback_distance = 0;
 
-       check_record_status (transport_frame, nframes, can_record);
+       check_record_status (transport_frame, can_record);
 
        nominally_recording = (can_record && re);
 

diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index 119ad280fdd9ebd5fab28abdb36e2528e4ed6258..638b6fa55d814bf5bd591174f23e7251219445b1 100644 (file)
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -31,6 +31,7 @@
 #include "pbd/failed_constructor.h"
 #include "pbd/stateful_diff_command.h"
 #include "pbd/xml++.h"
+#include "pbd/stacktrace.h"
 
 #include "ardour/debug.h"
 #include "ardour/playlist.h"

diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index ff1f6f78ed36303278fa7f77b25673bed9868633..46517e1752bf17de1e108548ec95609b71946494 100644 (file)
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -266,7 +266,7 @@ Track::no_roll (nframes_t nframes, framepos_t start_frame, framepos_t end_frame,
                */
        }
 
-       _diskstream->check_record_status (start_frame, nframes, can_record);
+       _diskstream->check_record_status (start_frame, can_record);
 
        bool send_silence;