Add a dedicated export method to MidiRegion

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

diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index 3797f2f0c1118d19ec7e204d3d1a84dce5ce1241..70744429f9416bff8cc93ad214133d403312a75b 100644 (file)
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -40,7 +40,7 @@
 #include "ardour/session_playlists.h"
 #include "ardour/source_factory.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -657,6 +657,7 @@ Playlist::flush_notifications (bool from_undo)
         pending_range_moves.clear ();
         pending_region_extensions.clear ();
         pending_contents_change = false;
+        pending_layering = false;
  }
 
  /*************************************************************
@@ -665,7 +666,7 @@ Playlist::flush_notifications (bool from_undo)
 
 /** Note: this calls set_layer (..., DBL_MAX) so it will reset the layering index of region */
  void
- Playlist::add_region (boost::shared_ptr<Region> region, framepos_t position, float times, bool auto_partition)
+ Playlist::add_region (boost::shared_ptr<Region> region, framepos_t position, float times, bool auto_partition, const int32_t sub_num)
  {
         RegionWriteLock rlock (this);
         times = fabs (times);
@@ -679,7 +680,7 @@ Playlist::flush_notifications (bool from_undo)
         }
 
         if (itimes >= 1) {
-                add_region_internal (region, pos);
+                add_region_internal (region, pos, sub_num);
                 set_layer (region, DBL_MAX);
                 pos += region->length();
                 --itimes;
@@ -691,8 +692,8 @@ Playlist::flush_notifications (bool from_undo)
         */
 
         for (int i = 0; i < itimes; ++i) {
-                boost::shared_ptr<Region> copy = RegionFactory::create (region, true);
-                add_region_internal (copy, pos);
+                boost::shared_ptr<Region> copy = RegionFactory::create (region, true, sub_num);
+                add_region_internal (copy, pos, sub_num);
                 set_layer (copy, DBL_MAX);
                 pos += region->length();
         }
@@ -713,7 +714,7 @@ Playlist::flush_notifications (bool from_undo)
                         plist.add (Properties::layer, region->layer());
 
                         boost::shared_ptr<Region> sub = RegionFactory::create (region, plist);
-                        add_region_internal (sub, pos);
+                        add_region_internal (sub, pos, sub_num);
                         set_layer (sub, DBL_MAX);
                 }
         }
@@ -734,7 +735,7 @@ Playlist::flush_notifications (bool from_undo)
  }
 
  bool
- Playlist::add_region_internal (boost::shared_ptr<Region> region, framepos_t position)
+ Playlist::add_region_internal (boost::shared_ptr<Region> region, framepos_t position, const int32_t sub_num)
  {
         if (region->data_type() != _type) {
                 return false;
@@ -747,7 +748,7 @@ Playlist::flush_notifications (bool from_undo)
                 region->set_playlist (boost::weak_ptr<Playlist>(foo));
         }
 
-        region->set_position (position);
+        region->set_position (position, sub_num);
 
         regions.insert (upper_bound (regions.begin(), regions.end(), region, cmp), region);
         all_regions.insert (region);
@@ -1146,7 +1147,7 @@ Playlist::flush_notifications (bool from_undo)
                            chopped.
                         */
 
-                        ret->paste (pl, (*i).start - start, 1.0f);
+                        ret->paste (pl, (*i).start - start, 1.0f, 0);
                 }
         }
 
@@ -1208,7 +1209,7 @@ Playlist::flush_notifications (bool from_undo)
  }
 
  int
- Playlist::paste (boost::shared_ptr<Playlist> other, framepos_t position, float times)
+ Playlist::paste (boost::shared_ptr<Playlist> other, framepos_t position, float times, const int32_t sub_num)
  {
         times = fabs (times);
 
@@ -1230,7 +1231,7 @@ Playlist::flush_notifications (bool from_undo)
                                            the ordering they had in the original playlist.
                                         */
 
-                                        add_region_internal (copy_of_region, (*i)->position() + pos);
+                                        add_region_internal (copy_of_region, (*i)->position() + pos, sub_num);
                                         set_layer (copy_of_region, copy_of_region->layer() + top);
                                 }
                                 pos += shift;
@@ -1321,7 +1322,7 @@ Playlist::duplicate_range (AudioRange& range, float times)
 {
        boost::shared_ptr<Playlist> pl = copy (range.start, range.length(), true);
        framecnt_t offset = range.end - range.start;
-       paste (pl, range.start + offset, times);
+       paste (pl, range.start + offset, times, 0);
 }
 
 void
@@ -1345,7 +1346,7 @@ Playlist::duplicate_ranges (std::list<AudioRange>& ranges, float /* times */)
 
        for (list<AudioRange>::iterator i = ranges.begin(); i != ranges.end(); ++i) {
                boost::shared_ptr<Playlist> pl = copy ((*i).start, (*i).length(), true);
-               paste (pl, (*i).start + offset, 1.0f); // times ??
+               paste (pl, (*i).start + offset, 1.0f, 0); // times ??
        }
 }
 
@@ -1389,7 +1390,7 @@ Playlist::duplicate_ranges (std::list<AudioRange>& ranges, float /* times */)
  }
 
  void
- Playlist::split (framepos_t at, const int32_t& sub_num)
+ Playlist::split (framepos_t at, const int32_t sub_num)
  {
         RegionWriteLock rlock (this);
         RegionList copy (regions.rlist());
@@ -1403,14 +1404,14 @@ Playlist::duplicate_ranges (std::list<AudioRange>& ranges, float /* times */)
  }
 
  void
- Playlist::split_region (boost::shared_ptr<Region> region, framepos_t playlist_position, const int32_t& sub_num)
+ Playlist::split_region (boost::shared_ptr<Region> region, framepos_t playlist_position, const int32_t sub_num)
  {
         RegionWriteLock rl (this);
         _split_region (region, playlist_position, sub_num);
  }
 
  void
- Playlist::_split_region (boost::shared_ptr<Region> region, framepos_t playlist_position, const int32_t& sub_num)
+ Playlist::_split_region (boost::shared_ptr<Region> region, framepos_t playlist_position, const int32_t sub_num)
  {
         if (!region->covers (playlist_position)) {
                 return;
@@ -2927,9 +2928,8 @@ Playlist::update_after_tempo_map_change ()
        for (RegionList::iterator i = copy.begin(); i != copy.end(); ++i) {
                (*i)->update_after_tempo_map_change ();
        }
-
+       /* possibly causes a contents changed notification (flush_notifications()) */
        thaw ();
-       notify_contents_changed();
 }
 
 void