Remove the source files which got transferred to libpbd

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

diff --git a/libs/ardour/source.cc b/libs/ardour/source.cc
index 409f3e1cdb23f1ba1e4439f85858daf81a2c205b..03039fea5baf5f9abc8205132e821f51fb4645ec 100644 (file)
--- a/libs/ardour/source.cc
+++ b/libs/ardour/source.cc
@@ -19,8 +19,6 @@
 
 #include <sys/stat.h>
 #include <unistd.h>
-#include <fcntl.h>
-#include <poll.h>
 #include <float.h>
 #include <cerrno>
 #include <ctime>
@@ -29,7 +27,7 @@
 #include <algorithm>
 #include <fstream>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
 #include "pbd/xml++.h"
@@ -53,6 +51,7 @@ Source::Source (Session& s, DataType type, const string& name, Flag flags)
        , _flags(flags)
        , _timeline_position(0)
         , _use_count (0)
+       , _level (0)
 {
        _analysed = false;
        _timestamp = 0;
@@ -65,6 +64,7 @@ Source::Source (Session& s, const XMLNode& node)
        , _flags (Flag (Writable|CanRename))
        , _timeline_position(0)
         , _use_count (0)
+       , _level (0)
 {
        _timestamp = 0;
        _analysed = false;
@@ -98,7 +98,7 @@ Source::get_state ()
        node->add_property ("name", name());
        node->add_property ("type", _type.to_string());
        node->add_property (X_("flags"), enum_2_string (_flags));
-       _id.print (buf, sizeof (buf));
+       id().print (buf, sizeof (buf));
        node->add_property ("id", buf);
 
        if (_timestamp != 0) {
@@ -120,9 +120,7 @@ Source::set_state (const XMLNode& node, int version)
                return -1;
        }
 
-       if ((prop = node.property ("id")) != 0) {
-               _id = prop->value ();
-       } else {
+       if (!set_id (node)) {
                return -1;
        }
 
@@ -147,7 +145,7 @@ Source::set_state (const XMLNode& node, int version)
        }
 
        if (version < 3000) {
-               /* a source with an XML node must necessarily already exist, 
+               /* a source with an XML node must necessarily already exist,
                   and therefore cannot be removable/writable etc. etc.; 2.X
                   sometimes marks sources as removable which shouldn't be.
                */
@@ -162,7 +160,7 @@ Source::set_state (const XMLNode& node, int version)
 bool
 Source::has_been_analysed() const
 {
-       Glib::Mutex::Lock lm (_analysis_lock);
+       Glib::Threads::Mutex::Lock lm (_analysis_lock);
        return _analysed;
 }
 
@@ -170,7 +168,7 @@ void
 Source::set_been_analysed (bool yn)
 {
        {
-               Glib::Mutex::Lock lm (_analysis_lock);
+               Glib::Threads::Mutex::Lock lm (_analysis_lock);
                _analysed = yn;
        }
 
@@ -219,7 +217,7 @@ Source::get_transients_path () const
        s = _session.analysis_dir ();
        parts.push_back (s);
 
-       s = _id.to_s();
+       s = id().to_s();
        s += '.';
        s += TransientDetector::operational_identifier();
        parts.push_back (s);
@@ -252,10 +250,10 @@ Source::mark_for_remove ()
 {
        // This operation is not allowed for sources for destructive tracks or out-of-session files.
 
-       /* XXX need a way to detect _within_session() condition here - move it from FileSource? 
+       /* XXX need a way to detect _within_session() condition here - move it from FileSource?
         */
 
-       if ((_flags & Destructive)) { 
+       if ((_flags & Destructive)) {
                return;
        }
 
@@ -263,7 +261,7 @@ Source::mark_for_remove ()
 }
 
 void
-Source::set_timeline_position (int64_t pos)
+Source::set_timeline_position (framepos_t pos)
 {
        _timeline_position = pos;
 }
@@ -292,14 +290,14 @@ void
 Source::dec_use_count ()
 {
 #ifndef NDEBUG
-        gint oldval = g_atomic_int_exchange_and_add (&_use_count, -1);
+        gint oldval = g_atomic_int_add (&_use_count, -1);
         if (oldval <= 0) {
                 cerr << "Bad use dec for " << name() << endl;
                 abort ();
         }
         assert (oldval > 0);
-#else 
-        g_atomic_int_exchange_and_add (&_use_count, -1);
+#else
+        g_atomic_int_add (&_use_count, -1);
 #endif
 }
 
@@ -308,3 +306,4 @@ Source::writable () const
 {
         return (_flags & Writable) && _session.writable();
 }
+