fix thinko-typo in SoloControl::soloed_by_others()

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

diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc
index f5c241eaf83f4dcea5ed59b2717128c94a9c5840..c05a0a4bb92826bebc876b62778c510a7c5e6c9d 100644 (file)
--- a/libs/ardour/file_source.cc
+++ b/libs/ardour/file_source.cc
@@ -44,7 +44,7 @@
 #include "ardour/source.h"
 #include "ardour/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -140,7 +140,7 @@ FileSource::init (const string& pathstr, bool must_exist)
 int
 FileSource::set_state (const XMLNode& node, int /*version*/)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if ((prop = node.property (X_("channel"))) != 0) {
                _channel = atoi (prop->value());
@@ -274,7 +274,7 @@ FileSource::find (Session& s, DataType type, const string& path, bool must_exist
 
                        vector<string>::iterator j = i;
                        ++j;
-                       
+
                        while (j != hits.end()) {
                                if (PBD::equivalent_paths (*i, *j)) {
                                        /* *i and *j are the same file; break out of the loop early */
@@ -316,10 +316,10 @@ FileSource::find (Session& s, DataType type, const string& path, bool must_exist
                 } else {
 
                        /* only one match: happy days */
-                       
+
                        keeppath = de_duped_hits[0];
                }
-                                               
+
        } else {
                 keeppath = path;
         }
@@ -566,7 +566,7 @@ FileSource::is_stub () const
        if (!empty()) {
                return false;
        }
-       
+
        if (!removable()) {
                return false;
        }
@@ -577,7 +577,7 @@ FileSource::is_stub () const
 
        return true;
 }
-               
+
 int
 FileSource::rename (const string& newpath)
 {
@@ -604,4 +604,4 @@ FileSource::rename (const string& newpath)
        return 0;
 }
 
-       
+