try not thinning when loading old-school automation lists
[ardour.git] / libs / ardour / playlist.cc
index 076c4f27caec4c8867f6f7d1164b4251ec283da7..3b0528ed3b7fc9f9975e8f6f8b0bcc3bebf462a0 100644 (file)
 
 #include <stdint.h>
 #include <set>
-#include <fstream>
 #include <algorithm>
-#include <unistd.h>
-#include <cerrno>
 #include <string>
-#include <climits>
 
 #include <boost/lexical_cast.hpp>
 
 #include "pbd/convert.h"
-#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"
@@ -53,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 {
@@ -195,7 +189,7 @@ Playlist::Playlist (boost::shared_ptr<const Playlist> other, framepos_t start, f
        , _type(other->_type)
        , _orig_track_id (other->_orig_track_id)
 {
-       RegionLock rlock2 (const_cast<Playlist*> (other.get()));
+       RegionReadLock rlock2 (const_cast<Playlist*> (other.get()));
 
        framepos_t end = start + cnt - 1;
 
@@ -287,7 +281,7 @@ Playlist::release ()
 void
 Playlist::copy_regions (RegionList& newlist) const
 {
-       RegionLock rlock (const_cast<Playlist *> (this));
+       RegionReadLock rlock (const_cast<Playlist *> (this));
 
        for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) {
                newlist.push_back (RegionFactory::RegionFactory::create (*i, true));
@@ -317,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));
@@ -330,7 +325,7 @@ Playlist::~Playlist ()
        DEBUG_TRACE (DEBUG::Destruction, string_compose ("Playlist %1 destructor\n", _name));
 
        {
-               RegionLock rl (this);
+               RegionReadLock rl (this);
 
                for (set<boost::shared_ptr<Region> >::iterator i = all_regions.begin(); i != all_regions.end(); ++i) {
                        (*i)->set_playlist (boost::shared_ptr<Playlist>());
@@ -660,7 +655,7 @@ Playlist::flush_notifications (bool from_undo)
  void
  Playlist::add_region (boost::shared_ptr<Region> region, framepos_t position, float times, bool auto_partition)
  {
-        RegionLock rlock (this);
+        RegionWriteLock rlock (this);
         times = fabs (times);
 
         int itimes = (int) floor (times);
@@ -717,7 +712,7 @@ Playlist::flush_notifications (bool from_undo)
  void
  Playlist::set_region_ownership ()
  {
-        RegionLock rl (this);
+        RegionWriteLock rl (this);
         RegionList::iterator i;
         boost::weak_ptr<Playlist> pl (shared_from_this());
 
@@ -768,7 +763,7 @@ Playlist::flush_notifications (bool from_undo)
  void
  Playlist::replace_region (boost::shared_ptr<Region> old, boost::shared_ptr<Region> newr, framepos_t pos)
  {
-        RegionLock rlock (this);
+        RegionWriteLock rlock (this);
 
         bool old_sp = _splicing;
         _splicing = true;
@@ -785,7 +780,7 @@ Playlist::flush_notifications (bool from_undo)
  void
  Playlist::remove_region (boost::shared_ptr<Region> region)
  {
-        RegionLock rlock (this);
+        RegionWriteLock rlock (this);
         remove_region_internal (region);
  }
 
@@ -876,7 +871,7 @@ Playlist::flush_notifications (bool from_undo)
         RegionList new_regions;
 
         {
-                RegionLock rlock (this);
+                RegionWriteLock rlock (this);
 
                 boost::shared_ptr<Region> region;
                 boost::shared_ptr<Region> current;
@@ -1196,26 +1191,28 @@ Playlist::flush_notifications (bool from_undo)
         times = fabs (times);
 
         {
-                RegionLock rl1 (this);
-                RegionLock rl2 (other.get());
+                RegionReadLock rl2 (other.get());
 
                 int itimes = (int) floor (times);
                 framepos_t pos = position;
                 framecnt_t const shift = other->_get_extent().second;
                 layer_t top = top_layer ();
 
-                while (itimes--) {
-                        for (RegionList::iterator i = other->regions.begin(); i != other->regions.end(); ++i) {
-                                boost::shared_ptr<Region> copy_of_region = RegionFactory::create (*i, true);
-
-                                /* put these new regions on top of all existing ones, but preserve
-                                   the ordering they had in the original playlist.
-                                */
-
-                                add_region_internal (copy_of_region, (*i)->position() + pos);
-                                set_layer (copy_of_region, copy_of_region->layer() + top);
+                {
+                        RegionWriteLock rl1 (this);
+                        while (itimes--) {
+                                for (RegionList::iterator i = other->regions.begin(); i != other->regions.end(); ++i) {
+                                        boost::shared_ptr<Region> copy_of_region = RegionFactory::create (*i, true);
+                                        
+                                        /* put these new regions on top of all existing ones, but preserve
+                                           the ordering they had in the original playlist.
+                                        */
+                                        
+                                        add_region_internal (copy_of_region, (*i)->position() + pos);
+                                        set_layer (copy_of_region, copy_of_region->layer() + top);
+                                }
+                                pos += shift;
                         }
-                        pos += shift;
                 }
         }
 
@@ -1228,7 +1225,7 @@ Playlist::flush_notifications (bool from_undo)
  {
         times = fabs (times);
 
-        RegionLock rl (this);
+        RegionWriteLock rl (this);
         int itimes = (int) floor (times);
         framepos_t pos = position + 1;
 
@@ -1261,7 +1258,7 @@ Playlist::flush_notifications (bool from_undo)
  void
  Playlist::shift (framepos_t at, frameoffset_t distance, bool move_intersected, bool ignore_music_glue)
  {
-        RegionLock rlock (this);
+        RegionWriteLock rlock (this);
         RegionList copy (regions.rlist());
         RegionList fixup;
 
@@ -1300,7 +1297,7 @@ Playlist::flush_notifications (bool from_undo)
  void
  Playlist::split (framepos_t at)
  {
-        RegionLock rlock (this);
+        RegionWriteLock rlock (this);
         RegionList copy (regions.rlist());
 
         /* use a copy since this operation can modify the region list
@@ -1314,7 +1311,7 @@ Playlist::flush_notifications (bool from_undo)
  void
  Playlist::split_region (boost::shared_ptr<Region> region, framepos_t playlist_position)
  {
-        RegionLock rl (this);
+        RegionWriteLock rl (this);
         _split_region (region, playlist_position);
  }
 
@@ -1417,7 +1414,7 @@ Playlist::flush_notifications (bool from_undo)
  Playlist::splice_locked (framepos_t at, framecnt_t distance, boost::shared_ptr<Region> exclude)
  {
         {
-                RegionLock rl (this);
+                RegionWriteLock rl (this);
                 core_splice (at, distance, exclude);
         }
  }
@@ -1582,7 +1579,7 @@ Playlist::flush_notifications (bool from_undo)
  void
  Playlist::drop_regions ()
  {
-        RegionLock rl (this);
+        RegionWriteLock rl (this);
         regions.clear ();
         all_regions.clear ();
  }
@@ -1590,7 +1587,7 @@ Playlist::flush_notifications (bool from_undo)
  void
  Playlist::sync_all_regions_with_regions ()
  {
-        RegionLock rl (this);
+        RegionWriteLock rl (this);
 
         all_regions.clear ();
 
@@ -1603,7 +1600,7 @@ Playlist::flush_notifications (bool from_undo)
  Playlist::clear (bool with_signals)
  {
         {
-                RegionLock rl (this);
+                RegionWriteLock rl (this);
 
                 region_state_changed_connections.drop_connections ();
 
@@ -1638,14 +1635,14 @@ Playlist::flush_notifications (bool from_undo)
 boost::shared_ptr<RegionList>
 Playlist::regions_at (framepos_t frame)
 {
-       RegionLock rlock (this);
+       RegionReadLock rlock (this);
        return find_regions_at (frame);
 }
 
  uint32_t
  Playlist::count_regions_at (framepos_t frame) const
  {
-        RegionLock rlock (const_cast<Playlist*>(this));
+        RegionReadLock rlock (const_cast<Playlist*>(this));
         uint32_t cnt = 0;
 
         for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) {
@@ -1661,7 +1658,7 @@ Playlist::regions_at (framepos_t frame)
  Playlist::top_region_at (framepos_t frame)
 
  {
-        RegionLock rlock (this);
+        RegionReadLock rlock (this);
         boost::shared_ptr<RegionList> rlist = find_regions_at (frame);
         boost::shared_ptr<Region> region;
 
@@ -1678,7 +1675,7 @@ Playlist::regions_at (framepos_t frame)
  Playlist::top_unmuted_region_at (framepos_t frame)
 
  {
-        RegionLock rlock (this);
+        RegionReadLock rlock (this);
         boost::shared_ptr<RegionList> rlist = find_regions_at (frame);
 
         for (RegionList::iterator i = rlist->begin(); i != rlist->end(); ) {
@@ -1723,7 +1720,7 @@ Playlist::find_regions_at (framepos_t frame)
 boost::shared_ptr<RegionList>
 Playlist::regions_with_start_within (Evoral::Range<framepos_t> range)
 {
-       RegionLock rlock (this);
+       RegionReadLock rlock (this);
        boost::shared_ptr<RegionList> rlist (new RegionList);
 
        for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
@@ -1738,7 +1735,7 @@ Playlist::regions_with_start_within (Evoral::Range<framepos_t> range)
 boost::shared_ptr<RegionList>
 Playlist::regions_with_end_within (Evoral::Range<framepos_t> range)
 {
-       RegionLock rlock (this);
+       RegionReadLock rlock (this);
        boost::shared_ptr<RegionList> rlist (new RegionList);
 
        for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
@@ -1757,7 +1754,13 @@ Playlist::regions_with_end_within (Evoral::Range<framepos_t> range)
 boost::shared_ptr<RegionList>
 Playlist::regions_touched (framepos_t start, framepos_t end)
 {
-       RegionLock rlock (this);
+       RegionReadLock rlock (this);
+       return regions_touched_locked (start, end);
+}
+
+boost::shared_ptr<RegionList>
+Playlist::regions_touched_locked (framepos_t start, framepos_t end)
+{
        boost::shared_ptr<RegionList> rlist (new RegionList);
        
        for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
@@ -1769,131 +1772,130 @@ Playlist::regions_touched (framepos_t start, framepos_t end)
        return rlist;
 }
 
- framepos_t
- Playlist::find_next_transient (framepos_t from, int dir)
- {
-        RegionLock rlock (this);
-        AnalysisFeatureList points;
-        AnalysisFeatureList these_points;
-
-        for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
-                if (dir > 0) {
-                        if ((*i)->last_frame() < from) {
-                                continue;
-                        }
-                } else {
-                        if ((*i)->first_frame() > from) {
-                                continue;
-                        }
-                }
-
-                (*i)->get_transients (these_points);
-
-                /* add first frame, just, err, because */
-
-                these_points.push_back ((*i)->first_frame());
-
-                points.insert (points.end(), these_points.begin(), these_points.end());
-                these_points.clear ();
-        }
-
-        if (points.empty()) {
-                return -1;
-        }
-
-        TransientDetector::cleanup_transients (points, _session.frame_rate(), 3.0);
-        bool reached = false;
-
-        if (dir > 0) {
-                for (AnalysisFeatureList::iterator x = points.begin(); x != points.end(); ++x) {
-                        if ((*x) >= from) {
-                                reached = true;
-                        }
-
-                        if (reached && (*x) > from) {
-                                return *x;
-                        }
-                }
-        } else {
-                for (AnalysisFeatureList::reverse_iterator x = points.rbegin(); x != points.rend(); ++x) {
-                        if ((*x) <= from) {
-                                reached = true;
-                        }
-
-                        if (reached && (*x) < from) {
-                                return *x;
-                        }
-                }
-        }
-
-        return -1;
- }
-
- boost::shared_ptr<Region>
- Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir)
- {
-        RegionLock rlock (this);
-        boost::shared_ptr<Region> ret;
-        framepos_t closest = max_framepos;
-
-        bool end_iter = false;
-
-        for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
-
-                if(end_iter) break;
-
-                frameoffset_t distance;
-                boost::shared_ptr<Region> r = (*i);
-                framepos_t pos = 0;
-
-                switch (point) {
-                case Start:
-                        pos = r->first_frame ();
-                        break;
-                case End:
-                        pos = r->last_frame ();
-                        break;
-                case SyncPoint:
-                        pos = r->sync_position ();
-                        break;
-                }
-
-                switch (dir) {
-                case 1: /* forwards */
-
-                        if (pos > frame) {
-                                if ((distance = pos - frame) < closest) {
-                                        closest = distance;
-                                        ret = r;
-                                        end_iter = true;
-                                }
-                        }
-
-                        break;
-
-                default: /* backwards */
-
-                        if (pos < frame) {
-                                if ((distance = frame - pos) < closest) {
-                                        closest = distance;
-                                        ret = r;
-                                }
-                        }
-                        else {
-                                end_iter = true;
-                        }
-
-                        break;
-                }
-        }
+framepos_t
+Playlist::find_next_transient (framepos_t from, int dir)
+{
+       RegionReadLock rlock (this);
+       AnalysisFeatureList points;
+       AnalysisFeatureList these_points;
+       
+       for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
+               if (dir > 0) {
+                       if ((*i)->last_frame() < from) {
+                               continue;
+                       }
+               } else {
+                       if ((*i)->first_frame() > from) {
+                               continue;
+                       }
+               }
+               
+               (*i)->get_transients (these_points);
+               
+               /* add first frame, just, err, because */
+               
+               these_points.push_back ((*i)->first_frame());
+               
+               points.insert (points.end(), these_points.begin(), these_points.end());
+               these_points.clear ();
+       }
+       
+       if (points.empty()) {
+               return -1;
+       }
+       
+       TransientDetector::cleanup_transients (points, _session.frame_rate(), 3.0);
+       bool reached = false;
+       
+       if (dir > 0) {
+               for (AnalysisFeatureList::iterator x = points.begin(); x != points.end(); ++x) {
+                       if ((*x) >= from) {
+                               reached = true;
+                       }
+                       
+                       if (reached && (*x) > from) {
+                               return *x;
+                       }
+               }
+       } else {
+               for (AnalysisFeatureList::reverse_iterator x = points.rbegin(); x != points.rend(); ++x) {
+                       if ((*x) <= from) {
+                               reached = true;
+                       }
+                       
+                       if (reached && (*x) < from) {
+                               return *x;
+                       }
+               }
+       }
+       
+       return -1;
+}
 
-        return ret;
- }
+boost::shared_ptr<Region>
+Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir)
+{
+       RegionReadLock rlock (this);
+       boost::shared_ptr<Region> ret;
+       framepos_t closest = max_framepos;
+       
+       bool end_iter = false;
+       
+       for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
+               
+               if(end_iter) break;
+               
+               frameoffset_t distance;
+               boost::shared_ptr<Region> r = (*i);
+               framepos_t pos = 0;
+               
+               switch (point) {
+               case Start:
+                       pos = r->first_frame ();
+                       break;
+               case End:
+                       pos = r->last_frame ();
+                       break;
+               case SyncPoint:
+                       pos = r->sync_position ();
+                       break;
+               }
+               
+               switch (dir) {
+               case 1: /* forwards */
+                       
+                       if (pos > frame) {
+                               if ((distance = pos - frame) < closest) {
+                                       closest = distance;
+                                       ret = r;
+                                       end_iter = true;
+                               }
+                       }
+                       
+                       break;
+                       
+               default: /* backwards */
+                       
+                       if (pos < frame) {
+                               if ((distance = frame - pos) < closest) {
+                                       closest = distance;
+                                       ret = r;
+                               }
+                       } else {
+                               end_iter = true;
+                       }
+                       
+                       break;
+               }
+       }
+       
+       return ret;
+}
 
  framepos_t
  Playlist::find_next_region_boundary (framepos_t frame, int dir)
  {
-        RegionLock rlock (this);
+        RegionReadLock rlock (this);
 
         framepos_t closest = max_framepos;
         framepos_t ret = -1;
@@ -1975,14 +1977,14 @@ Playlist::regions_touched (framepos_t start, framepos_t end)
  void
  Playlist::rdiff (vector<Command*>& cmds) const
  {
-        RegionLock rlock (const_cast<Playlist *> (this));
+        RegionReadLock rlock (const_cast<Playlist *> (this));
         Stateful::rdiff (cmds);
  }
 
  void
  Playlist::clear_owned_changes ()
  {
-        RegionLock rlock (this);
+        RegionReadLock rlock (this);
         Stateful::clear_owned_changes ();
  }
 
@@ -2087,7 +2089,7 @@ Playlist::regions_touched (framepos_t start, framepos_t end)
                        }
 
                         {
-                                RegionLock rlock (this);
+                                RegionWriteLock rlock (this);
                                 add_region_internal (region, region->position());
                         }
                        
@@ -2147,7 +2149,7 @@ Playlist::state (bool full_state)
        node->add_property (X_("frozen"), _frozen ? "yes" : "no");
 
        if (full_state) {
-               RegionLock rlock (this, false);
+               RegionReadLock rlock (this);
 
                snprintf (buf, sizeof (buf), "%u", _combine_ops);
                node->add_property ("combine-ops", buf);
@@ -2167,21 +2169,21 @@ Playlist::state (bool full_state)
 bool
 Playlist::empty() const
 {
-       RegionLock rlock (const_cast<Playlist *>(this), false);
+       RegionReadLock rlock (const_cast<Playlist *>(this));
        return regions.empty();
 }
 
 uint32_t
 Playlist::n_regions() const
 {
-       RegionLock rlock (const_cast<Playlist *>(this), false);
+       RegionReadLock rlock (const_cast<Playlist *>(this));
        return regions.size();
 }
 
 pair<framepos_t, framepos_t>
 Playlist::get_extent () const
 {
-       RegionLock rlock (const_cast<Playlist *>(this), false);
+       RegionReadLock rlock (const_cast<Playlist *>(this));
        return _get_extent ();
 }
 
@@ -2224,7 +2226,7 @@ Playlist::bump_name (string name, Session &session)
 layer_t
 Playlist::top_layer() const
 {
-       RegionLock rlock (const_cast<Playlist *> (this));
+       RegionReadLock rlock (const_cast<Playlist *> (this));
        layer_t top = 0;
 
        for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) {
@@ -2445,7 +2447,7 @@ Playlist::nudge_after (framepos_t start, framecnt_t distance, bool forwards)
        _nudging = true;
 
        {
-               RegionLock rlock (const_cast<Playlist *> (this));
+               RegionWriteLock rlock (const_cast<Playlist *> (this));
 
                for (i = regions.begin(); i != regions.end(); ++i) {
 
@@ -2486,7 +2488,7 @@ Playlist::nudge_after (framepos_t start, framecnt_t distance, bool forwards)
 bool
 Playlist::uses_source (boost::shared_ptr<const Source> src) const
 {
-       RegionLock rlock (const_cast<Playlist*> (this));
+       RegionReadLock rlock (const_cast<Playlist*> (this));
 
        for (set<boost::shared_ptr<Region> >::iterator r = all_regions.begin(); r != all_regions.end(); ++r) {
                if ((*r)->uses_source (src)) {
@@ -2500,7 +2502,7 @@ Playlist::uses_source (boost::shared_ptr<const Source> src) const
 boost::shared_ptr<Region>
 Playlist::find_region (const ID& id) const
 {
-       RegionLock rlock (const_cast<Playlist*> (this));
+       RegionReadLock rlock (const_cast<Playlist*> (this));
 
        /* searches all regions currently in use by the playlist */
 
@@ -2516,7 +2518,7 @@ Playlist::find_region (const ID& id) const
 uint32_t
 Playlist::region_use_count (boost::shared_ptr<Region> r) const
 {
-       RegionLock rlock (const_cast<Playlist*> (this));
+       RegionReadLock rlock (const_cast<Playlist*> (this));
        uint32_t cnt = 0;
 
        for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) {
@@ -2580,7 +2582,7 @@ Playlist::shuffle (boost::shared_ptr<Region> region, int dir)
        _shuffling = true;
 
        {
-               RegionLock rlock (const_cast<Playlist*> (this));
+               RegionWriteLock rlock (const_cast<Playlist*> (this));
 
 
                if (dir > 0) {
@@ -2685,7 +2687,7 @@ Playlist::shuffle (boost::shared_ptr<Region> region, int dir)
 bool
 Playlist::region_is_shuffle_constrained (boost::shared_ptr<Region>)
 {
-       RegionLock rlock (const_cast<Playlist*> (this));
+       RegionReadLock rlock (const_cast<Playlist*> (this));
 
        if (regions.size() > 1) {
                return true;
@@ -2697,7 +2699,7 @@ Playlist::region_is_shuffle_constrained (boost::shared_ptr<Region>)
 void
 Playlist::update_after_tempo_map_change ()
 {
-       RegionLock rlock (const_cast<Playlist*> (this));
+       RegionWriteLock rlock (const_cast<Playlist*> (this));
        RegionList copy (regions.rlist());
 
        freeze ();
@@ -2712,7 +2714,7 @@ Playlist::update_after_tempo_map_change ()
 void
 Playlist::foreach_region (boost::function<void(boost::shared_ptr<Region>)> s)
 {
-       RegionLock rl (this, false);
+       RegionWriteLock rl (this, false);
        for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
                s (*i);
        }
@@ -2721,7 +2723,7 @@ Playlist::foreach_region (boost::function<void(boost::shared_ptr<Region>)> s)
 bool
 Playlist::has_region_at (framepos_t const p) const
 {
-       RegionLock (const_cast<Playlist *> (this));
+       RegionReadLock (const_cast<Playlist *> (this));
 
        RegionList::const_iterator i = regions.begin ();
        while (i != regions.end() && !(*i)->covers (p)) {
@@ -2735,7 +2737,7 @@ Playlist::has_region_at (framepos_t const p) const
 void
 Playlist::remove_region_by_source (boost::shared_ptr<Source> s)
 {
-       RegionLock rl (this);
+       RegionWriteLock rl (this);
 
        RegionList::iterator i = regions.begin();
        while (i != regions.end()) {
@@ -2758,7 +2760,7 @@ Playlist::remove_region_by_source (boost::shared_ptr<Source> s)
 framepos_t
 Playlist::find_next_top_layer_position (framepos_t t) const
 {
-       RegionLock rlock (const_cast<Playlist *> (this));
+       RegionReadLock rlock (const_cast<Playlist *> (this));
 
        layer_t const top = top_layer ();
 
@@ -3058,7 +3060,7 @@ Playlist::uncombine (boost::shared_ptr<Region> target)
 uint32_t
 Playlist::max_source_level () const
 {
-       RegionLock rlock (const_cast<Playlist *> (this));
+       RegionReadLock rlock (const_cast<Playlist *> (this));
        uint32_t lvl = 0;
 
        for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) {
@@ -3107,3 +3109,9 @@ restart:
                check_crossfades (*i);
        }
 }
+
+void
+Playlist::set_capture_insertion_in_progress (bool yn)
+{
+       _capture_insertion_underway = yn;
+}