always create short xfades when adding a region based on capture

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

diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index d78dab00bb9a02cf3aab3b8beb9ab5db4f49c489..ee57ca1cf09234bfe9099156d22cd5bbfc622174 100644 (file)
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -222,6 +222,8 @@ public:
        uint32_t combine_ops() const { return _combine_ops; }
 
        void set_layer (boost::shared_ptr<Region>, double);
+
+       void set_capture_insertion_in_progress (bool yn);
        
   protected:
        friend class Session;
@@ -286,6 +288,7 @@ public:
        bool             in_flush;
        bool             in_partition;
        bool            _frozen;
+       bool            _capture_insertion_underway;
        uint32_t         subcnt;
        PBD::ID         _orig_track_id;
        uint32_t        _combine_ops;

diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index 8c5b6063884e1e8a1e40ce091e6d293512dcd18b..8e6b5c27f1af8cfd917d43f10bf246c087b47cb3 100644 (file)
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -1476,6 +1476,7 @@ AudioDiskstream::transport_stopped_wallclock (struct tm& when, time_t twhen, boo
                // cerr << _name << ": there are " << capture_info.size() << " capture_info records\n";
 
                _playlist->clear_changes ();
+               _playlist->set_capture_insertion_in_progress (true);
                _playlist->freeze ();
 
                for (buffer_position = c->front()->write_source->last_capture_start_frame(), ci = capture_info.begin(); ci != capture_info.end(); ++ci) {
@@ -1514,6 +1515,7 @@ AudioDiskstream::transport_stopped_wallclock (struct tm& when, time_t twhen, boo
                }
 
                _playlist->thaw ();
+               _playlist->set_capture_insertion_in_progress (false);
                _session.add_command (new StatefulDiffCommand (_playlist));
        }
 

diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc
index 25fad6122f72e2a3621e0432e6d23d1126f4d0c0..76cab14699c73df03fc9ea50266aa0bea48dd3dd 100644 (file)
--- a/libs/ardour/audio_playlist.cc
+++ b/libs/ardour/audio_playlist.cc
@@ -314,13 +314,18 @@ AudioPlaylist::check_crossfades (Evoral::Range<framepos_t> range)
                                        /* Top's fade-in will cause an implicit fade-out of bottom */
                                        
                                        framecnt_t len = 0;
-                                       switch (_session.config.get_xfade_model()) {
-                                       case FullCrossfade:
-                                               len = bottom->last_frame () - top->first_frame ();
-                                               break;
-                                       case ShortCrossfade:
+
+                                       if (_capture_insertion_underway) {
                                                len = _session.config.get_short_xfade_seconds() * _session.frame_rate();
-                                               break;
+                                       } else {
+                                               switch (_session.config.get_xfade_model()) {
+                                               case FullCrossfade:
+                                                       len = bottom->last_frame () - top->first_frame ();
+                                                       break;
+                                               case ShortCrossfade:
+                                                       len = _session.config.get_short_xfade_seconds() * _session.frame_rate();
+                                                       break;
+                                               }
                                        }
                                        
                                        top->set_fade_in_active (true);
@@ -357,13 +362,18 @@ AudioPlaylist::check_crossfades (Evoral::Range<framepos_t> range)
                                        /* Top's fade-out will cause an implicit fade-in of bottom */
                                        
                                        framecnt_t len = 0;
-                                       switch (_session.config.get_xfade_model()) {
-                                       case FullCrossfade:
-                                               len = top->last_frame () - bottom->first_frame ();
-                                               break;
-                                       case ShortCrossfade:
+
+                                       if (_capture_insertion_underway) {
                                                len = _session.config.get_short_xfade_seconds() * _session.frame_rate();
-                                               break;
+                                       } else {
+                                               switch (_session.config.get_xfade_model()) {
+                                               case FullCrossfade:
+                                                       len = top->last_frame () - bottom->first_frame ();
+                                                       break;
+                                               case ShortCrossfade:
+                                                       len = _session.config.get_short_xfade_seconds() * _session.frame_rate();
+                                                       break;
+                                               }
                                        }
                                        
                                        top->set_fade_out_active (true);

diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index 390f9fdaaddc0a879dd3fbe4b4eae9f57143994f..3b0528ed3b7fc9f9975e8f6f8b0bcc3bebf462a0 100644 (file)
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -47,9 +47,9 @@ using namespace ARDOUR;
 using namespace PBD;
 
 namespace ARDOUR {
-namespace Properties {
-PBD::PropertyDescriptor<bool> regions;
-}
+       namespace Properties {
+               PBD::PropertyDescriptor<bool> regions;
+       }
 }
 
 struct ShowMeTheList {
@@ -311,6 +311,7 @@ Playlist::init (bool hide)
        in_partition = false;
        subcnt = 0;
        _frozen = false;
+       _capture_insertion_underway = false;
        _combine_ops = 0;
 
        _session.history().BeginUndoRedo.connect_same_thread (*this, boost::bind (&Playlist::begin_undo, this));
@@ -3108,3 +3109,9 @@ restart:
                check_crossfades (*i);
        }
 }
+
+void
+Playlist::set_capture_insertion_in_progress (bool yn)
+{
+       _capture_insertion_underway = yn;
+}