Remove unused code.

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

diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index a13b8177181b3292184019d610353dff5af72cde..9a78ab98f8582c85645dc7a3d39951af0ead0eae 100644 (file)
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -154,10 +154,6 @@ class AudioRegion : public Region
                return _automatable.control(id);
        }
 
-       /* export */
-
-       int exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&);
-
        /* xfade/fade interactions */
 
        void suspend_fade_in ();

diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index a5c9e23a0f47c9758b79b023a943dfe6db978230..9868d1408fe3acceb957a991dc69d37fe65bd18d 100644 (file)
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -96,8 +96,6 @@ class MidiRegion : public Region
 
        /* export */
 
-       int exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&);
-
        boost::shared_ptr<MidiModel> model();
        boost::shared_ptr<const MidiModel> model() const;
 

diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h
index 78a0e5ab9b53871dbc0daefb52fb352571b3b5e1..a9d18f95ca8dc850ca320a01b61c755d929dad46 100644 (file)
--- a/libs/ardour/ardour/region.h
+++ b/libs/ardour/ardour/region.h
@@ -177,7 +177,6 @@ class Region
        bool region_list_equivalent (boost::shared_ptr<const Region>) const;
        bool source_equivalent (boost::shared_ptr<const Region>) const;
        bool uses_source (boost::shared_ptr<const Source>) const;
-       bool uses_source_path (const std::string&) const;
 
        std::string source_string () const;
 
@@ -187,7 +186,6 @@ class Region
        void set_length (framecnt_t);
        void set_start (framepos_t);
        void set_position (framepos_t);
-       void set_position_on_top (framepos_t);
        void special_set_position (framepos_t);
        virtual void update_after_tempo_map_change ();
        void nudge_position (frameoffset_t);
@@ -259,8 +257,6 @@ class Region
        virtual bool is_dependent() const { return false; }
        virtual bool depends_on (boost::shared_ptr<Region> /*other*/) const { return false; }
 
-       virtual int exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&) = 0;
-
        virtual void add_transient (framepos_t) {
                // no transients, but its OK
        }

diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
index 9b8df441eec7a5c370d83a7d06f5fe4b7d3520fd..5ea7b5cbef8483f68079803ea9d684d435a9c24f 100644 (file)
--- a/libs/ardour/audioregion.cc
+++ b/libs/ardour/audioregion.cc
@@ -1088,72 +1088,6 @@ AudioRegion::read_raw_internal (Sample* buf, framepos_t pos, framecnt_t cnt, int
        return audio_source(channel)->read (buf, pos, cnt);
 }
 
-int
-AudioRegion::exportme (Session& /*session*/, ARDOUR::ExportSpecification& /*spec*/)
-{
-       // TODO EXPORT
-//     const framecnt_t blocksize = 4096;
-//     framecnt_t to_read;
-//     int status = -1;
-//
-//     spec.channels = _sources.size();
-//
-//     if (spec.prepare (blocksize, session.frame_rate())) {
-//             goto out;
-//     }
-//
-//     spec.pos = 0;
-//     spec.total_frames = _length;
-//
-//     while (spec.pos < _length && !spec.stop) {
-//
-//
-//             /* step 1: interleave */
-//
-//             to_read = min (_length - spec.pos, blocksize);
-//
-//             if (spec.channels == 1) {
-//
-//                     if (read_raw_internal (spec.dataF, _start + spec.pos, to_read) != to_read) {
-//                             goto out;
-//                     }
-//
-//             } else {
-//
-//                     Sample buf[blocksize];
-//
-//                     for (uint32_t chan = 0; chan < spec.channels; ++chan) {
-//
-//                             if (audio_source(chan)->read (buf, _start + spec.pos, to_read) != to_read) {
-//                                     goto out;
-//                             }
-//
-//                             for (framecnt_t x = 0; x < to_read; ++x) {
-//                                     spec.dataF[chan+(x*spec.channels)] = buf[x];
-//                             }
-//                     }
-//             }
-//
-//             if (spec.process (to_read)) {
-//                     goto out;
-//             }
-//
-//             spec.pos += to_read;
-//             spec.progress = (double) spec.pos /_length;
-//
-//     }
-//
-//     status = 0;
-//
-//  out:
-//     spec.running = false;
-//     spec.status = status;
-//     spec.clear();
-//
-//     return status;
-       return 0;
-}
-
 void
 AudioRegion::set_scale_amplitude (gain_t g)
 {

diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc
index c79c4e4bd23989c3c833ba004dd41fb0281f8e6f..5ace3f1fd18eff23e842ef8ee79302479a931545 100644 (file)
--- a/libs/ardour/midi_region.cc
+++ b/libs/ardour/midi_region.cc
@@ -350,12 +350,6 @@ MidiRegion::model() const
        return midi_source()->model();
 }
 
-int
-MidiRegion::exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&)
-{
-       return -1;
-}
-
 boost::shared_ptr<MidiSource>
 MidiRegion::midi_source (uint32_t n) const
 {

diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
index 3494db12fa0e3436edf20a52d14985089ffffbcf..dde4e515308c97d63e0de92da36d53e0bd1178ad 100644 (file)
--- a/libs/ardour/region.cc
+++ b/libs/ardour/region.cc
@@ -624,29 +624,6 @@ Region::set_position_internal (framepos_t pos, bool allow_bbt_recompute)
        }
 }
 
-void
-Region::set_position_on_top (framepos_t pos)
-{
-       if (locked()) {
-               return;
-       }
-
-       if (_position != pos) {
-               set_position_internal (pos, true);
-       }
-
-       boost::shared_ptr<Playlist> pl (playlist());
-
-       if (pl) {
-               pl->raise_region_to_top (shared_from_this ());
-       }
-
-       /* do this even if the position is the same. this helps out
-          a GUI that has moved its representation already.
-       */
-       send_change (Properties::position);
-}
-
 void
 Region::recompute_position_from_lock_style ()
 {
@@ -1488,20 +1465,6 @@ Region::uses_source (boost::shared_ptr<const Source> source) const
        return false;
 }
 
-bool
-Region::uses_source_path (const std::string& path) const
-{
-       for (SourceList::const_iterator i = _sources.begin(); i != _sources.end(); ++i) {
-                boost::shared_ptr<const FileSource> fs = boost::dynamic_pointer_cast<const FileSource> (*i);
-                if (fs) {
-                        if (fs->path() == path) {
-                                return true;
-                        }
-                }
-       }
-       return false;
-}
-
 framecnt_t
 Region::source_length(uint32_t n) const
 {